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

package/ol/layers/MapGlLayer.js

@@ -103,7 +103,7 @@ class MapGlLayer extends MobilityLayerMixin(Layer) {
          * A Maplibre map
          * @type {maplibregl.Map}
          */
-        this.mbMap = this.createMap(Object.assign({ style: this.getStyle() || { version: '8', sources: {}, layers: [] }, container }, (((_c = this.options) === null || _c === void 0 ? void 0 : _c.mapOptions) || {})));
+        this.mbMap = this.createMap(Object.assign({ style: this.getStyle(), container }, (((_c = this.options) === null || _c === void 0 ? void 0 : _c.mapOptions) || {})));
         this.mbMap.on('sourcedata', () => {
             var _a;
             (_a = this.getSource()) === null || _a === void 0 ? void 0 : _a.refresh(); // Refresh attribution

package/ol/layers/MaplibreStyleLayer.js

@@ -156,13 +156,13 @@ class MaplibreStyleLayer extends MobilityLayerMixin(Layer) {
             maplibreMap.once('load', this.onLoad);
         }
         // Apply the visibiltity when layer's visibility change.
-        this.olListenersKeys.push(this.on('change:visible', (evt) => {
+        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) => {
             // Once the map is loaded we can apply visiblity without waiting
             // the style. Maplibre take care of the application of style changes.
             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) => {
+        }), this.on('propertychange', (evt) => {
             if (/(sources|layers|layersFilter|maplibreLayer|beforeId|)/.test(evt.key)) {
                 this.detachFromMap();
                 this.attachToMap(map);
@@ -185,13 +185,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 +200,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.1",
+  "version": "3.0.0-beta.3",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "module": "index.js",
   "exports": {