Skip to content
This repository was archived by the owner on Apr 7, 2019. It is now read-only.

Commit d78b325

Browse files
layer fix
1 parent 0062ca4 commit d78b325

File tree

5 files changed

+8
-28
lines changed

5 files changed

+8
-28
lines changed

.gitignore

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
target
2-
.settings
3-
.project
4-
.classpath
5-
.extract
6-
*.log
7-
*.mv.db
8-
logs
9-
node_modules
10-
heimdallr-data
11-
.idea
12-
*.iml
13-
tiles
1+
tiles

layers.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/main/java/io/rudin/minetest/tileserver/TileRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public BufferedImage renderImage(Layer layer, int tileX, int tileY, int zoom) th
161161
if (cache.has(layer.id, tileX, tileY, zoom)) {
162162
byte[] data = cache.get(layer.id, tileX, tileY, zoom);
163163

164-
if (data != null)
164+
if (data != null && data.length > 0)
165165
//In case the cache disappears
166166
return ImageIO.read(new ByteArrayInputStream(data));
167167
}

src/main/java/io/rudin/minetest/tileserver/provider/LayerConfigProvider.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.rudin.minetest.tileserver.provider;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import io.rudin.minetest.tileserver.config.Layer;
45
import io.rudin.minetest.tileserver.config.LayerConfig;
56
import org.slf4j.Logger;
67
import org.slf4j.LoggerFactory;
@@ -34,6 +35,10 @@ public LayerConfigProvider() throws Exception {
3435
ObjectMapper mapper = new ObjectMapper();
3536
this.layers = mapper.readValue(layersInput, LayerConfig.class);
3637

38+
for (Layer layer: layers.layers){
39+
logger.info("Configured layer: id={} name={} from={} to={}", layer.id, layer.name, layer.from, layer.to);
40+
}
41+
3742
layersInput.close();
3843
}
3944

tileserver.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ tilerenderer.updateinterval=10
55
#log.query.performance=true
66
#block.parser.smartshop.enable=false
77
#prometheus.enable=true
8-
minetest.db.url=jdbc:postgresql://127.0.0.1:5432/postgres
8+
minetest.db.url=jdbc:postgresql://127.0.0.1:5432/minetest
99

1010
static.files.location=src/main/resources/public

0 commit comments

Comments
 (0)