block info layer

minetest-mapserver · Jul 18, 2018 · 20b2262 · 20b2262
1 parent b86d975
commit 20b2262
Show file tree

Hide file tree

Showing 18 changed files with 193 additions and 66 deletions.
diff --git a/src/main/java/io/rudin/minetest/tileserver/TileServer.java b/src/main/java/io/rudin/minetest/tileserver/TileServer.java
@@ -18,10 +18,7 @@
 import io.rudin.minetest.tileserver.module.ServiceModule;
 import io.rudin.minetest.tileserver.listener.PoiMapBlockListener;
 import io.rudin.minetest.tileserver.listener.TravelNetBlockListener;
-import io.rudin.minetest.tileserver.route.ConfigRoute;
-import io.rudin.minetest.tileserver.route.PlayerRoute;
-import io.rudin.minetest.tileserver.route.PoiRoute;
-import io.rudin.minetest.tileserver.route.TileRoute;
+import io.rudin.minetest.tileserver.route.*;
 import io.rudin.minetest.tileserver.transformer.JsonTransformer;
 import io.rudin.minetest.tileserver.ws.WebSocketHandler;
 import io.rudin.minetest.tileserver.ws.WebSocketUpdater;
@@ -55,7 +52,9 @@ public static void main(String[] args) throws Exception {
 		get("/tiles/:z/:x/:y", injector.getInstance(TileRoute.class));
 		get("/player", injector.getInstance(PlayerRoute.class), json);
 		get("/config", injector.getInstance(ConfigRoute.class), json);
-		get("/listener", injector.getInstance(PoiRoute.class), json);
+
+		get("/travelnet", injector.getInstance(TravelnetRoute.class), json);
+		get("/poi", injector.getInstance(PoiRoute.class), json);
 
 		//Initialize web server
 		init();

diff --git a/src/main/java/io/rudin/minetest/tileserver/blockdb/DefaultSchema.java b/src/main/java/io/rudin/minetest/tileserver/blockdb/DefaultSchema.java
diff --git a/src/main/java/io/rudin/minetest/tileserver/blockdb/Tables.java b/src/main/java/io/rudin/minetest/tileserver/blockdb/Tables.java
diff --git a/src/main/java/io/rudin/minetest/tileserver/blockdb/tables/Poi.java b/src/main/java/io/rudin/minetest/tileserver/blockdb/tables/Poi.java
diff --git a/src/main/java/io/rudin/minetest/tileserver/blockdb/tables/records/PoiRecord.java b/src/main/java/io/rudin/minetest/tileserver/blockdb/tables/records/PoiRecord.java
diff --git a/src/main/java/io/rudin/minetest/tileserver/config/TileServerConfig.java b/src/main/java/io/rudin/minetest/tileserver/config/TileServerConfig.java
@@ -67,11 +67,11 @@ public interface TileServerConfig extends Config {
 	 */
 
 	@Key("block.parser.poi.enable")
-	@DefaultValue("false")
+	@DefaultValue("true")
 	boolean parserPoiEnable();
 
 	@Key("block.parser.travelnet.enable")
-	@DefaultValue("false")
+	@DefaultValue("true")
 	boolean parserTravelnetEnable();
 
 	@Key("block.parser.smartshop.enable")

diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/PoiMapBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/PoiMapBlockListener.java
@@ -17,7 +17,7 @@
 @Singleton
 public class PoiMapBlockListener {
 
-    private static final String POIBLOCK_NAME = "tileserver:listener";
+    private static final String POIBLOCK_NAME = "tileserver:poi";
 
     @Inject
     public PoiMapBlockListener(EventBus eventBus, DSLContext ctx){

diff --git a/src/main/java/io/rudin/minetest/tileserver/route/ConfigRoute.java b/src/main/java/io/rudin/minetest/tileserver/route/ConfigRoute.java
@@ -27,6 +27,8 @@ public class ConfigRoute implements Route {
 	public ConfigRoute(TileServerConfig cfg){
 		config.put("matomo.id", cfg.matomoTrackerId());
 		config.put("matomo.url", cfg.matomoTrackerUrl());
+		config.put("parser.poi", cfg.parserPoiEnable());
+		config.put("parser.travelnet", cfg.parserTravelnetEnable());
 	}
 
 	private final Map<String, Object> config = new HashMap<>();