mobility-toolbox-js 3.0.1-beta.0 → 3.0.1-beta.2

package/ol/layers/Layer.d.ts

@@ -1,101 +1,26 @@
+import { Map } from 'ol';
 import OLLayer from 'ol/layer/Layer';
-import { MobilityLayerOptions } from '../mixins/MobilityLayerMixin';
-declare const Layer_base: {
-    new (...args: any[]): {
-        olEventsKeys: import("ol/events").EventsKey[];
-        options?: import("../mixins/PropertiesLayerMixin").PropertiesLayerMixinOptions;
-        attachToMap(map: import("ol").Map): void;
-        detachFromMap(): void;
-        flat(): any[];
-        onChildrenChange(oldValue: OLLayer[]): void;
-        setMapInternal: ((map: import("ol").Map) => void) & ((map: import("ol").default | null) => void);
-        children: OLLayer<import("ol/source").Source, import("ol/renderer/Layer").default<any>>[];
-        get copyrights(): string;
-        set copyrights(newCopyrights: string | string[]);
-        disabled: boolean;
-        readonly group: string;
-        readonly hitTolerance: number;
-        readonly key: string;
-        readonly map: import("ol").Map;
-        readonly name: string;
-        olLayer: OLLayer;
-        parent: OLLayer<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>;
-        un: import("ol/layer/Layer").LayerOnSignature<void>;
-        render: (frameState: import("ol/Map").FrameState | null, target: HTMLElement) => HTMLElement | null;
-        getSource: () => import("ol/source").Source | null;
-        getRenderSource: () => import("ol/source").Source | null;
-        getFeatures: (pixel: import("ol/pixel").Pixel) => Promise<Array<import("ol/Feature").FeatureLike>>;
-        getData: (pixel: import("ol/pixel").Pixel) => Uint8ClampedArray | Uint8Array | Float32Array | DataView | null;
-        isVisible: (view?: import("ol").View | import("ol/View").ViewStateLayerStateExtent | undefined) => boolean;
-        getAttributions: (view?: import("ol").View | import("ol/View").ViewStateLayerStateExtent | undefined) => Array<string>;
-        unrender: () => void;
-        getDeclutter: () => string;
-        renderDeclutter: (frameState: import("ol/Map").FrameState, layerState: import("ol/layer/Layer").State) => void;
-        renderDeferred: (frameState: import("ol/Map").FrameState) => void;
-        getMapInternal: () => import("ol").default | null;
-        setMap: (map: import("ol").default | null) => void;
-        setSource: (source: import("ol/source").Source | null) => void;
-        getRenderer: () => import("ol/renderer/Layer").default<any> | null;
-        hasRenderer: () => boolean;
-        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>;
-        getLayerStatesArray: (states?: import("ol/layer/Layer").State[] | undefined) => Array<import("ol/layer/Layer").State>;
-        getExtent: () => import("ol/extent").Extent | undefined;
-        getMaxResolution: () => number;
-        getMinResolution: () => number;
-        getMinZoom: () => number;
-        getMaxZoom: () => number;
-        getOpacity: () => number;
-        getSourceState: () => import("ol/source/Source").State;
-        getVisible: () => boolean;
-        getZIndex: () => number | undefined;
-        setBackground: (background?: import("ol/layer/Base").BackgroundColor | undefined) => void;
-        setExtent: (extent: import("ol/extent").Extent | undefined) => void;
-        setMaxResolution: (maxResolution: number) => void;
-        setMinResolution: (minResolution: number) => void;
-        setMaxZoom: (maxZoom: number) => void;
-        setMinZoom: (minZoom: number) => void;
-        setOpacity: (opacity: number) => void;
-        setVisible: (visible: boolean) => void;
-        setZIndex: (zindex: number) => void;
-        get: (key: string) => any;
-        getKeys: () => Array<string>;
-        getProperties: () => {
-            [x: string]: any;
-        };
-        getPropertiesInternal: () => {
-            [x: string]: any;
-        } | null;
-        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;
-        set: (key: string, value: any, silent?: boolean | undefined) => void;
-        setProperties: (values: {
-            [x: string]: any;
-        }, silent?: boolean | undefined) => void;
-        unset: (key: string, silent?: boolean | undefined) => void;
-        changed: () => void;
-        getRevision: () => number;
-        addEventListener: (type: string, listener: import("ol/events").Listener) => void;
-        dispatchEvent: (event: import("ol/events/Event").default | string) => boolean | undefined;
-        getListeners: (type: string) => Array<import("ol/events").Listener> | undefined;
-        hasListener: (type?: string | undefined) => boolean;
-        removeEventListener: (type: string, listener: import("ol/events").Listener) => void;
-        dispose: () => void;
-    };
-} & typeof OLLayer;
+import LayerRenderer from 'ol/renderer/Layer';
+import type { Options } from 'ol/layer/Layer';
+export type MobilityLayerOptions = {
+    children?: any[];
+    copyrights?: string[];
+    disabled?: boolean;
+    group?: string;
+    hitTolerance?: number;
+    key?: string;
+    map?: Map;
+    name?: string;
+    properties?: Record<string, any>;
+    visible?: boolean;
+} & Options & Record<string, any>;
 /**
  * An OpenLayers layer here only for backward compatibility v2.
  * @deprecated Use an OpenLayers Layer instead.
  */
