Merge branch 'redmine-issues/16324' into 'develop'

REDMINE_ISSUE-16324|Customisation fond de cartes - duplication de couche et ordre incorrect

See merge request !548

src/components/Map/LayerSelector.vue

@@ -28,8 +28,8 @@
       :data-basemap-index="basemap.id"
     >
       <div
-        v-for="(layer, index) in basemap.layers"
-        :key="basemap.id + '-' + layer.id + '-' + index"
+        v-for="layer in basemap.layers"
+        :key="basemap.id + '-' + layer.id"
         class="layer-item transition visible item list-group-item"
         :data-id="layer.id"
       >

src/components/Map/SidebarLayers.vue

@@ -235,16 +235,16 @@ export default {
     },
 
     onlayerMove() {
-      // Get the names of the current layers in order.
-      const currentLayersNamesInOrder = Array.from(
-        document.getElementsByClassName('layer-item transition visible')
+      // Get ids of the draggable layers in its current order.
+      const currentLayersIdInOrder = Array.from(
+        document.querySelectorAll('.content.active .layer-item.transition.visible')
       ).map((el) => parseInt(el.attributes['data-id'].value));
-      // Create an array to put the layers in order.
+      // Create an array to put the original layers in the same order.
       let movedLayers = [];
 
-      for (const layerName of currentLayersNamesInOrder) {
+      for (const layerId of currentLayersIdInOrder) {
         movedLayers.push(
-          this.activeBasemap.layers.find((el) => el.id === layerName)
+          this.activeBasemap.layers.find((el) => el.id === layerId)
         );
       }
       // Remove existing layers undefined