Merge branch 'main' into feature/menu-tierce

IGNF · Dec 17, 2024 · 6092970 · 6092970
2 parents a3f1db5 + a0589bf
commit 6092970
Show file tree

Hide file tree

Showing 28 changed files with 174 additions and 72 deletions.
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />

diff --git a/src/components/carte/Carto.vue b/src/components/carte/Carto.vue
@@ -61,7 +61,8 @@ const mapIsReady = computed(() => {
     <!-- Composant pour selectionner les widgets à afficher sur la carte -->
     <Controls
       v-if="mapIsReady"
-      :control-options="props.selectedControls"/>
+      :control-options="props.selectedControls"
+      :map-id="mainMap"/>
     <!-- Composant pour ajouter les couches sur la carte -->
     <Layers
       :map-Id="mainMap"

diff --git a/src/components/carte/Controls.vue b/src/components/carte/Controls.vue
@@ -42,7 +42,8 @@ import { useControls, useControlsExtensionPosition } from '@/composables/control
 import { useLogger } from 'vue-logger-plugin';
 
 const props = defineProps({
-  controlOptions: Array
+  controlOptions: Array,
+  mapId: String
 });
 
 // INFO
@@ -381,126 +382,147 @@ const layerImportOptions = {
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.Print.id)"
     :print-options="printOptions"
+    :map-id="mapId"
   /> -->
   <LayerSwitcher
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.LayerSwitcher.id)"
     :analytic="useControls.LayerSwitcher.analytic"
     :layer-switcher-options="layerSwitcherOptions"
+    :map-id="mapId"
   />
   <Legends
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.Legends.id)"
     :analytic="useControls.Legends.analytic"
     :legends-options="legendsOptions"
+    :map-id="mapId"
   />
   <Route
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.Route.id)"
     :analytic="useControls.Route.analytic"
     :route-options="routeOptions"
+    :map-id="mapId"
   />
   <Isocurve
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.Isocurve.id)"
     :analytic="useControls.Isocurve.analytic"
     :isocurve-options="isocurveOptions"
+    :map-id="mapId"
   />
   <ReverseGeocode
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.ReverseGeocode.id)"
     :analytic="useControls.ReverseGeocode.analytic"
     :reverse-geocode-options="reverseGeocodeOptions"
+    :map-id="mapId"
   />
   <FullScreen
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.FullScreen.id)"
     :analytic="useControls.FullScreen.analytic"
     :fullscreen-options="fullscreenOptions"
+    :map-id="mapId"
   />
   <Zoom
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.Zoom.id)"
     :analytic="useControls.Zoom.analytic"
     :zoom-options="zoomOptions"
+    :map-id="mapId"
   />
   <SearchEngine
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.SearchEngine.id)"
     :analytic="useControls.SearchEngine.analytic"
     :search-engine-options="searchEngineOptions"
+    :map-id="mapId"
   />
   <GetFeatureInfo
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.GetFeatureInfo.id)"
     :analytic="useControls.GetFeatureInfo.analytic"
     :get-feature-info-options="getFeatureInfoOptions"
+    :map-id="mapId"
   />
   <ScaleLine
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.ScaleLine.id)"
     :analytic="useControls.ScaleLine.analytic"
     :scale-line-options="scaleLineOptions"
+    :map-id="mapId"
   />
   <OverviewMap
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.OverviewMap.id)"
     :analytic="useControls.OverviewMap.analytic"
     :overview-map-options="overviewMapOptions"
+    :map-id="mapId"
   />
   <Territories
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.Territories.id)"
     :analytic="useControls.Territories.analytic"
     :territories-options="territoriesOptions"
+    :map-id="mapId"
   />
   <MeasureLength
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.MeasureLength.id)"
     :analytic="useControls.MeasureLength.analytic"
     :measure-length-options="measureLengthOptions"
