mobility-toolbox-js 3.0.0-beta.35 → 3.0.0-beta.36

package/ol/layers/MaplibreLayer.d.ts

@@ -1,9 +1,8 @@
 import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer';
 import OlMap from 'ol/Map';
 import { MobilityLayerOptions } from '../mixins/MobilityLayerMixin';
-import type { MapLibreOptions } from '@geoblocks/ol-maplibre-layer/lib/types/MapLibreLayer';
+import type { MapLibreLayerOptions, MapLibreOptions } from '@geoblocks/ol-maplibre-layer/lib/types/MapLibreLayer';
 import type { QueryRenderedFeaturesOptions } from 'maplibre-gl';
-import type { Options as LayerOptions } from 'ol/layer/Layer';
 export type MaplibreLayerOptions = {
     apiKey?: string;
     apiKeyName?: string;
@@ -11,7 +10,7 @@ export type MaplibreLayerOptions = {
     queryRenderedFeaturesOptions?: QueryRenderedFeaturesOptions | undefined;
     style?: maplibregl.StyleSpecification | null | string;
     url?: string;
-} & LayerOptions & MobilityLayerOptions;
+} & MapLibreLayerOptions & MobilityLayerOptions;
 declare const MaplibreLayer_base: {
     new (...args: any[]): {
         olEventsKeys: import("ol/events").EventsKey[];
@@ -19,9 +18,9 @@ declare const MaplibreLayer_base: {
         attachToMap(map: OlMap): void;
         detachFromMap(): void;
         flat(): any[];
-        onChildrenChange(oldValue: import("ol/layer/Layer").default[]): void;
+        onChildrenChange(oldValue: import("ol/layer").Layer[]): void;
         setMapInternal: ((map: OlMap) => void) & ((map: import("ol/Map").default | null) => void);
-        children: import("ol/layer/Layer").default<import("ol/source").Source, import("ol/renderer/Layer").default<any>>[];
+        children: import("ol/layer").Layer<import("ol/source").Source, import("ol/renderer/Layer").default<any>>[];
         get copyrights(): string;
         set copyrights(newCopyrights: string | string[]);
         disabled: boolean;
@@ -30,8 +29,8 @@ declare const MaplibreLayer_base: {
         readonly key: string;
         readonly map: OlMap;
         readonly name: string;
-        olLayer: import("ol/layer/Layer").default;
-        parent: import("ol/layer/Layer").default<import("ol/source").Source, import("ol/renderer/Layer").default<any>>;
+        olLayer: import("ol/layer").Layer;
+        parent: import("ol/layer").Layer<import("ol/source").Source, import("ol/renderer/Layer").default<any>>;
         visible: boolean;
         on: import("ol/layer/Layer").LayerOnSignature<import("ol/events").EventsKey>;
         once: import("ol/layer/Layer").LayerOnSignature<import("ol/events").EventsKey>;
@@ -55,7 +54,7 @@ declare const MaplibreLayer_base: {
         getBackground: () => import("ol/layer/Base").BackgroundColor | false;
         getClassName: () => string;
         getLayerState: (managed?: boolean | undefined) => import("ol/layer/Layer").State;
-        getLayersArray: (array?: import("ol/layer/Layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer/Layer").default>;
+        getLayersArray: (array?: import("ol/layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer").default>;
         getLayerStatesArray: (states?: import("ol/layer/Layer").State[] | undefined) => Array<import("ol/layer/Layer").State>;
         getExtent: () => import("ol/extent").Extent | undefined;
         getMaxResolution: () => number;
@@ -158,7 +157,7 @@ declare class MaplibreLayer extends MaplibreLayer_base {
      * @public
      */
     clone(newOptions: MaplibreLayerOptions): MaplibreLayer;
-    getStyle(): string;
+    getStyle(): any;
     updateMaplibreMap(): void;
     set apiKey(newValue: string);
     get apiKey(): string;

package/ol/layers/MaplibreLayer.js

@@ -105,6 +105,7 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
         return new MaplibreLayer(Object.assign(Object.assign({}, (this.options || {})), (newOptions || {})));
     }
     getStyle() {
+        var _a;
         // If the style is a complete style object, use it directly.
         if (this.style &&
             typeof this.style === 'object' &&
@@ -116,6 +117,10 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
         if (this.url.includes('style.json')) {
             return this.url;
         }
+        // If the style is defined by the maplibreOptions, we use it directly
+        if ((_a = this.get('mapLibreOptions')) === null || _a === void 0 ? void 0 : _a.style) {
+            return this.get('mapLibreOptions').style;
+        }
         /// Otherwise build the complete style url.
         return buildStyleUrl(this.url, this.style, this.apiKey, this.apiKeyName);
     }

package/ol/mixins/PropertiesLayerMixin.d.ts

@@ -84,7 +84,7 @@ declare function PropertiesLayerMixin<TBase extends Layerable>(Base: TBase): {
         getBackground: () => import("ol/layer/Base").BackgroundColor | false;
         getClassName: () => string;
         getLayerState: (managed?: boolean | undefined) => import("ol/layer/Layer").State;
-        getLayersArray: (array?: import("ol/layer/Layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer/Layer" /** @deprecated */).default>;
+        getLayersArray: (array?: import("ol/layer/Layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer/Layer").default>;
         getLayerStatesArray: (states?: import("ol/layer/Layer").State[] | undefined) => Array<import("ol/layer/Layer").State>;
         getExtent: () => import("ol/extent").Extent | undefined;
         getMaxResolution: () => number;

package/ol/mixins/PropertiesLayerMixin.js

@@ -1,6 +1,5 @@
 // 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 = () => { };
@@ -134,7 +133,7 @@ function PropertiesLayerMixin(Base) {
             this.set('hitTolerance', newValue);
         }
         get key() {
-            return this.get('key') || this.get('name') || getUid(this);
+            return this.get('key') || this.get('name');
         }
         get map() {
             return this.getMapInternal();

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