diff --git a/.gitignore b/.gitignore index 6e5ff8c..70b8406 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -target -.settings -.project -.classpath -.extract -*.log -*.mv.db -logs -node_modules -heimdallr-data -.idea -*.iml -tiles \ No newline at end of file +tiles diff --git a/layers.json b/layers.json deleted file mode 100644 index 2d4ef67..0000000 --- a/layers.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "layers": [{ - "id": 0, - "name": "Earth", - "from": -16, - "to": 160 - },{ - "id": 1, - "name": "Moon", - "from": 5000, - "to": 5500 - }] -} \ No newline at end of file diff --git a/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java b/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java index 3113d2c..e3891d7 100644 --- a/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java +++ b/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java @@ -161,7 +161,7 @@ public class TileRenderer { if (cache.has(layer.id, tileX, tileY, zoom)) { byte[] data = cache.get(layer.id, tileX, tileY, zoom); - if (data != null) + if (data != null && data.length > 0) //In case the cache disappears return ImageIO.read(new ByteArrayInputStream(data)); } diff --git a/src/main/java/io/rudin/minetest/tileserver/provider/LayerConfigProvider.java b/src/main/java/io/rudin/minetest/tileserver/provider/LayerConfigProvider.java index 7e6c152..2b034ab 100644 --- a/src/main/java/io/rudin/minetest/tileserver/provider/LayerConfigProvider.java +++ b/src/main/java/io/rudin/minetest/tileserver/provider/LayerConfigProvider.java @@ -1,6 +1,7 @@ package io.rudin.minetest.tileserver.provider; import com.fasterxml.jackson.databind.ObjectMapper; +import io.rudin.minetest.tileserver.config.Layer; import io.rudin.minetest.tileserver.config.LayerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,6 +35,10 @@ public class LayerConfigProvider implements Provider { ObjectMapper mapper = new ObjectMapper(); this.layers = mapper.readValue(layersInput, LayerConfig.class); + for (Layer layer: layers.layers){ + logger.info("Configured layer: id={} name={} from={} to={}", layer.id, layer.name, layer.from, layer.to); + } + layersInput.close(); } diff --git a/tileserver.properties b/tileserver.properties index 1394c28..3e57251 100644 --- a/tileserver.properties +++ b/tileserver.properties @@ -5,6 +5,6 @@ tilerenderer.updateinterval=10 #log.query.performance=true #block.parser.smartshop.enable=false #prometheus.enable=true -minetest.db.url=jdbc:postgresql://127.0.0.1:5432/postgres +minetest.db.url=jdbc:postgresql://127.0.0.1:5432/minetest static.files.location=src/main/resources/public