-declare class Layer extends Layer_base {
+declare class Layer extends OLLayer {
     constructor(options: MobilityLayerOptions);
     clone(newOptions: MobilityLayerOptions): Layer;
+    createRenderer(): LayerRenderer<OLLayer>;
 }
 export default Layer;

package/ol/layers/Layer.js

@@ -1,6 +1,7 @@
 import debounce from 'lodash.debounce';
 import OLLayer from 'ol/layer/Layer';
-import MobilityLayerMixin from '../mixins/MobilityLayerMixin';
+import LayerRenderer from 'ol/renderer/Layer';
+import defineDeprecatedProperties from '../utils/defineDeprecatedProperties';
 let deprecated = () => { };
 if (typeof window !== 'undefined' &&
     new URLSearchParams(window.location.search).get('deprecated')) {
@@ -9,17 +10,30 @@ if (typeof window !== 'undefined' &&
         console.warn(message);
     }, 1000);
 }
+class EmptyLayerRenderer extends LayerRenderer {
+    prepareFrame() {
+        return true;
+    }
+    renderFrame() {
+        return null;
+    }
+}
 /**
  * An OpenLayers layer here only for backward compatibility v2.
  * @deprecated Use an OpenLayers Layer instead.
  */
-class Layer extends MobilityLayerMixin(OLLayer) {
+class Layer extends OLLayer {
     constructor(options) {
         super(options);
+        defineDeprecatedProperties(this, options);
         deprecated('Layer is deprecated. Use an OpenLayers Layer instead.');
     }
     clone(newOptions) {
-        return new Layer(Object.assign(Object.assign({}, (this.options || {})), (newOptions || {})));
+        return new Layer(Object.assign(Object.assign({}, (this.get('options') || {})), (newOptions || {})));
+    }
+    // ol does not like when it returns null.
+    createRenderer() {
+        return new EmptyLayerRenderer(this);
     }
 }
 export default Layer;

package/ol/layers/MaplibreLayer.d.ts

@@ -1,104 +1,18 @@
-import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer';
-import OlMap from 'ol/Map';
-import { MobilityLayerOptions } from '../mixins/MobilityLayerMixin';
-import type { MapLibreLayerOptions, MapLibreOptions } from '@geoblocks/ol-maplibre-layer/lib/types/MapLibreLayer';
+import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer/lib';
+import { EventsKey } from 'ol/events';
+import Map from 'ol/Map';
+import MaplibreLayerRenderer from '../renderers/MaplibreLayerRenderer';
+import { MobilityLayerOptions } from './Layer';
+import type { MapLibreLayerOptions, MapLibreOptions } from '@geoblocks/ol-maplibre-layer/lib/MapLibreLayer';
+import type { QueryRenderedFeaturesOptions } from 'maplibre-gl';
 export type MaplibreLayerOptions = {
     apiKey?: string;
     apiKeyName?: string;
     mapLibreOptions?: MapLibreOptions;
+    queryRenderedFeaturesOptions?: QueryRenderedFeaturesOptions | undefined;
     style?: maplibregl.StyleSpecification | null | string;
     url?: string;
-} & MapLibreLayerOptions & MobilityLayerOptions;
-declare const MaplibreLayer_base: {
-    new (...args: any[]): {
-        olEventsKeys: import("ol/events").EventsKey[];
-        options?: import("../mixins/PropertiesLayerMixin").PropertiesLayerMixinOptions;
-        attachToMap(map: OlMap): void;
-        detachFromMap(): void;
-        flat(): any[];
-        onChildrenChange(oldValue: import("ol/layer").Layer[]): void;
-        setMapInternal: ((map: OlMap) => void) & ((map: import("ol/Map").default | null) => void);
-        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;
-        readonly group: string;
-        readonly hitTolerance: number;
-        readonly key: string;
-        readonly map: OlMap;
-        readonly name: string;
-        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>;
-        un: import("ol/layer/Layer").LayerOnSignature<void>;
-        render: (frameState: import("ol/Map").FrameState | null, target: HTMLElement) => HTMLElement | null;
-        getSource: () => import("ol/source").Source | null;
-        getRenderSource: () => import("ol/source").Source | null;
-        getFeatures: (pixel: import("ol/pixel").Pixel) => Promise<Array<import("ol/Feature").FeatureLike>>;
-        getData: (pixel: import("ol/pixel").Pixel) => Uint8ClampedArray | Uint8Array | Float32Array | DataView | null;
-        isVisible: (view?: import("ol").View | import("ol/View").ViewStateLayerStateExtent | undefined) => boolean;
-        getAttributions: (view?: import("ol").View | import("ol/View").ViewStateLayerStateExtent | undefined) => Array<string>;
-        unrender: () => void;
-        getDeclutter: () => string;
-        renderDeclutter: (frameState: import("ol/Map").FrameState, layerState: import("ol/layer/Layer").State) => void;
-        renderDeferred: (frameState: import("ol/Map").FrameState) => void;
-        getMapInternal: () => import("ol/Map").default | null;
-        setMap: (map: import("ol/Map").default | null) => void;
-        setSource: (source: import("ol/source").Source | null) => void;
-        getRenderer: () => import("ol/renderer/Layer").default<any> | null;
-        hasRenderer: () => boolean;
-        getBackground: () => import("ol/layer/Base").BackgroundColor | false;
-        getClassName: () => string;
-        getLayerState: (managed?: boolean | undefined) => import("ol/layer/Layer").State;
-        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;
-        getMinResolution: () => number;
-        getMinZoom: () => number;
-        getMaxZoom: () => number;
-        getOpacity: () => number;
-        getSourceState: () => import("ol/source/Source").State;
-        getVisible: () => boolean;
-        getZIndex: () => number | undefined;
-        setBackground: (background?: import("ol/layer/Base").BackgroundColor | undefined) => void;
-        setExtent: (extent: import("ol/extent").Extent | undefined) => void;
-        setMaxResolution: (maxResolution: number) => void;
-        setMinResolution: (minResolution: number) => void;
-        setMaxZoom: (maxZoom: number) => void;
-        setMinZoom: (minZoom: number) => void;
-        setOpacity: (opacity: number) => void;
-        setVisible: (visible: boolean) => void;
-        setZIndex: (zindex: number) => void;
-        get: (key: string) => any;
-        getKeys: () => Array<string>;
-        getProperties: () => {
-            [x: string]: any;
-        };
-        getPropertiesInternal: () => {
-            [x: string]: any;
-        } | null;
-        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;
-        set: (key: string, value: any, silent?: boolean | undefined) => void;
-        setProperties: (values: {
-            [x: string]: any;
-        }, silent?: boolean | undefined) => void;
-        unset: (key: string, silent?: boolean | undefined) => void;
-        changed: () => void;
-        getRevision: () => number;
-        addEventListener: (type: string, listener: import("ol/events").Listener) => void;
-        dispatchEvent: (event: import("ol/events/Event").default | string) => boolean | undefined;
-        getListeners: (type: string) => Array<import("ol/events").Listener> | undefined;
-        hasListener: (type?: string | undefined) => boolean;
-        removeEventListener: (type: string, listener: import("ol/events").Listener) => void;
-        dispose: () => void;
-    };
-} & typeof MapLibreLayer;
+} & MobilityLayerOptions & Omit<MapLibreLayerOptions, 'mapLibreOptions'>;
 /**
  * An OpenLayers layer able to display data from the [geOps Maps API](https://developer.geops.io/apis/maps).
  *
@@ -121,40 +35,59 @@ declare const MaplibreLayer_base: {
  * });
  *
  * @classproperty {maplibregl.Map} mapLibreMap - The Maplibre map object. Readonly.
- * @classproperty {string} style - geOps Maps api style.
- * @extends {ol/layer/Layer~Layer}
+ * @classproperty {string} style - The [geOps Maps API](https://developer.geops.io/apis/maps) style.
+ *
+ *
+ * @see <a href="/example/ol-maplibre-layer">OpenLayers Maplibre layer example</a>
+ *
+ * @extends {geoblocks/ol-maplibre-layer/MapLibreLayer}
  * @public
  */
