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

REDMINE_ISSUE-13775

See merge request !379

src/services/map-service.js

@@ -116,7 +116,7 @@ const mapService = {
         overlay.setPosition(undefined);
         closer.blur();
         return false;
-      };
+      }; 
     }
     this.map.addOverlay(this.overlay);
 
@@ -244,8 +244,11 @@ const mapService = {
   addLayers: function (layers, serviceMap, optionsMap, schemaType) {
     this.layers = layers;
     if (layers) { //* if admin has defined basemaps for this project
+      let count = 0;
       layers.forEach((layer) => {
+
         if (layer) {
+          count +=1;
           const options = layer.options;
           if (options) {
             options.noWrap = true;
@@ -268,6 +271,7 @@ const mapService = {
               dictLayersToLeaflet[layer.id] = layerTms;
             }
           }
+          dictLayersToLeaflet[layer.id].setZIndex(count);
         }
       });
     } else { //* else when no basemaps defined
@@ -358,6 +362,7 @@ const mapService = {
     });
     this.mvtLayer.featureTypes = featureTypes;
     this.mvtLayer.project_slug = projectSlug;
+    this.mvtLayer.setZIndex(30);
     this.map.addLayer(this.mvtLayer);
     window.layerMVT = this.mvtLayer;
   },
@@ -462,7 +467,7 @@ const mapService = {
       source: drawSource,
       style: styleFunction,
     });
-
+    olLayer.setZIndex(29);
     this.map.addLayer(olLayer);
     return drawSource;
   },