JS: Main Event lizmap.modules.initialized

Author: rldhont

assets/src/index.js

@@ -54,6 +54,30 @@ const waitFor = async function waitFor(maxWait, sleepStep, f){
     return waitingTime;
 };
 
+const definedCustomElements = () => {
+    window.customElements.define('lizmap-geolocation', Geolocation);
+    window.customElements.define('lizmap-geolocation-survey', GeolocationSurvey);
+    window.customElements.define('lizmap-features-table', FeaturesTable);
+    window.customElements.define('lizmap-selection-tool', SelectionTool);
+    window.customElements.define('lizmap-selection-invert', SelectionInvert);
+    window.customElements.define('lizmap-snapping', Snapping);
+    window.customElements.define('lizmap-scaleline', Scaleline);
+    window.customElements.define('lizmap-mouse-position', MousePosition);
+    window.customElements.define('lizmap-digitizing', Digitizing);
+    window.customElements.define('lizmap-overviewmap', OverviewMap);
+    window.customElements.define('lizmap-feature-toolbar', FeatureToolbar);
+    window.customElements.define('lizmap-reverse-geom', ReverseGeom);
+    window.customElements.define('lizmap-paste-geom', PasteGeom);
+    window.customElements.define('lizmap-action-selector', ActionSelector);
+    window.customElements.define('lizmap-print', Print);
+    window.customElements.define('lizmap-fullscreen', FullScreen);
+    window.customElements.define('lizmap-base-layers', BaseLayers);
+    window.customElements.define('lizmap-treeview', Treeview);
+    window.customElements.define('lizmap-navbar', NavBar);
+    window.customElements.define('lizmap-tooltip', Tooltip);
+    window.customElements.define('lizmap-message', Message);
+}
+
 /**
  * Init Lizmap application
  * This function is called when the Lizmap application is ready to be initialized.
@@ -74,27 +98,14 @@ const initLizmapApp = () => {
 
         },
         uicreated: () => {
-            window.customElements.define('lizmap-geolocation', Geolocation);
-            window.customElements.define('lizmap-geolocation-survey', GeolocationSurvey);
-            window.customElements.define('lizmap-features-table', FeaturesTable);
-            window.customElements.define('lizmap-selection-tool', SelectionTool);
-            window.customElements.define('lizmap-selection-invert', SelectionInvert);
-            window.customElements.define('lizmap-snapping', Snapping);
-            window.customElements.define('lizmap-scaleline', Scaleline);
-            window.customElements.define('lizmap-mouse-position', MousePosition);
-            window.customElements.define('lizmap-digitizing', Digitizing);
-            window.customElements.define('lizmap-overviewmap', OverviewMap);
-            window.customElements.define('lizmap-feature-toolbar', FeatureToolbar);
-            window.customElements.define('lizmap-reverse-geom', ReverseGeom);
-            window.customElements.define('lizmap-paste-geom', PasteGeom);
-            window.customElements.define('lizmap-action-selector', ActionSelector);
-            window.customElements.define('lizmap-print', Print);
-            window.customElements.define('lizmap-fullscreen', FullScreen);
-            window.customElements.define('lizmap-base-layers', BaseLayers);
-            window.customElements.define('lizmap-treeview', Treeview);
-            window.customElements.define('lizmap-navbar', NavBar);
-            window.customElements.define('lizmap-tooltip', Tooltip);
-            window.customElements.define('lizmap-message', Message);
+            if (lizMap.mainLizmap.legend !== undefined) {
+                definedCustomElements();
+            } else {
+                lizMap.mainEventDispatcher.addListener(
+                    definedCustomElements,
+                    'lizmap.modules.initialized'
+                );
+            }
         }
     });
 

assets/src/modules/Globals.js

@@ -6,8 +6,8 @@
 import Lizmap from './Lizmap.js';
 import EventDispatcher from '../utils/EventDispatcher.js';
 
-const mainLizmap = new Lizmap();
 const mainEventDispatcher = new EventDispatcher();
+const mainLizmap = new Lizmap(mainEventDispatcher);
 
 export {
     mainLizmap,

assets/src/modules/Lizmap.js

@@ -51,7 +51,8 @@ import { MapLayerLoadStatus } from './state/MapLayer.js';
  */
 export default class Lizmap {
 
-    constructor() {
+    constructor(eventDispatcher) {
+        this._eventDispatcher = eventDispatcher;
         lizMap.events.on({
             configsloaded: (configs) => {
                 const wmsParser = new WMSCapabilities();
@@ -186,6 +187,7 @@ export default class Lizmap {
                             this.map,
                             this._lizmap3
                         );
+                        eventDispatcher.dispatch('lizmap.modules.initialized');
                     }
                 };
                 const visibleLayers = this.state.rootMapGroup.findMapLayers().filter(layer => layer.visibility);
@@ -221,6 +223,14 @@ export default class Lizmap {
         });
     }
 
+    /**
+     * The main event dispatcher
+     * @type {object}
+     */
+    get eventDispatcher() {
+        return this._eventDispatcher;
+    }
+
     /**
      * Is new OL map on top of OL2 one?
      * @type {boolean}