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

package/ol/controls/RoutingControl.js

@@ -367,8 +367,7 @@ class RoutingControl extends Control {
                 this.loading = false;
             })
                 .catch((error) => {
-                var _a, _b;
-                if (/AbortError/.test(error.message)) {
+                if (/AbortError/.test(error.name)) {
                     // Ignore abort error
                     return;
                 }
@@ -376,7 +375,6 @@ class RoutingControl extends Control {
                 // Dispatch error event and execute error function
                 this.dispatchEvent(new BaseEvent('error'));
                 this.onRouteError(error, this);
-                (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear();
                 this.loading = false;
             });
         }));
@@ -413,15 +411,19 @@ class RoutingControl extends Control {
             return fetch(`${this.stopsApiUrl}lookup/${stationId}?key=${this.stopsApiKey}`, { signal: abortController.signal })
                 .then((res) => res.json())
                 .then((stationData) => {
-                var _a, _b;
-                const { coordinates } = stationData.features[0].geometry;
+                var _a, _b, _c, _d;
+                const { coordinates } = ((_b = (_a = stationData === null || stationData === void 0 ? void 0 : stationData.features) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.geometry) || {};
+                if (!coordinates) {
+                    console.log('No coordinates found for station ' + stationId, stationData);
+                }
                 this.cacheStationData[viaPoint] = fromLonLat(coordinates);
                 pointFeature.set('viaPointTrack', track);
                 pointFeature.setGeometry(new Point(fromLonLat(coordinates)));
-                (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.addFeature(pointFeature);
+                (_d = (_c = this.routingLayer) === null || _c === void 0 ? void 0 : _c.getSource()) === null || _d === void 0 ? void 0 : _d.addFeature(pointFeature);
                 return pointFeature;
             })
                 .catch((error) => {
+                var _a, _b;
                 if (/AbortError/.test(error.message)) {
                     // Ignore abort error
                     return;
@@ -429,6 +431,7 @@ class RoutingControl extends Control {
                 // Dispatch error event and execute error function
                 this.dispatchEvent(new BaseEvent('error'));
                 this.onRouteError(error, this);
+                (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear();
                 this.loading = false;
             });
         }

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/layers/RealtimeLayer.d.ts

@@ -8,6 +8,7 @@ import { Vector as VectorSource } from 'ol/source';
 import Source from 'ol/source/Source';
 import { State } from 'ol/View';
 import { WebSocketAPIMessageEventData } from '../../api/WebSocketAPI';
+import { FilterFunction, SortFunction } from '../../common/typedefs';
 import RealtimeEngine, { RealtimeEngineOptions } from '../../common/utils/RealtimeEngine';
 import { RealtimeAPI } from '../../maplibre';
 import { RealtimeFullTrajectory, RealtimeMode, RealtimeRenderState, RealtimeTrainId, ViewState } from '../../types';
@@ -173,6 +174,7 @@ declare class RealtimeLayer extends RealtimeLayer_base {
         fullTrajectory: WebSocketAPIMessageEventData<RealtimeFullTrajectory> | WebSocketAPIMessageEventData<import("../../types").RealtimeStopSequence[]>;
         stopSequence: WebSocketAPIMessageEventData<RealtimeFullTrajectory> | WebSocketAPIMessageEventData<import("../../types").RealtimeStopSequence[]>;
     }>;
+    getVehicles(filterFunc: FilterFunction): import("../../types").RealtimeTrajectory[];
     getViewState(): {
         center?: undefined;
         extent?: undefined;
@@ -220,7 +222,8 @@ declare class RealtimeLayer extends RealtimeLayer_base {
     get api(): RealtimeAPI;
     set api(api: RealtimeAPI);
     get canvas(): import("../../types").AnyCanvas | undefined;
-    get filter(): Function | undefined;
+    get filter(): FilterFunction | undefined;
+    set filter(filter: FilterFunction);
     get hoverVehicleId(): RealtimeTrainId | undefined;
     set hoverVehicleId(id: RealtimeTrainId);
     get mode(): RealtimeMode;
@@ -228,7 +231,8 @@ declare class RealtimeLayer extends RealtimeLayer_base {
     get pixelRatio(): number | undefined;
     get selectedVehicleId(): RealtimeTrainId | undefined;
     set selectedVehicleId(id: RealtimeTrainId);
-    get sort(): Function | undefined;
+    get sort(): SortFunction | undefined;
+    set sort(sort: SortFunction);
     get trajectories(): Record<string, import("../../types").RealtimeTrajectory> | undefined;
 }
 export default RealtimeLayer;

package/ol/layers/RealtimeLayer.js

@@ -145,6 +145,9 @@ class RealtimeLayer extends MobilityLayerMixin(Layer) {
             return response;
         });
     }
+    getVehicles(filterFunc) {
+        return this.engine.getVehicles(filterFunc);
+    }
     getViewState() {
         var _a;
         if (!((_a = this.map) === null || _a === void 0 ? void 0 : _a.getView())) {
@@ -267,6 +270,9 @@ class RealtimeLayer extends MobilityLayerMixin(Layer) {
     get filter() {
         return this.engine.filter;
     }
+    set filter(filter) {
+        this.engine.filter = filter;
+    }
     get hoverVehicleId() {
         return this.engine.hoverVehicleId;
     }
@@ -291,6 +297,9 @@ class RealtimeLayer extends MobilityLayerMixin(Layer) {
     get sort() {
         return this.engine.sort;
     }
+    set sort(sort) {
+        this.engine.sort = sort;
+    }
     get trajectories() {
         return this.engine.trajectories;
     }

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