diff --git a/common/src/main/java/de/bluecolored/bluemap/common/WebFilesManager.java b/common/src/main/java/de/bluecolored/bluemap/common/WebFilesManager.java index e9db5ec3e..99c730c67 100644 --- a/common/src/main/java/de/bluecolored/bluemap/common/WebFilesManager.java +++ b/common/src/main/java/de/bluecolored/bluemap/common/WebFilesManager.java @@ -123,7 +123,6 @@ private static class Settings { private boolean useCookies = true; - private boolean enableFreeFlight = true; private boolean defaultToFlatView = false; private String startLocation = null; @@ -150,7 +149,6 @@ private static class Settings { public void setFrom(WebappConfig config) { this.useCookies = config.isUseCookies(); - this.enableFreeFlight = config.isEnableFreeFlight(); this.defaultToFlatView = config.isDefaultToFlatView(); this.startLocation = config.getStartLocation().orElse(null); this.resolutionDefault = config.getResolutionDefault(); diff --git a/common/src/main/java/de/bluecolored/bluemap/common/config/MapConfig.java b/common/src/main/java/de/bluecolored/bluemap/common/config/MapConfig.java index 7497c6417..16469aeba 100644 --- a/common/src/main/java/de/bluecolored/bluemap/common/config/MapConfig.java +++ b/common/src/main/java/de/bluecolored/bluemap/common/config/MapConfig.java @@ -75,7 +75,10 @@ public class MapConfig implements MapSettings { private boolean renderEdges = true; - private boolean saveHiresLayer = true; + private boolean enablePerspectiveView = true; + private boolean enableFlatView = true; + private boolean enableFreeFlightView = true; + private boolean enableHires = true; private String storage = "file"; diff --git a/common/src/main/java/de/bluecolored/bluemap/common/config/WebappConfig.java b/common/src/main/java/de/bluecolored/bluemap/common/config/WebappConfig.java index c61ba42d4..cdb4166ba 100644 --- a/common/src/main/java/de/bluecolored/bluemap/common/config/WebappConfig.java +++ b/common/src/main/java/de/bluecolored/bluemap/common/config/WebappConfig.java @@ -42,7 +42,6 @@ public class WebappConfig { private boolean useCookies = true; - private boolean enableFreeFlight = true; private boolean defaultToFlatView = false; private String startLocation = null; @@ -82,10 +81,6 @@ public boolean isUseCookies() { return useCookies; } - public boolean isEnableFreeFlight() { - return enableFreeFlight; - } - public boolean isDefaultToFlatView() { return defaultToFlatView; } diff --git a/common/src/main/resources/de/bluecolored/bluemap/config/maps/map.conf b/common/src/main/resources/de/bluecolored/bluemap/config/maps/map.conf index 176fd79eb..8ba99c6de 100644 --- a/common/src/main/resources/de/bluecolored/bluemap/config/maps/map.conf +++ b/common/src/main/resources/de/bluecolored/bluemap/config/maps/map.conf @@ -96,13 +96,28 @@ min-inhabited-time: 0 # Default is true render-edges: true -# Whether the hires-layer will be saved to the storage. +# Whether the perspective view will be enabled for this map. +# Changing this to true requires a re-render of the map, only if the hires-layer is enabled and free-flight view is disabled. +# Default is true +enable-perspective-view: true + +# Whether the flat (isometric, top-down) view will be enabled for this map. +# Having only flat-view enabled while disabling free-flight and perspective will speed up the render and reduce the maps storage-size. +# Default is true +enable-flat-view: true + +# Whether the free-flight view will be enabled for this map. +# Changing this to true requires a re-render of the map, only if the hires-layer is enabled and perspective view is disabled. +# Default is true +enable-free-flight-view: true + +# Whether the hires-layer will be enabled. # Disabling this will speed up rendering and reduce the size of the map-files a lot. # But you will not be able to see the full 3d-models if you zoom in on the map. # Changing this to false will not remove any existing tiles, existing tiles just won't get updated anymore. # Changing this to true will require a re-render of the map. # Default is true -save-hires-layer: true +enable-hires: true # This defines the storage-config that will be used to save this map. # You can find your storage configs next to this config file in the 'storages'-folder. diff --git a/common/src/main/resources/de/bluecolored/bluemap/config/webapp.conf b/common/src/main/resources/de/bluecolored/bluemap/config/webapp.conf index 3f40d016a..8032ef5ab 100644 --- a/common/src/main/resources/de/bluecolored/bluemap/config/webapp.conf +++ b/common/src/main/resources/de/bluecolored/bluemap/config/webapp.conf @@ -22,10 +22,6 @@ update-settings-file: true # Default is true use-cookies: true -# If the free-flight-mode in the web-application is enabled or not. -# Default is true -enable-free-flight: true - # If the webapp will default to flat-view instead of perspective-view. # Default is false default-to-flat-view: false diff --git a/common/webapp/src/components/ControlBar/ControlsSwitch.vue b/common/webapp/src/components/ControlBar/ControlsSwitch.vue index 0bc4a3150..756beb9c5 100644 --- a/common/webapp/src/components/ControlBar/ControlsSwitch.vue +++ b/common/webapp/src/components/ControlBar/ControlsSwitch.vue @@ -1,6 +1,6 @@