+    :map-id="mapId"
   />
   <MeasureArea
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.MeasureArea.id)"
     :analytic="useControls.MeasureArea.analytic"
     :measure-area-options="measureAreaOptions"
+    :map-id="mapId"
   />
   <MeasureAzimuth
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.MeasureAzimuth.id)"
     :analytic="useControls.MeasureAzimuth.analytic"
     :measure-azimuth-options="measureAzimuthOptions"
+    :map-id="mapId"
   />
   <MousePosition
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.MousePosition.id)"
     :analytic="useControls.MousePosition.analytic"
     :mouse-position-options="mousePositionOptions"
+    :map-id="mapId"
   />
   <Drawing
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.Drawing.id)"
     :analytic="useControls.Drawing.analytic"
     :drawing-options="drawingOptions"
+    :map-id="mapId"
   />
   <ElevationPath
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.ElevationPath.id)"
     :analytic="useControls.ElevationPath.analytic"
     :elevation-path-options="elevationPathOptions"
+    :map-id="mapId"
   />
   <LayerImport
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.LayerImport.id)"
     :analytic="useControls.LayerImport.analytic"
     :layer-import-options="layerImportOptions"
+    :map-id="mapId"
   />
   <ControlList
     v-if="controlOptions"
     :visibility="props.controlOptions.includes(useControls.ControlList.id)"
     :analytic="useControls.ControlList.analytic"
     :control-list-options="controlListOptions"
+    :map-id="mapId"
   />
 </template>
 

diff --git a/src/components/carte/Map.vue b/src/components/carte/Map.vue
@@ -31,10 +31,10 @@ const mapRef = ref(null)
  * Map
  * default controls are removed (rotate, zoom and attributions)
  */
-const map = reactive(new Map({
+const map = new Map({
   target: props.mapId,
   controls: [] // on supprime les contrôles par defaut !
-  }))
+  })
 provide(props.mapId, map)
 
 onMounted(() => {

diff --git a/src/components/carte/control/Attributions.vue b/src/components/carte/control/Attributions.vue
@@ -7,13 +7,14 @@ import Attributions from 'ol/control/Attribution'
 // - tracker Eulerian !?
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   attributionsOptions: Object
 })
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap)
+
+const map = inject(props.mapId)
 const attributions = ref(new Attributions(props.attributionsOptions))
 
 onMounted(() => {

diff --git a/src/components/carte/control/ControlList.vue b/src/components/carte/control/ControlList.vue
@@ -5,18 +5,19 @@ import { useLogger } from 'vue-logger-plugin'
 import {
   ControlList
 } from 'geopf-extensions-openlayers'
-import { mainMap } from "@/composables/keys"
+
 
 import { selectedControls } from '@/composables/mapControls'
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   controlListOptions: Object
 })
 
 const log = useLogger()
 
-const map = inject(mainMap)
+const map = inject(props.mapId)
 const controlList = ref(new ControlList(props.controlListOptions))
 
 const isSmallScreen = useMatchMedia('SM')

diff --git a/src/components/carte/control/Drawing.vue b/src/components/carte/control/Drawing.vue
@@ -1,15 +1,16 @@
 <script setup lang="js">
 import { useActionButtonEulerian } from '@/composables/actionEulerian.js';
 import { Drawing } from 'geopf-extensions-openlayers';
-import { mainMap } from "@/composables/keys"
+
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   drawingOptions: Object
 });
 
