mobility-toolbox-js 3.0.0-beta.19 → 3.0.0-beta.20

package/ol/layers/MaplibreLayer.js

@@ -78,7 +78,8 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
         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.style) {
+            newOptions.style &&
+            typeof newOptions.style === 'string') {
             newOptions.mapLibreOptions.style = buildStyleUrl(newOptions.url, newOptions.style, newOptions.apiKey, newOptions.apiKeyName);
         }
         super(newOptions);
@@ -89,7 +90,6 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
      */
     attachToMap(map) {
         super.attachToMap(map);
-        this.updateMaplibreMap();
         const updateMaplibreMapDebounced = debounce(this.updateMaplibreMap.bind(this), 150);
         this.olEventsKeys.push(this.on('propertychange', (evt) => {
             if (/(url|style)/.test(evt.key)) {
@@ -114,7 +114,13 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
     }
     updateMaplibreMap() {
         var _a;
-        (_a = this.mapLibreMap) === null || _a === void 0 ? void 0 : _a.setStyle(this.getStyle(), { diff: false });
+        try {
+            (_a = this.mapLibreMap) === null || _a === void 0 ? void 0 : _a.setStyle(this.getStyle(), { diff: false });
+        }
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.error('Error while updating MaplibreMap', e);
+        }
     }
     /**
      * Create a copy of the MaplibreLayer.

package/ol/layers/MaplibreStyleLayer.d.ts

@@ -1,24 +1,34 @@
+import { FeatureState } from 'maplibre-gl';
 import { Feature, Map } from 'ol';
 import { Coordinate } from 'ol/coordinate';
-import { ObjectEvent } from 'ol/Object';
 import { Layer } from 'ol/layer';
-import { FeatureState } from 'maplibre-gl';
+import { ObjectEvent } from 'ol/Object';
 import { Source } from 'ol/source';
-import { LayerGetFeatureInfoResponse } from '../../types';
 import { FilterFunction } from '../../common/typedefs';
-import MaplibreLayer, { MaplibreLayerOptions } from './MaplibreLayer';
+import { LayerGetFeatureInfoResponse } from '../../types';
 import MaplibreStyleLayerRenderer from '../renderers/MaplibreStyleLayerRenderer';
-export type MaplibreStyleLayerOptions = MaplibreLayerOptions & {
+import MaplibreLayer, { MaplibreLayerOptions } from './MaplibreLayer';
+export type MaplibreStyleLayerOptions = {
     beforeId?: string;
-    maplibreLayer?: MaplibreLayer;
     layers?: maplibregl.AddLayerObject[];
     layersFilter?: FilterFunction;
+    maplibreLayer?: MaplibreLayer;
     queryRenderedLayersFilter?: FilterFunction;
-};
+} & MaplibreLayerOptions;
 declare const MaplibreStyleLayer_base: {
     new (...args: any[]): {
-        options?: import("../mixins/PropertiesLayerMixin").PropertiesLayerMixinOptions;
         olEventsKeys: import("ol/events").EventsKey[];
+        options?: import("../mixins/PropertiesLayerMixin").PropertiesLayerMixinOptions;
+        attachToMap(map: Map): void;
+        detachFromMap(): void;
+        flat(): any[];
+        onChildrenChange(oldValue: Layer[]): void;
+        setMapInternal: ((map: Map) => void) & ((map: import("ol/Map" /**
+         * Set if features are hovered or not.
+         * @param {Array<ol/Feature~Feature>} features
+         * @param {boolean} state Is the feature hovered
+         * @private
+         */).default | null) => void);
         children: Layer<Source, import("ol/renderer/Layer").default<any>>[];
         get copyrights(): string;
         set copyrights(newCopyrights: string | string[]);
