layer fix
This commit is contained in:
parent
0062ca45ca
commit
d78b325547
12
.gitignore
vendored
12
.gitignore
vendored
@ -1,13 +1 @@
|
|||||||
target
|
|
||||||
.settings
|
|
||||||
.project
|
|
||||||
.classpath
|
|
||||||
.extract
|
|
||||||
*.log
|
|
||||||
*.mv.db
|
|
||||||
logs
|
|
||||||
node_modules
|
|
||||||
heimdallr-data
|
|
||||||
.idea
|
|
||||||
*.iml
|
|
||||||
tiles
|
tiles
|
13
layers.json
13
layers.json
@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"layers": [{
|
|
||||||
"id": 0,
|
|
||||||
"name": "Earth",
|
|
||||||
"from": -16,
|
|
||||||
"to": 160
|
|
||||||
},{
|
|
||||||
"id": 1,
|
|
||||||
"name": "Moon",
|
|
||||||
"from": 5000,
|
|
||||||
"to": 5500
|
|
||||||
}]
|
|
||||||
}
|
|
@ -161,7 +161,7 @@ public class TileRenderer {
|
|||||||
if (cache.has(layer.id, tileX, tileY, zoom)) {
|
if (cache.has(layer.id, tileX, tileY, zoom)) {
|
||||||
byte[] data = cache.get(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
|
//In case the cache disappears
|
||||||
return ImageIO.read(new ByteArrayInputStream(data));
|
return ImageIO.read(new ByteArrayInputStream(data));
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package io.rudin.minetest.tileserver.provider;
|
package io.rudin.minetest.tileserver.provider;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import io.rudin.minetest.tileserver.config.Layer;
|
||||||
import io.rudin.minetest.tileserver.config.LayerConfig;
|
import io.rudin.minetest.tileserver.config.LayerConfig;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -34,6 +35,10 @@ public class LayerConfigProvider implements Provider<LayerConfig> {
|
|||||||
ObjectMapper mapper = new ObjectMapper();
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
this.layers = mapper.readValue(layersInput, LayerConfig.class);
|
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();
|
layersInput.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,6 +5,6 @@ tilerenderer.updateinterval=10
|
|||||||
#log.query.performance=true
|
#log.query.performance=true
|
||||||
#block.parser.smartshop.enable=false
|
#block.parser.smartshop.enable=false
|
||||||
#prometheus.enable=true
|
#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
|
static.files.location=src/main/resources/public
|
||||||
|
Loading…
x
Reference in New Issue
Block a user