diff --git a/public/config/config.json b/public/config/config.json index ee7aa62a1c2c1c2d60eb17cb670c2f7002f2a753..bdcc148275da77a08f4776c8f46e3c15857a6307 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -14,12 +14,10 @@ "VUE_APP_RELOAD_INTERVAL": 15000, "VUE_APP_DISABLE_LOGIN_BUTTON":false, "VUE_APP_LOGIN_URL":"", - "DEFAULT_BASE_MAP":{ - "SERVICE": "https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png", - "OPTIONS": { + "DEFAULT_BASE_MAP_SERVICE": "https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png", + "DEFAULT_BASE_MAP_OPTIONS": { "attribution": "© contributeurs d'<a href='https://osm.org/copyright'>OpenStreetMap</a>", "maxZoom": 20 - } }, "DEFAULT_MAP_VIEW" : { "center": [47.0, 1.0], diff --git a/src/components/map-layers/SidebarLayers.vue b/src/components/map-layers/SidebarLayers.vue index 59c9b2addd2efc52d51f9443d944be6af1ae4aba..dff38f0550dd138d43fed667f3bdd174e2d604d6 100644 --- a/src/components/map-layers/SidebarLayers.vue +++ b/src/components/map-layers/SidebarLayers.vue @@ -171,8 +171,8 @@ export default { } else { mapUtil.addLayers( null, - this.$store.state.configuration.DEFAULT_BASE_MAP.SERVICE, - this.$store.state.configuration.DEFAULT_BASE_MAP.OPTIONS + this.$store.state.configuration.DEFAULT_BASE_MAP_SERVICE, + this.$store.state.configuration.DEFAULT_BASE_MAP_OPTIONS ); } setTimeout(this.initSortable.bind(this), 1000); diff --git a/src/store/modules/map.store.js b/src/store/modules/map.store.js index 3de93c65fc2e300642d82de0803e80eaf44afe9e..9a5154da83e274256f2286911a22ed96064dc9f3 100644 --- a/src/store/modules/map.store.js +++ b/src/store/modules/map.store.js @@ -143,8 +143,8 @@ const map = { } mapUtil.addLayers( layersToLoad, - this.state.configuration.DEFAULT_BASE_MAP.SERVICE, - this.state.configuration.DEFAULT_BASE_MAP.OPTIONS + this.state.configuration.DEFAULT_BASE_MAP_SERVICE, + this.state.configuration.DEFAULT_BASE_MAP_OPTIONS ); // Remove multiple interactions with the map diff --git a/src/views/feature/Feature_detail.vue b/src/views/feature/Feature_detail.vue index c5c54648752fbf820e066eb184433cd8b0c4c9d6..3825dc386c06a51eb559f7aa3f04f73a5f3dd060 100644 --- a/src/views/feature/Feature_detail.vue +++ b/src/views/feature/Feature_detail.vue @@ -711,8 +711,8 @@ export default { } mapUtil.addLayers( layersToLoad, - this.$store.state.configuration.DEFAULT_BASE_MAP.SERVICE, - this.$store.state.configuration.DEFAULT_BASE_MAP.OPTIONS + this.$store.state.configuration.DEFAULT_BASE_MAP_SERVICE, + this.$store.state.configuration.DEFAULT_BASE_MAP_OPTIONS ); mapUtil.getMap().dragging.disable(); diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue index 657502a980431a5907d483c658260b7ac84f6570..f24b1d0c2081ec2d6d85ca5d27aea6789d882cd9 100644 --- a/src/views/project/Project_detail.vue +++ b/src/views/project/Project_detail.vue @@ -1242,7 +1242,7 @@ export default { </script> <style> -@import "../../assets/resources/semantic-ui-2.4.2/semantic.min.css"; + #map { width: 100%; height: 100%;