Merge pull request #411 from IGNF/fix/eulerian-trackers-dom-id

feat(widgets): ajout d'un id unique par widget pour tracking eulerian
IGNF · Dec 10, 2024 · 68313d0 · 68313d0
2 parents 7313874 + 6a0ce54
commit 68313d0
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 52 deletions.
diff --git a/...xtensions-openlayers-1.0.0-beta.0-291.tgz → ...xtensions-openlayers-1.0.0-beta.0-284.tgz b/...xtensions-openlayers-1.0.0-beta.0-291.tgz → ...xtensions-openlayers-1.0.0-beta.0-284.tgz
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "@vueuse/core": "^10.9.0",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.2",
-    "geopf-extensions-openlayers": "./geopf-extensions-openlayers-1.0.0-beta.0-291.tgz",
+    "geopf-extensions-openlayers": "./geopf-extensions-openlayers-1.0.0-beta.0-284.tgz",
     "ol": "8.2.0",
     "vue": "^3.4.21",
     "vue-router": "^4.3.0"

diff --git a/src/components/carte/Controls.vue b/src/components/carte/Controls.vue
@@ -70,17 +70,29 @@ log.debug(props.controlOptions);
 const shareOptions = {};
 const printOptions = {};
 
-const territoriesOptions = {
-  position: 'bottom-left',
-  panel : true,
-  title : "Sélectionner un territoire",
-  auto : false, // chargement auto des territoires par defaut
-  thumbnail : false, // imagette des territoires
-  reduce : false, // tuiles reduites par defaut
-  tiles : 3,
+const searchEngineOptions = {
+  id: "1",
+  collapsed: false,
+  collapsible: false,
+  displayButtonAdvancedSearch: true,
+  displayButtonGeolocate: true,
+  displayButtonCoordinateSearch: true,
+  displayButtonClose: false,
+  resources: {
+    search: true
+  },
+  searchOptions: {
+    addToMap: false,
+    filterServices : "WMTS,WMS,TMS",
+    filterWMTSPriority : true,
+    filterLayersPriority : dataStore.getFeatured().toString(),
+    serviceOptions: {}
+  },
+  markerUrl : IconGeolocationSVG
 };
 
 const layerSwitcherOptions = {
+  id: "2",
   options: {
     position : "top-right",
     collapsed: true,
@@ -90,116 +102,108 @@ const layerSwitcherOptions = {
 };
 
 const legendsOptions = {
+  id: "3",
   position: "top-right",
   panel: true,
   auto: true,
   draggable: false
 };
 
 const scaleLineOptions = {
+  id: "4",
   units: 'metric',
   bar: false,
 };
 
-const searchEngineOptions = {
-  collapsed: false,
-  collapsible: false,
-  displayButtonAdvancedSearch: true,
-  displayButtonGeolocate: true,
-  displayButtonCoordinateSearch: true,
-  displayButtonClose: false,
-  resources: {
-    search: true
-  },
-  searchOptions: {
-    addToMap: false,
-    filterServices : "WMTS,WMS,TMS",
-    filterWMTSPriority : true,
-    filterLayersPriority : dataStore.getFeatured().toString(),
-    serviceOptions: {}
-  },
-  markerUrl : IconGeolocationSVG
+const territoriesOptions = {
+  id: "5",
+  position: 'bottom-left',
+  panel : true,
+  title : "Sélectionner un territoire",
+  auto : false, // chargement auto des territoires par defaut
+  thumbnail : false, // imagette des territoires
+  reduce : false, // tuiles reduites par defaut
+  tiles : 3,
 };
 
 const getFeatureInfoOptions = {
+  id: "6",
   position: 'bottom-left'
 };
 
 const overviewMapOptions = {
+  id: "7",
   position: 'bottom-left'
 };
 
+const fullscreenOptions = {
+  id: "8",
+  position: 'bottom-right'
+};
+
 const zoomOptions = {
+  id: "9",
   position: 'bottom-right',
 };
 
-const drawingOptions = {
-  position: 'top-right',
-  gutter: false,
-  listable: true,
-}
-
-const attributionsOptions = {}
-
 const controlListOptions = {
+  id: "10",
   position: 'top-right',
   gutter: false,
   controlCatalogElement: document.getElementById('MenuControl'),
 }
 
-const isocurveOptions = {
-  position: 'top-right',
-  gutter: false,
-  listable: true,
-};
-
-const routeOptions = {
+const drawingOptions = {
+  id: "11",
   position: 'top-right',
   gutter: false,
   listable: true,
-};
+}
 
 const reverseGeocodeOptions = {
+  id: "12",
   position: 'top-right',
   gutter: false,
   listable: true,
 };
 
-const fullscreenOptions = {
-  position: 'bottom-right'
-};
-
-const measureLengthOptions = {
+const isocurveOptions = {
+  id: "13",
   position: 'top-right',
   gutter: false,
   listable: true,
 };
 
-const measureAreaOptions = {
+const routeOptions = {
+  id: "14",
   position: 'top-right',
   gutter: false,
   listable: true,
 };
 
-const measureAzimuthOptions = {
+const measureLengthOptions = {
+  id: "15",
   position: 'top-right',
   gutter: false,
   listable: true,
 };
 
-const elevationPathOptions = {
+const measureAreaOptions = {
+  id: "16",
   position: 'top-right',
   gutter: false,
   listable: true,
 };
 
-const layerImportOptions = {
+const measureAzimuthOptions = {
+  id: "17",
   position: 'top-right',
   gutter: false,
   listable: true,
 };
 
 const mousePositionOptions = {
+  id: "18",
   position: 'top-right',
   gutter: false,
   listable: true,
@@ -342,6 +346,20 @@ const mousePositionOptions = {
   ]
 };
 
+const elevationPathOptions = {
+  id: "19",
+  position: 'top-right',
+  gutter: false,
+  listable: true,
+};
+
+const layerImportOptions = {
+  id: "20",
+  position: 'top-right',
+  gutter: false,
+  listable: true,
+};
+
 </script>
 <!-- INFO : Affichage du contrôle
 >>> option visibility:true, si le contrôle est dans la liste