@@ -31,17 +41,10 @@ declare const MaplibreStyleLayer_base: {
         olLayer: Layer;
         parent: Layer<Source, import("ol/renderer/Layer").default<any>>;
         visible: boolean;
-        setMapInternal: ((map: Map) => void) & ((map: import("ol/Map").default | null) => void);
-        onChildrenChange(oldValue: Layer[]): void;
-        attachToMap(map: Map): void;
-        detachFromMap(): void;
-        flat(): any[];
-        addEventListener: (type: string, listener: import("ol/events").Listener) => void;
-        removeEventListener: (type: string, listener: import("ol/events").Listener) => void;
         on: import("ol/layer/Layer").LayerOnSignature<import("ol/events").EventsKey>;
-        render: (frameState: import("ol/Map").FrameState | null, target: HTMLElement) => HTMLElement | null;
         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: () => Source | null;
         getRenderSource: () => Source | null;
         getFeatures: (pixel: import("ol/pixel").Pixel) => Promise<Array<import("ol/Feature").FeatureLike>>;
@@ -99,9 +102,11 @@ declare const MaplibreStyleLayer_base: {
         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 Layer;
@@ -126,39 +131,6 @@ declare const MaplibreStyleLayer_base: {
 declare class MaplibreStyleLayer extends MaplibreStyleLayer_base {
     highlightedFeatures: Feature[];
     selectedFeatures: Feature[];
-    get beforeId(): string;
-    set beforeId(newValue: string[]);
-    get layers(): maplibregl.AddLayerObject[];
-    set layers(newValue: maplibregl.AddLayerObject[]);
-    get layersFilter(): (layer: maplibregl.LayerSpecification) => boolean;
-    set layersFilter(newValue: (layer: maplibregl.LayerSpecification) => boolean);
-    get mapboxLayer(): MaplibreLayer | undefined;
-    get maplibreLayer(): MaplibreLayer;
-    set maplibreLayer(newValue: MaplibreLayer);
-    get queryRenderedLayersFilter(): (layer: maplibregl.LayerSpecification) => boolean;
-    set queryRenderedLayersFilter(newValue: (layer: maplibregl.LayerSpecification) => boolean);
-    get sources(): {
-        [key: string]: maplibregl.SourceSpecification;
-    };
-    set sources(newValue: {
-        [key: string]: maplibregl.SourceSpecification;
-    });
-    /**
-     * @deprecated
-     */
-    get styleLayer(): maplibregl.AddLayerObject;
-    /**
-     * @deprecated
-     */
-    set styleLayer(newValue: maplibregl.AddLayerObject);
-    /**
-     * @deprecated
-     */
-    get styleLayers(): maplibregl.AddLayerObject[];
-    /**
-     * @deprecated
-     */
-    set styleLayers(newValue: maplibregl.AddLayerObject[]);
     /**
      * Constructor.
      *
@@ -170,31 +142,56 @@ declare class MaplibreStyleLayer extends MaplibreStyleLayer_base {
      * @param {FilterFunction} [options.queryRenderedLayersFilter] Filter function to decide which style layer are available for query.
      */
     constructor(options?: MaplibreStyleLayerOptions);
-    createRenderer(): MaplibreStyleLayerRenderer;
+    /** @private */
+    addLayers(): void;
+    /** @private */
+    addSources(): void;
+    applyLayoutVisibility(evt?: ObjectEvent): void;
     /**
      * Initialize the layer.
      * @param {ol/Map~Map} map the Maplibre map.
      * @override
      */
     attachToMap(map: Map): void;
+    /**
+     * Create a copy of the MapboxStyleLayer.
+     * @param {Object} newOptions Options to override.
+     * @return {MapboxStyleLayer} A MapboxStyleLayer.
+     */
+    clone(newOptions: MaplibreStyleLayerOptions): MaplibreStyleLayer;
+    createRenderer(): MaplibreStyleLayerRenderer;
     /**
      * Terminate the layer.
      * @override
      */
     detachFromMap(): void;
+    /**
+     * Request feature information for a given coordinate.
+     * @param {ol/coordinate~Coordinate} coordinate Coordinate to request the information at.
+     * @return {Promise<FeatureInfo>} Promise with features, layer and coordinate.
+     */
+    getFeatureInfoAtCoordinate(coordinate: Coordinate): Promise<LayerGetFeatureInfoResponse>;
+    /**
+     * Highlight a list of features.
+     * @param {Array<ol/Feature~Feature>} [features=[]] Features to highlight.
+     * @private
+     */
+    highlight(features?: Feature[]): void;
+    /**
+     * On Maplibre map load callback function. Add style layers and dynaimc filters.
+     * @private
+     */
+    onLoad(): void;
     /** @private */
-    addSources(): void;
+    removeLayers(): void;
     /** @private */
     removeSources(): void;
-    /** @private */
-    addLayers(): void;
-    /** @private */
-    removeLayers(): void;
     /**
-     * On Maplibre map load callback function. Add style layers and dynaimc filters.
+     * Select a list of features.
+     * @param {Array<ol/Feature~Feature>} [features=[]] Features to select.
      * @private
      */
-    onLoad(): void;
+    select(features?: Feature[]): void;
     /**
      * Set the feature state of the features.
      * @param {Array<ol/Feature~Feature>} features
@@ -202,12 +199,6 @@ declare class MaplibreStyleLayer extends MaplibreStyleLayer_base {
      * @public
      */
     setFeatureState(features: Feature[], state: FeatureState): void;
-    /**
-     * Request feature information for a given coordinate.
-     * @param {ol/coordinate~Coordinate} coordinate Coordinate to request the information at.
-     * @return {Promise<FeatureInfo>} Promise with features, layer and coordinate.
-     */
-    getFeatureInfoAtCoordinate(coordinate: Coordinate): Promise<LayerGetFeatureInfoResponse>;
     /**
      * Set if features are hovered or not.
      * @param {Array<ol/Feature~Feature>} features
@@ -215,27 +206,37 @@ declare class MaplibreStyleLayer extends MaplibreStyleLayer_base {
      * @private
      */
     setHoverState(features: Feature[], state: boolean): void;
+    get beforeId(): string;
+    set beforeId(newValue: string[]);
+    get layers(): maplibregl.AddLayerObject[];
+    set layers(newValue: maplibregl.AddLayerObject[]);
+    get layersFilter(): (layer: maplibregl.LayerSpecification) => boolean;
+    set layersFilter(newValue: (layer: maplibregl.LayerSpecification) => boolean);
+    get mapboxLayer(): MaplibreLayer | undefined;
+    get maplibreLayer(): MaplibreLayer;
+    set maplibreLayer(newValue: MaplibreLayer);
+    get queryRenderedLayersFilter(): (layer: maplibregl.LayerSpecification) => boolean;
+    set queryRenderedLayersFilter(newValue: (layer: maplibregl.LayerSpecification) => boolean);
+    get sources(): Record<string, maplibregl.SourceSpecification>;
+    set sources(newValue: Record<string, maplibregl.SourceSpecification>);
     /**
-     * Select a list of features.
-     * @param {Array<ol/Feature~Feature>} [features=[]] Features to select.
-     * @private
+     * @deprecated
      */
-    select(features?: Feature[]): void;
+    get styleLayer(): maplibregl.AddLayerObject;
     /**
-     * Highlight a list of features.
-     * @param {Array<ol/Feature~Feature>} [features=[]] Features to highlight.
-     * @private
+     * @deprecated
      */
-    highlight(features?: Feature[]): void;
+    set styleLayer(newValue: maplibregl.AddLayerObject);
     /**
      * Apply visibility to style layers that fits the styleLayersFilter function.
      */
-    applyLayoutVisibility(evt?: ObjectEvent): void;
     /**
-     * Create a copy of the MapboxStyleLayer.
-     * @param {Object} newOptions Options to override.
-     * @return {MapboxStyleLayer} A MapboxStyleLayer.
+     * @deprecated
      */
-    clone(newOptions: MaplibreStyleLayerOptions): MaplibreStyleLayer;
+    get styleLayers(): maplibregl.AddLayerObject[];
+    /**
+     * @deprecated
+     */
+    set styleLayers(newValue: maplibregl.AddLayerObject[]);
 }
 export default MaplibreStyleLayer;