100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Bug fix for serving embedded map
Rich Turnerf5d98220f1af
diff --git a/manager/Dockerfile b/manager/Dockerfileindex 23034c252..c0f062d3a 100644--- a/manager/Dockerfile+++ b/manager/Dockerfile@@ -77,5 +77,6 @@ RUN mkdir -p /deployment/manager/extensionsADD lib /opt/app/libADD web /opt/web+ADD map /opt/mapENTRYPOINT java $MANAGER_JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Maindiff --git a/manager/build.gradle b/manager/build.gradleindex 73cfaf763..9e5a51378 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -46,6 +46,9 @@ distributions {into ("web") {from("${projectDir}/src/web")}+ into ("map") {+ from("${projectDir}/src/map")+ }}}}diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex 11a2f5983..e84cfdd73 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -168,11 +168,11 @@ public class MapService implements ContainerService {// }if (mapTilesPath == null) {- mapTilesPath = Paths.get(Objects.requireNonNull(Container.class.getClassLoader().getResource("mapdata.mbtiles")).toURI());+ mapTilesPath = Paths.get("/opt/map/mapdata.mbtiles");}if (mapSettingsPath == null) {- mapSettingsPath = Paths.get(Objects.requireNonNull(Container.class.getClassLoader().getResource("mapsettings.json")).toURI());+ mapSettingsPath = Paths.get("/opt/map/mapsettings.json");}container.getService(ManagerWebService.class).getApiSingletons().add(diff --git a/manager/src/main/resources/mapdata.mbtiles b/manager/src/main/resources/mapdata.mbtilesdeleted file mode 100644index c27e27128..000000000Binary files a/manager/src/main/resources/mapdata.mbtiles and /dev/null differdiff --git a/manager/src/main/resources/mapsettings.json b/manager/src/map/mapsettings.jsonsimilarity index 100%rename from manager/src/main/resources/mapsettings.jsonrename to manager/src/map/mapsettings.jsondiff --git a/test/build.gradle b/test/build.gradleindex 4cc5b8c43..d8ee5c381 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -26,6 +26,6 @@ test {testLogging {outputs.upToDateWhen {false}// Enable this to show STDOUT/STDERR on console when running tests- // showStandardStreams = true+ showStandardStreams = true}}