Merge pull request #5024 from neo-garaix/red-ml-dep/legend-module

Reduce mainLizmap dependencies in Legend module
3liz · Dec 2, 2024 · 6d72c72 · 6d72c72
2 parents dbd0133 + dd9daf2
commit 6d72c72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/assets/src/modules/Legend.js b/assets/src/modules/Legend.js
@@ -5,7 +5,7 @@
  * @license MPL-2.0
  */
 
-import { mainLizmap } from './Globals.js';
+import { LayerTreeGroupState } from '../modules/state/LayerTree.js'
 import { updateLayerTreeLayerSymbology, updateLayerTreeGroupLayersSymbology } from '../modules/action/Symbology.js';
 
 /**
@@ -14,18 +14,22 @@ import { updateLayerTreeLayerSymbology, updateLayerTreeGroupLayersSymbology } fr
  */
 export default class Legend {
 
-    constructor() {
+    /**
+     * Create a legend instance
+     * @param {LayerTreeGroupState} layerTree - Root tree layer group
+     */
+    constructor(layerTree) {
         // Init all symbologies
-        if(mainLizmap.state.layerTree.childrenCount === 0){
+        if(layerTree.childrenCount === 0){
             return;
         }
 
-        updateLayerTreeGroupLayersSymbology(mainLizmap.state.layerTree);
+        updateLayerTreeGroupLayersSymbology(layerTree);
 
         // Refresh symbology when a layer's style changes
-        mainLizmap.state.rootMapGroup.addListener(
+        layerTree.addListener(
             evt => {
-                updateLayerTreeLayerSymbology(mainLizmap.state.layerTree.getTreeLayerByName(evt.name));
+                updateLayerTreeLayerSymbology(layerTree.getTreeLayerByName(evt.name));
             },['layer.style.changed']
         );
     }

diff --git a/assets/src/modules/Lizmap.js b/assets/src/modules/Lizmap.js
@@ -164,7 +164,7 @@ export default class Lizmap {
                 this.action = new Action();
                 this.featureStorage = new FeatureStorage();
                 this.popup = new Popup();
-                this.legend = new Legend();
+                this.legend = new Legend(this.state.layerTree);
                 this.search = new Search();
                 this.tooltip = new Tooltip();