mobility-toolbox-js 3.0.0-beta.27 → 3.0.0-beta.29

package/ol/layers/MaplibreLayer.js

@@ -53,8 +53,13 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
      * @param {string} [options.url="https://maps.geops.io"] The geOps Maps API url.
      */
     constructor(options) {
+        var _a;
         const newOptions = Object.assign(Object.assign({ apiKeyName: 'key', style: 'travic_v2', url: 'https://maps.geops.io' }, (options || {})), { mapLibreOptions: Object.assign({}, (options.mapLibreOptions || {})) });
         if (!newOptions.mapLibreOptions.style &&
+            ((_a = newOptions.url) === null || _a === void 0 ? void 0 : _a.includes('style.json'))) {
+            newOptions.mapLibreOptions.style = newOptions.url;
+        }
+        else if (!newOptions.mapLibreOptions.style &&
             newOptions.apiKey &&
             newOptions.style &&
             typeof newOptions.style === 'string') {

package/ol/layers/MaplibreStyleLayer.js

@@ -185,6 +185,16 @@ class MaplibreStyleLayer extends MobilityLayerMixin(Layer) {
                 this.detachFromMap();
                 this.attachToMap(map);
             }
+        }), 
+        // When the style changes we wait that it is loaded to relaunch the onLoad
+        this.maplibreLayer.on('propertychange', (evt) => {
+            if (evt.key === 'style') {
+                evt.target.maplibreMap.once('styledata', () => {
+                    evt.target.maplibreMap.once('idle', () => {
+                        this.onLoad();
+                    });
+                });
+            }
         }));
     }
     /**

package/ol/mixins/PropertiesLayerMixin.d.ts

@@ -117,7 +117,7 @@ declare function PropertiesLayerMixin<TBase extends Layerable>(Base: TBase): {
         hasProperties: () => boolean;
         notify: (key: string, oldValue: any) => void;
         addChangeListener: (key: string, listener: import("ol/events").Listener) => void;
-        removeChangeListener: (key: string, listener: import("ol/events").Listener) => void;
+        removeChangeListener: (key: string, listener: import("ol/events" /** @deprecated */).Listener) => void;
         set: (key: string, value: any, silent?: boolean | undefined) => void;
         setProperties: (values: {
             [x: string]: any;

package/ol/mixins/PropertiesLayerMixin.js

@@ -1,6 +1,7 @@
 // eslint-disable-next-line max-classes-per-file
 import debounce from 'lodash.debounce';
 import { getUid } from 'ol';
+import { unByKey } from 'ol/Observable';
 import getLayersAsFlatArray from '../../common/utils/getLayersAsFlatArray';
 let deprecated = () => { };
 if (typeof window !== 'undefined' &&
@@ -16,7 +17,6 @@ if (typeof window !== 'undefined' &&
 function PropertiesLayerMixin(Base) {
     return class PropertiesLayer extends Base {
         constructor(...args) {
-            var _a;
             const options = args[0];
             super(options);
             this.olEventsKeys = [];
@@ -25,13 +25,12 @@ function PropertiesLayerMixin(Base) {
                 deprecated("Deprecated. Don't use properties options. Pass the values directly in options object.");
                 this.setProperties(options.properties);
             }
-            (_a = this.olEventsKeys) === null || _a === void 0 ? void 0 : _a.push(
             // Update parent property
             this.on('propertychange', (evt) => {
                 if (evt.key === 'children') {
                     this.onChildrenChange(evt.oldValue);
                 }
-            }));
+            });
             this.options = options;
             this.set('children', options.children || []); // Trigger the on children change event
         }
@@ -51,6 +50,7 @@ function PropertiesLayerMixin(Base) {
          * Terminate what was initialized in init function. Remove layer, events...
          */
         detachFromMap() {
+            unByKey(this.olEventsKeys);
             (this.get('children') || []).forEach((child) => {
                 this.map.removeLayer(child);
             });

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.27",
+  "version": "3.0.0-beta.29",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "exports": {
     ".": "./index.js",