mobility-toolbox-js 3.0.0-beta.1 → 3.0.0-beta.3

package/common/utils/getLayersAsFlatArray.js

@@ -8,7 +8,7 @@ const getLayersAsFlatArray = (layersOrLayer) => {
     let flatLayers = [];
     layers.forEach((layer) => {
         flatLayers.push(layer);
-        const { children } = layer;
+        const children = layer.children || layer.get('children') || {};
         flatLayers = flatLayers.concat(getLayersAsFlatArray(children || []));
     });
     return flatLayers;

package/mbt.js

@@ -20225,7 +20225,7 @@ uniform ${i3} ${s3} u_${a3};
     let flatLayers = [];
     layers.forEach((layer) => {
       flatLayers.push(layer);
-      const { children } = layer;
+      const children = layer.children || layer.get("children") || {};
       flatLayers = flatLayers.concat(getLayersAsFlatArray(children || []));
     });
     return flatLayers;
@@ -45730,7 +45730,7 @@ uniform ${i3} ${s3} u_${a3};
       container.style.width = "100%";
       container.style.height = "100%";
       this.mbMap = this.createMap({
-        style: this.getStyle() || { version: "8", sources: {}, layers: [] },
+        style: this.getStyle(),
         container,
         ...this.options?.mapOptions || {}
       });
@@ -46101,11 +46101,11 @@ uniform ${i3} ${s3} u_${a3};
         maplibreMap.once("load", this.onLoad);
       }
       this.olListenersKeys.push(
+        // @ts-expect-error 'load' is a custom event form mobility-toolbox-js
+        this.maplibreLayer.on("load", this.onLoad.bind(this)),
         this.on("change:visible", (evt) => {
           this.applyLayoutVisibility(evt);
         }),
-        // @ts-expect-error 'load' is a custom event form mobility-toolbox-js
-        this.maplibreLayer.on("load", this.onLoad),
         this.on("propertychange", (evt) => {
           if (/(sources|layers|layersFilter|maplibreLayer|beforeId|)/.test(evt.key)) {
             this.detachFromMap();
@@ -46128,13 +46128,12 @@ uniform ${i3} ${s3} u_${a3};
     }
     /** @private */
     addSources() {
-      if (!this.maplibreLayer?.maplibreMap || !Array.isArray(this.sources)) {
+      if (!this.maplibreLayer?.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);
           }
@@ -46143,13 +46142,12 @@ uniform ${i3} ${s3} u_${a3};
     }
     /** @private */
     removeSources() {
-      if (!this.maplibreLayer?.maplibreMap || !Array.isArray(this.layers)) {
+      if (!this.maplibreLayer?.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);
           }