mobility-toolbox-js 3.0.0-beta.15 → 3.0.0-beta.16

package/ol/layers/MaplibreLayer.d.ts

@@ -1,12 +1,13 @@
 import OlMap from 'ol/Map';
 import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer';
-import type { MapLibreLayerOptions } from '@geoblocks/ol-maplibre-layer/lib/types/MapLibreLayer';
+import type { MapLibreLayerOptions, MapLibreOptions } from '@geoblocks/ol-maplibre-layer/lib/types/MapLibreLayer';
 import { MobilityLayerOptions } from '../mixins/MobilityLayerMixin';
 export type MaplibreLayerOptions = MobilityLayerOptions & MapLibreLayerOptions & {
     apiKey?: string;
     apiKeyName?: string;
     style?: string | maplibregl.StyleSpecification;
     url?: string;
+    mapLibreOptions?: MapLibreOptions;
 };
 declare const MaplibreLayer_base: {
     new (...args: any[]): {

package/ol/layers/MaplibreLayer.js

@@ -2,6 +2,11 @@ import debounce from 'lodash.debounce';
 import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer';
 import { getUrlWithParams } from '../../common/utils';
 import MobilityLayerMixin from '../mixins/MobilityLayerMixin';
+const buildStyleUrl = (url, style, apiKey, apiKeyName) => {
+    return getUrlWithParams(`${url}/styles/${style}/style.json`, {
+        [apiKeyName]: apiKey,
+    }).toString();
+};
 /**
  * An OpenLayers layer able to display data from the [geOps Maps API](https://developer.geops.io/apis/maps).
  *
@@ -31,12 +36,12 @@ import MobilityLayerMixin from '../mixins/MobilityLayerMixin';
 class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
     get mbMap() {
         // eslint-disable-next-line no-console
-        console.warn('Deprecated. Use layer.maplibreMap.');
+        console.warn('.mbMap deprecated. Use layer.maplibreMap.');
         return this.maplibreMap;
     }
     get maplibreMap() {
         // eslint-disable-next-line no-console
-        console.warn('Deprecated. Use layer.mapLibreMap.');
+        console.warn('.maplibreMap eprecated. Use layer.mapLibreMap.');
         return this.mapLibreMap;
     }
     // get queryRenderedFeaturesOptions(): maplibregl.QueryRenderedFeaturesOptions {
@@ -70,7 +75,11 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
      * @param {string} [options.url="https://maps.geops.io"] The geOps Maps API url.
      */
     constructor(options) {
-        super(Object.assign(Object.assign({ apiKeyName: 'key', style: 'travic_v2', url: 'https://maps.geops.io' }, (options || {})), { mapLibreOptions: Object.assign({}, (options.mapLibreOptions || {})) }));
+        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 && newOptions.apiKey) {
+            newOptions.mapLibreOptions.style = buildStyleUrl(newOptions.url, newOptions.style, newOptions.apiKey, newOptions.apiKeyName);
+        }
+        super(newOptions);
     }
     /**
      * Initialize the layer and listen to feature clicks.
@@ -99,20 +108,11 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
             return this.url;
         }
         /// Otherwise build the complete style url.
-        return getUrlWithParams(`${this.url}/styles/${this.style}/style.json`, {
-            [this.get('apiKeyName')]: this.get('apiKey'),
-        }).toString();
+        return buildStyleUrl(this.url, this.style, this.get('apiKey'), this.get('apiKeyName'));
     }
-    // eslint-disable-next-line class-methods-use-this
-    // createMap(options: MapOptions): Map {
-    //   return new Map(options);
-    // }
-    // createRenderer(): MaplibreLayerRenderer {
-    //   return new MaplibreLayerRenderer(this);
-    // }
     updateMaplibreMap() {
         var _a;
-        (_a = this.maplibreMap) === null || _a === void 0 ? void 0 : _a.setStyle(this.getStyle(), { diff: false });
+        (_a = this.mapLibreMap) === null || _a === void 0 ? void 0 : _a.setStyle(this.getStyle(), { diff: false });
     }
     /**
      * Create a copy of the MaplibreLayer.

package/ol/mixins/PropertiesLayerMixin.js

@@ -112,7 +112,7 @@ function PropertiesLayerMixin(Base) {
                 }
             }));
             this.options = options;
-            this.children = options.children || []; // Trigger the on children change event
+            this.set('children', options.children || []); // Trigger the on children change event
         }
         // @ts-expect-error - this is a mixin
         setMapInternal(map) {
@@ -130,7 +130,7 @@ function PropertiesLayerMixin(Base) {
             (oldValue || []).forEach((child) => {
                 child.set('parent', undefined);
             });
-            (this.children || []).forEach((child) => {
+            (this.get('children') || []).forEach((child) => {
                 child.set('parent', this);
             });
         }

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