-const map = inject(mainMap)
+const map = inject(props.mapId)
 const drawing = ref(new Drawing(props.drawingOptions));
 
 onMounted(() => {

diff --git a/src/components/carte/control/ElevationPath.vue b/src/components/carte/control/ElevationPath.vue
@@ -6,15 +6,16 @@ import {
 } from 'geopf-extensions-openlayers'
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   elevationPathOptions: Object
 })
 
 const log = useLogger()
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap)
+
+const map = inject(props.mapId)
 const elevationPath = ref(new ElevationPath(props.elevationPathOptions))
 
 onMounted(() => {

diff --git a/src/components/carte/control/FullScreen.vue b/src/components/carte/control/FullScreen.vue
@@ -5,13 +5,14 @@ import { GeoportalFullScreen } from 'geopf-extensions-openlayers'
 // ajouter un ID sur le bouton pour y ajouter un tracker Eulerian
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   fullscreenOptions: Object
 })
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap)
+
+const map = inject(props.mapId)
 const fullscreen = ref(new GeoportalFullScreen(props.fullscreenOptions))
 
 onMounted(() => {

diff --git a/src/components/carte/control/GetFeatureInfo.vue b/src/components/carte/control/GetFeatureInfo.vue
@@ -6,15 +6,16 @@ import { useActionButtonEulerian } from '@/composables/actionEulerian.js';
 import { GetFeatureInfo } from 'geopf-extensions-openlayers';
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   getFeatureInfoOptions: Object
 });
 
 const log = useLogger();
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap);
+
+const map = inject(props.mapId);
 const getFeatureInfo = ref(new GetFeatureInfo(props.getFeatureInfoOptions));
 
 const isSmallScreen = useMatchMedia('SM')

diff --git a/src/components/carte/control/Isocurve.vue b/src/components/carte/control/Isocurve.vue
@@ -7,6 +7,7 @@ import { useActionButtonEulerian } from '@/composables/actionEulerian.js';
 import { Isocurve } from 'geopf-extensions-openlayers'
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   isocurveOptions: Object
@@ -15,8 +16,8 @@ const props = defineProps({
 const log = useLogger()
 const store = useDataStore();
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap)
+
+const map = inject(props.mapId)
 const isocurve = ref(new Isocurve(props.isocurveOptions))
 
 onMounted(() => {

diff --git a/src/components/carte/control/LayerImport.vue b/src/components/carte/control/LayerImport.vue
@@ -6,15 +6,16 @@ import {
 } from 'geopf-extensions-openlayers'
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   layerImportOptions: Object
 })
 
 const log = useLogger()
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap)
+
+const map = inject(props.mapId)
 const layerImport = ref(new LayerImport(props.layerImportOptions))
 
 onMounted(() => {

diff --git a/src/components/carte/control/LayerSwitcher.vue b/src/components/carte/control/LayerSwitcher.vue
@@ -12,6 +12,7 @@ import {
 import { LayerSwitcher } from 'geopf-extensions-openlayers';
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   layerSwitcherOptions: Object
@@ -21,8 +22,7 @@ const log = useLogger();
 const mapStore = useMapStore();
 const dataStore = useDataStore();
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap)
+const map = inject(props.mapId)
 const layerSwitcher = ref(new LayerSwitcher(props.layerSwitcherOptions));
 
 onMounted(() => {

diff --git a/src/components/carte/control/Legends.vue b/src/components/carte/control/Legends.vue
@@ -3,13 +3,13 @@ import { useActionButtonEulerian } from '@/composables/actionEulerian.js';
 import { Legends } from 'geopf-extensions-openlayers';
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   legendsOptions: Object
 });
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap);
+const map = inject(props.mapId);
 const legends = ref(new Legends(props.legendsOptions));
 
 onMounted(() => {

diff --git a/src/components/carte/control/MeasureArea.vue b/src/components/carte/control/MeasureArea.vue
@@ -3,13 +3,14 @@ import { useActionButtonEulerian } from '@/composables/actionEulerian.js';
 import { MeasureArea } from 'geopf-extensions-openlayers';
 
 const props = defineProps({
+  mapId: String,
   visibility: Boolean,
   analytic: Boolean,
   measureAreaOptions: Object
 })
 
-import { mainMap } from "@/composables/keys"
-const map = inject(mainMap);
+
+const map = inject(props.mapId);
 const measureArea = ref(new MeasureArea(props.measureAreaOptions));
 
 onMounted(() => {