mobility-toolbox-js 3.0.0-beta.2 → 3.0.0-beta.4

package/ol/layers/MaplibreStyleLayer.js

@@ -135,25 +135,27 @@ class MaplibreStyleLayer extends MobilityLayerMixin(Layer) {
         if (!this.map || !this.maplibreLayer) {
             return;
         }
-        // Apply the initial visibiltity.
-        const { maplibreMap } = this.maplibreLayer;
-        if (!maplibreMap) {
-            // If the maplibreMap is not yet created because the  map has no target yet, we
+        if (!this.map.getTargetElement()) {
+            // If ther e is no target element the maplibreMap is not yet created, we
             // relaunch the initialisation when it's the case.
             this.olListenersKeys.push(this.map.on('change:target', () => {
                 this.attachToMap(map);
             }));
             return;
         }
-        // maplibreMap.loaded() and maplibreMap.isStyleLoaded() are reliable only on the first call of init.
-        // On the next call (when a topic change for example), these functions returns false because
-        // the style is being modified.
-        // That's why we rely on a property instead for the next calls.
-        if (maplibreMap.loaded()) {
-            this.onLoad();
-        }
-        else {
-            maplibreMap.once('load', this.onLoad);
+        // Apply the initial visibility if possible otherwise we wait for the load event of the layer
+        const { maplibreMap } = this.maplibreLayer;
+        if (maplibreMap) {
+            // maplibreMap.loaded() and maplibreMap.isStyleLoaded() are reliable only on the first call of init.
+            // On the next call (when a topic change for example), these functions returns false because
+            // the style is being modified.
+            // That's why we rely on a property instead for the next calls.
+            if (maplibreMap.loaded()) {
+                this.onLoad();
+            }
+            else {
+                maplibreMap.once('load', this.onLoad);
+            }
         }
         // Apply the visibiltity when layer's visibility change.
         this.olListenersKeys.push(
@@ -185,13 +187,12 @@ class MaplibreStyleLayer extends MobilityLayerMixin(Layer) {
     /** @private */
     addSources() {
         var _a;
-        if (!((_a = this.maplibreLayer) === null || _a === void 0 ? void 0 : _a.maplibreMap) || !Array.isArray(this.sources)) {
+        if (!((_a = this.maplibreLayer) === null || _a === void 0 ? void 0 : _a.maplibreMap) || !this.sources) {
             return;
         }
         const { maplibreMap } = this.maplibreLayer;
         if (maplibreMap) {
-            this.sources.forEach((source) => {
-                const { id } = source;
+            Object.entries(this.sources).forEach(([id, source]) => {
                 if (!maplibreMap.getSource(id)) {
                     maplibreMap.addSource(id, source);
                 }
@@ -201,13 +202,12 @@ class MaplibreStyleLayer extends MobilityLayerMixin(Layer) {
     /** @private */
     removeSources() {
         var _a;
-        if (!((_a = this.maplibreLayer) === null || _a === void 0 ? void 0 : _a.maplibreMap) || !Array.isArray(this.layers)) {
+        if (!((_a = this.maplibreLayer) === null || _a === void 0 ? void 0 : _a.maplibreMap) || !this.sources) {
             return;
         }
         const { maplibreMap } = this.maplibreLayer;
         if (maplibreMap) {
-            this.sources.forEach((source) => {
-                const { id } = source;
+            Object.keys(this.sources).forEach((id) => {
                 if (maplibreMap.getSource(id)) {
                     maplibreMap.removeSource(id);
                 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "mobility-toolbox-js",
   "license": "MIT",
   "description": "Toolbox for JavaScript applications in the domains of mobility and logistics.",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "module": "index.js",
   "exports": {