-declare class MaplibreLayer extends MaplibreLayer_base {
+declare class MaplibreLayer extends MapLibreLayer {
+    olEventsKeys: EventsKey[];
+    set apiKey(newValue: string);
+    get apiKey(): string;
+    set apiKeyName(newValue: string);
+    get apiKeyName(): string;
+    /**
+     * @deprecated Use layer.mapLibreMap.
+     */
+    get maplibreMap(): maplibregl.Map | undefined;
+    /**
+     * @deprecated Use layer.mapLibreMap.
+     */
+    get mbMap(): maplibregl.Map | undefined;
+    get style(): string;
+    set style(newValue: string);
+    get url(): string;
+    set url(newValue: string);
     /**
      * Constructor.
      *
-     * @param {MaplibreLayerOptions} options
-     * @param {string} options.apiKey Access key for [geOps apis](https://developer.geops.io/).
-     * @param {string} [options.apiKeyName="key"] The geOps Maps API key name.
-     * @param {maplibregl.MapOptions} [options.mapLibreOptions={ interactive: false, trackResize: false, attributionControl: false }] Maplibre map options.
-     * @param {string} [options.style="travic_v2"] The geOps Maps API style.
-     * @param {string} [options.url="https://maps.geops.io"] The geOps Maps API url.
+     * @param {Object} options
+     * @param {string} options.apiKey Accesss key for [geOps APIs](https://developer.geops.io/).
+     * @param {string} [options.apiKeyName="key"] The [geOps Maps API](https://developer.geops.io/apis/maps) key name.
+     * @param {maplibregl.MapOptions} [options.mapLibreOptions={ interactive: false, trackResize: false, attributionControl: false }] MapLibre map options.
+     * @param {string} [options.style="travic_v2"] The [geOps Maps API](https://developer.geops.io/apis/maps) style.
+     * @param {string} [options.url="https://maps.geops.io"] The [geOps Maps API](https://developer.geops.io/apis/maps) url.
      */
     constructor(options: MaplibreLayerOptions);
     /**
      * Initialize the layer and listen to feature clicks.
-     * @param {ol/Map~Map} map
      */
-    attachToMap(map: OlMap): void;
+    attachToMap(): void;
     /**
      * Create a copy of the MaplibreLayer.
-     * @param {MaplibreLayerOptions} newOptions Options to override
+     *
+     * @param {Object} newOptions Options to override. See constructor.
      * @return {MaplibreLayer} A MaplibreLayer layer
+     * @public
      */
     clone(newOptions: MaplibreLayerOptions): MaplibreLayer;
-    getStyle(): string;
+    createRenderer(): MaplibreLayerRenderer;
+    detachFromMap(): void;
+    getStyle(): any;
+    setMapInternal(map: Map): void;
     updateMaplibreMap(): void;
-    get maplibreMap(): maplibregl.Map | undefined;
-    get mbMap(): maplibregl.Map | undefined;
-    get style(): string;
-    set style(newValue: string);
-    get url(): string;
-    set url(newValue: string);
 }
 export default MaplibreLayer;

package/ol/layers/MaplibreLayer.js

@@ -1,7 +1,9 @@
-import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer';
+import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer/lib';
 import debounce from 'lodash.debounce';
+import { unByKey } from 'ol/Observable';
 import { getUrlWithParams } from '../../common/utils';
-import MobilityLayerMixin from '../mixins/MobilityLayerMixin';
+import MaplibreLayerRenderer from '../renderers/MaplibreLayerRenderer';
+import defineDeprecatedProperties from '../utils/defineDeprecatedProperties';
 const buildStyleUrl = (url, style, apiKey, apiKeyName) => {
     return getUrlWithParams(`${url}/styles/${style}/style.json`, {
         [apiKeyName]: apiKey,
@@ -37,62 +39,122 @@ if (typeof window !== 'undefined' &&
  * });
  *
  * @classproperty {maplibregl.Map} mapLibreMap - The Maplibre map object. Readonly.
- * @classproperty {string} style - geOps Maps api style.
- * @extends {ol/layer/Layer~Layer}
+ * @classproperty {string} style - The [geOps Maps API](https://developer.geops.io/apis/maps) style.
+ *
+ *
+ * @see <a href="/example/ol-maplibre-layer">OpenLayers Maplibre layer example</a>
+ *
+ * @extends {geoblocks/ol-maplibre-layer/MapLibreLayer}
  * @public
  */
-class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
+class MaplibreLayer extends MapLibreLayer {
+    set apiKey(newValue) {
+        this.set('apiKey', newValue);
+    }
+    get apiKey() {
+        return this.get('apiKey');
+    }
+    set apiKeyName(newValue) {
+        this.set('apiKeyName', newValue);
+    }
+    get apiKeyName() {
+        return this.get('apiKeyName');
+    }
+    /**
+     * @deprecated Use layer.mapLibreMap.
+     */
+    get maplibreMap() {
+        deprecated('MaplibreLayer.maplibreMap is deprecated. Use layer.mapLibreMap.');
+        return this.mapLibreMap;
+    }
+    // get queryRenderedFeaturesOptions(): maplibregl.QueryRenderedFeaturesOptions {
+    //   return this.get('queryRenderedFeaturesOptions');
+    // }
+    // set queryRenderedFeaturesOptions(
+    //   newValue: maplibregl.QueryRenderedFeaturesOptions,
+    // ) {
+    //   this.set('queryRenderedFeaturesOptions', newValue);
+    // }
+    /**
+     * @deprecated Use layer.mapLibreMap.
+     */
+    get mbMap() {
+        deprecated('MaplibreLayer.mbMap is deprecated. Use layer.maplibreMap.');
+        return this.maplibreMap;
+    }
+    get style() {
+        return this.get('style');
+    }
+    set style(newValue) {
+        this.set('style', newValue);
+    }
+    get url() {
+        return this.get('url');
+    }
+    set url(newValue) {
+        this.set('url', newValue);
+    }
     /**
      * Constructor.
      *
-     * @param {MaplibreLayerOptions} options
-     * @param {string} options.apiKey Access key for [geOps apis](https://developer.geops.io/).
-     * @param {string} [options.apiKeyName="key"] The geOps Maps API key name.
-     * @param {maplibregl.MapOptions} [options.mapLibreOptions={ interactive: false, trackResize: false, attributionControl: false }] Maplibre map options.
-     * @param {string} [options.style="travic_v2"] The geOps Maps API style.
-     * @param {string} [options.url="https://maps.geops.io"] The geOps Maps API url.
+     * @param {Object} options
+     * @param {string} options.apiKey Accesss key for [geOps APIs](https://developer.geops.io/).
+     * @param {string} [options.apiKeyName="key"] The [geOps Maps API](https://developer.geops.io/apis/maps) key name.
+     * @param {maplibregl.MapOptions} [options.mapLibreOptions={ interactive: false, trackResize: false, attributionControl: false }] MapLibre map options.
+     * @param {string} [options.style="travic_v2"] The [geOps Maps API](https://developer.geops.io/apis/maps) style.
+     * @param {string} [options.url="https://maps.geops.io"] The [geOps Maps API](https://developer.geops.io/apis/maps) 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') {
             newOptions.mapLibreOptions.style = buildStyleUrl(newOptions.url, newOptions.style, newOptions.apiKey, newOptions.apiKeyName);
         }
         super(newOptions);
+        this.olEventsKeys = [];
+        // For backward compatibility with v2
+        defineDeprecatedProperties(this, options);
+        // We save the options to be able to clone the layer.
+        // and to see if the style is defined by the maplibreOptions given by the user.
+        this.set('options', options);
     }
     /**
      * Initialize the layer and listen to feature clicks.
-     * @param {ol/Map~Map} map
      */
-    attachToMap(map) {
-        super.attachToMap(map);
+    attachToMap() {
         const updateMaplibreMapDebounced = debounce(this.updateMaplibreMap.bind(this), 150);
         updateMaplibreMapDebounced();
         this.olEventsKeys.push(this.on('propertychange', (evt) => {
-            if (/(url|style)/.test(evt.key)) {
+            if (/(url|style|apiKey|apiKeyName)/.test(evt.key)) {
                 updateMaplibreMapDebounced();
             }
         }));
     }
-    // get queryRenderedFeaturesOptions(): maplibregl.QueryRenderedFeaturesOptions {
-    //   return this.get('queryRenderedFeaturesOptions');
-    // }
-    // set queryRenderedFeaturesOptions(
-    //   newValue: maplibregl.QueryRenderedFeaturesOptions,
-    // ) {
-    //   this.set('queryRenderedFeaturesOptions', newValue);
-    // }
     /**
      * Create a copy of the MaplibreLayer.
-     * @param {MaplibreLayerOptions} newOptions Options to override
+     *
+     * @param {Object} newOptions Options to override. See constructor.
      * @return {MaplibreLayer} A MaplibreLayer layer
+     * @public
      */
     clone(newOptions) {
-        return new MaplibreLayer(Object.assign(Object.assign({}, (this.options || {})), (newOptions || {})));
+        return new MaplibreLayer(Object.assign(Object.assign({}, (this.get('options') || {})), (newOptions || {})));
+    }
+    createRenderer() {
+        return new MaplibreLayerRenderer(this);
+    }
+    detachFromMap() {
+        unByKey(this.olEventsKeys);
     }
     getStyle() {
+        var _a, _b;
         // If the style is a complete style object, use it directly.
         if (this.style &&
             typeof this.style === 'object' &&
@@ -104,8 +166,22 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
         if (this.url.includes('style.json')) {
             return this.url;
         }
+        // If the user has defined the style by the maplibreOptions, we use it directly.
+        if ((_b = (_a = this.get('options')) === null || _a === void 0 ? void 0 : _a.mapLibreOptions) === null || _b === void 0 ? void 0 : _b.style) {
+            return this.get('options').mapLibreOptions.style;
+        }
         /// Otherwise build the complete style url.
-        return buildStyleUrl(this.url, this.style, this.get('apiKey'), this.get('apiKeyName'));
+        return buildStyleUrl(this.url, this.style, this.apiKey, this.apiKeyName);
+    }
+    setMapInternal(map) {
+        if (map) {
+            super.setMapInternal(map);
+            this.attachToMap();
+        }
+        else {
+            this.detachFromMap();
+            super.setMapInternal(map);
+        }
     }
     updateMaplibreMap() {
         var _a;
@@ -117,25 +193,5 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
             console.error('Error while updating MaplibreMap', e);
         }
     }
-    get maplibreMap() {
-        deprecated('MaplibreLayer.maplibreMap is deprecated. Use layer.mapLibreMap.');
-        return this.mapLibreMap;
-    }
-    get mbMap() {
-        deprecated('MaplibreLayer.mbMap is deprecated. Use layer.maplibreMap.');
-        return this.maplibreMap;
-    }
-    get style() {
-        return this.get('style');
-    }
-    set style(newValue) {
-        this.set('style', newValue);
-    }
-    get url() {
-        return this.get('url');
-    }
-    set url(newValue) {
-        this.set('url', newValue);
-    }
 }
 export default MaplibreLayer;