Merge pull request #3849 from nboisteault/layer_order

Handle QGIS `Control rendering order`
3liz · Aug 21, 2023 · 9e86739 · 9e86739
2 parents 35b0086 + 723f972
commit 9e86739
Show file tree

Hide file tree

Showing 4 changed files with 2,252 additions and 1 deletion.
diff --git a/assets/src/modules/BaseLayersMap.js b/assets/src/modules/BaseLayersMap.js
@@ -185,6 +185,8 @@ export default class BaseLayersMap extends olMap {
         // Array of layers and groups in overlayLayerGroup
         this._overlayLayersAndGroups = [];
 
+        const layersCount = mainLizmap.state.rootMapGroup.findMapLayers().length;
+
         // Returns a layer or a layerGroup depending of the node type
         const createNode = (node) => {
             if(node.type === 'group'){
@@ -274,6 +276,9 @@ export default class BaseLayersMap extends olMap {
                     name: node.name
                 });
 
+                // OL layers zIndex is the reverse of layer's order given by cfg
+                layer.setZIndex(layersCount - 1 - node.layerOrder);
+
                 this._overlayLayersAndGroups.push(layer);
                 this._statesOlLayersandGroupsMap.set(node.name, [node, layer]);
                 return layer;

diff --git a/assets/src/modules/state/Layer.js b/assets/src/modules/state/Layer.js
@@ -1282,7 +1282,7 @@ export class LayerGroupState extends LayerItemState {
      **/
     get layerOrder() {
         if (this._layerOrder == -1) {
-            for (const layer of this.itemState.findLayers()) {
+            for (const layer of this.findLayers()) {
                 if (this._layerOrder == -1 || layer.layerOrder < this._layerOrder) {
                     this._layerOrder = layer.layerOrder;
                 }