mobility-toolbox-js 2.0.0-beta.53 → 2.0.0-beta.55

package/common/mixins/RealtimeLayerMixin.d.ts

@@ -3,7 +3,7 @@ import { EventsKey } from 'ol/events';
 import { Coordinate } from 'ol/coordinate';
 import { Feature } from 'ol';
 import { RealtimeAPI } from '../../api';
-import { AnyCanvas, AnyLayerClass, AnyMap, AnyRealtimeLayer, LayerGetFeatureInfoOptions, RealtimeGeneralizationLevel, RealtimeMode, RealtimeRenderState, RealtimeStyleFunction, RealtimeStyleOptions, RealtimeTenant, RealtimeTrainId, ViewState } from '../../types';
+import { AnyCanvas, AnyLayerClass, AnyMap, AnyRealtimeLayer, LayerGetFeatureInfoOptions, RealtimeGeneralizationLevel, RealtimeMode, RealtimeMot, RealtimeRenderState, RealtimeStyleFunction, RealtimeStyleOptions, RealtimeTenant, RealtimeTrainId, ViewState } from '../../types';
 import { RealtimeTrajectory } from '../../api/typedefs';
 import { WebSocketAPIMessageEventData } from '../api/WebSocketAPI';
 import type { OlLayerOptions } from '../../ol/layers/Layer';
@@ -12,9 +12,9 @@ export declare type RealtimeLayerMixinOptions = OlLayerOptions & {
     mode?: RealtimeMode;
     api?: RealtimeAPI;
     tenant?: RealtimeTenant;
-    minZoomNonTrain?: number;
     minZoomInterpolation?: number;
     isUpdateBboxOnMoveEnd?: boolean;
+    motsByZoom?: RealtimeMot[][];
     generalizationLevelByZoom?: RealtimeGeneralizationLevel[];
     renderTimeIntervalByZoom?: number[];
     style?: RealtimeStyleFunction;
@@ -31,6 +31,7 @@ export declare type RealtimeLayerMixinOptions = OlLayerOptions & {
     useRequestAnimationFrame?: boolean;
     useDebounce?: boolean;
     useThrottle?: boolean;
+    getMotsByZoom: (zoom: number, motsByZoom: RealtimeMot[][]) => RealtimeMot[];
     getGeneralizationLevelByZoom?: (zoom: number, generalizationLevelByZoom: RealtimeGeneralizationLevel[]) => RealtimeGeneralizationLevel;
     getRenderTimeIntervalByZoom?: (zoom: number, renderTimeIntervalByZoom: number[]) => number;
     url?: string;
@@ -105,7 +106,6 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
         style?: RealtimeStyleFunction | undefined;
         styleOptions?: RealtimeStyleOptions | undefined;
         pixelRatio?: number | undefined;
-        minZoomNonTrain: number;
         minZoomInterpolation: number;
         isUpdateBboxOnMoveEnd: boolean;
         hoverVehicleId?: string | undefined;
@@ -114,6 +114,8 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
         useRequestAnimationFrame?: boolean | undefined;
         useDebounce?: boolean | undefined;
         useThrottle?: boolean | undefined;
+        mots?: RealtimeMot[] | undefined;
+        motsByZoom: RealtimeMot[][];
         generalizationLevel?: RealtimeGeneralizationLevel | undefined;
         generalizationLevelByZoom: RealtimeGeneralizationLevel[];
         renderTimeIntervalByZoom: number[];
@@ -123,6 +125,7 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
         updateTimeDelay?: number | undefined;
         visibilityRef: EventsKey;
         selectedVehicle: GeoJSONFeature;
+        getMotsByZoom: (zoom: number) => RealtimeMot[];
         getGeneralizationLevelByZoom: (zoom: number) => RealtimeGeneralizationLevel;
         getRenderTimeIntervalByZoom: (zoom: number) => number;
         throttleRenderTrajectories: (viewState: ViewState, noInterpolate?: boolean) => void;
@@ -214,14 +217,14 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
          * @return {Promise<{stopSequence: StopSequence, fullTrajectory: FullTrajectory>} A promise that will be resolved with the trajectory informations.
          */
         getTrajectoryInfos(id: RealtimeTrainId): Promise<{
-            stopSequence: unknown;
-            fullTrajectory: unknown;
+            stopSequence: WebSocketAPIMessageEventData<import("../../types").RealtimeFullTrajectory> | WebSocketAPIMessageEventData<GeoJSONFeature[]>;
+            fullTrajectory: WebSocketAPIMessageEventData<import("../../types").RealtimeFullTrajectory> | WebSocketAPIMessageEventData<GeoJSONFeature[]>;
         }>;
         /**
          * Determine if the trajectory is useless and should be removed from the list or not.
          * By default, this function exclude vehicles:
          *  - that have their trajectory outside the current extent and
-         *  - that are not a train and zoom level is lower than layer's minZoomNonTrain property.
+         *  - that aren't in the MOT list.
          *
          * @param {RealtimeTrajectory} trajectory
          * @param {Array<number>} extent
@@ -251,7 +254,7 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
          *
          * @private
          */
-        onTrajectoryMessage(data: WebSocketAPIMessageEventData): void;
+        onTrajectoryMessage(data: WebSocketAPIMessageEventData<RealtimeTrajectory>): void;
         /**
          * Callback on websocket's deleted_vehicles channel events.
          * It removes the trajectory from the list.
@@ -259,7 +262,7 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
          * @private
          * @override
          */
-        onDeleteTrajectoryMessage(data: WebSocketAPIMessageEventData): void;
+        onDeleteTrajectoryMessage(data: WebSocketAPIMessageEventData<RealtimeTrainId>): void;
         /**
          * Callback when user moves the mouse/pointer over the map.
          * It sets the layer's hoverVehicleId property with the current hovered vehicle's id.

package/common/mixins/RealtimeLayerMixin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RealtimeLayerMixin.d.ts","sourceRoot":"","sources":["../../../src/common/mixins/RealtimeLayerMixin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RealtimeLayerMixin.d.ts","sourceRoot":"","sources":["../../../src/common/mixins/RealtimeLayerMixin.ts"],"names":[],"mappings":"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"}

package/common/mixins/RealtimeLayerMixin.js

@@ -67,9 +67,29 @@ function RealtimeLayerMixin(Base) {
             this.mode = options.mode || RealtimeModes.TOPOGRAPHIC;
             this.api = options.api || new RealtimeAPI(options);
             this.tenant = options.tenant || ''; // sbb,sbh or sbm
-            this.minZoomNonTrain = options.minZoomNonTrain || 9; // Min zoom level from which non trains are allowed to be displayed. Min value is 9 (as configured by the server
             this.minZoomInterpolation = options.minZoomInterpolation || 8; // Min zoom level from which trains positions are not interpolated.
             this.format = new GeoJSON();
+            // MOTs by zoom
+            const allMots = [
+                'tram',
+                'subway',
+                'rail',
+                'bus',
+                'ferry',
+                'cablecar',
+                'gondola',
+                'funicular',
+                'coach',
+            ];
+            // Server will block non train before zoom 9
+            this.motsByZoom = options.motsByZoom || [allMots];
+            this.getMotsByZoom = (zoom) => {
+                return ((options.getMotsByZoom &&
+                    options.getMotsByZoom(zoom, this.motsByZoom)) ||
+                    this.motsByZoom[zoom] ||
+                    this.motsByZoom[this.motsByZoom.length - 1]);
+            };
+            // Generalization levels by zoom
             this.generalizationLevelByZoom = options.generalizationLevelByZoom || [
                 5, 5, 5, 5, 5, 5, 5, 5, 10, 30, 30, 100, 100, 100,
             ];
@@ -78,6 +98,7 @@ function RealtimeLayerMixin(Base) {
                     options.getGeneralizationLevelByZoom(zoom, this.generalizationLevelByZoom)) ||
                     this.generalizationLevelByZoom[zoom]);
             };
+            // Render time interval by zoom
             this.renderTimeIntervalByZoom = options.renderTimeIntervalByZoom || [
                 100000, 50000, 40000, 30000, 20000, 15000, 10000, 5000, 2000, 1000, 400,
                 300, 250, 180, 90, 60, 50, 50, 50, 50, 50,
@@ -273,8 +294,8 @@ function RealtimeLayerMixin(Base) {
             this.renderTrajectories();
             this.startUpdateTime();
             this.api.open();
-            this.api.subscribeTrajectory(this.mode, this.onTrajectoryMessage, this.isUpdateBboxOnMoveEnd);
-            this.api.subscribeDeletedVehicles(this.mode, this.onDeleteTrajectoryMessage, this.isUpdateBboxOnMoveEnd);
+            this.api.subscribeTrajectory(this.mode, this.onTrajectoryMessage, undefined, this.isUpdateBboxOnMoveEnd);
+            this.api.subscribeDeletedVehicles(this.mode, this.onDeleteTrajectoryMessage, undefined, this.isUpdateBboxOnMoveEnd);
             if (this.isUpdateBboxOnMoveEnd) {
                 // Update the bbox on each move end
                 // @ts-ignore function without parameters defined by subclasses
@@ -413,6 +434,11 @@ function RealtimeLayerMixin(Base) {
                 if (this.generalizationLevel) {
                     bbox.push(`gen=${this.generalizationLevel}`);
                 }
+                /* @ignore */
+                this.mots = this.getMotsByZoom(zoom);
+                if (this.mots) {
+                    bbox.push(`mots=${this.mots}`);
+                }
             }
             this.api.bbox = bbox;
         }
@@ -421,8 +447,8 @@ function RealtimeLayerMixin(Base) {
                 return;
             }
             this.mode = mode;
-            this.api.subscribeTrajectory(this.mode, this.onTrajectoryMessage, this.isUpdateBboxOnMoveEnd);
-            this.api.subscribeDeletedVehicles(this.mode, this.onDeleteTrajectoryMessage, this.isUpdateBboxOnMoveEnd);
+            this.api.subscribeTrajectory(this.mode, this.onTrajectoryMessage, undefined, this.isUpdateBboxOnMoveEnd);
+            this.api.subscribeDeletedVehicles(this.mode, this.onDeleteTrajectoryMessage, undefined, this.isUpdateBboxOnMoveEnd);
         }
         /**
          * Get the duration before the next update depending on zoom level.
@@ -518,7 +544,7 @@ function RealtimeLayerMixin(Base) {
          * Determine if the trajectory is useless and should be removed from the list or not.
          * By default, this function exclude vehicles:
          *  - that have their trajectory outside the current extent and
-         *  - that are not a train and zoom level is lower than layer's minZoomNonTrain property.
+         *  - that aren't in the MOT list.
          *
          * @param {RealtimeTrajectory} trajectory
          * @param {Array<number>} extent
@@ -527,9 +553,12 @@ function RealtimeLayerMixin(Base) {
          * @ignore
          */
         purgeTrajectory(trajectory, extent, zoom) {
+            var _a;
             const { type, bounds } = trajectory.properties;
             if (!intersects(extent, bounds) ||
-                (type !== 'rail' && zoom < (this.minZoomNonTrain || 9))) {
+                !((_a = this.mots) === null || _a === void 0 ? void 0 : _a.includes(type)) ||
+                (type !== 'rail' && zoom < 9) // zoom 9 is defined by the backend
+            ) {
                 this.removeTrajectory(trajectory);
                 return true;
             }

package/common/utils/debounceDeparturesMessages.d.ts

@@ -0,0 +1,12 @@
+import type { RealtimeDeparture, RealtimeDepartureExtended } from '../../types';
+import type { WebSocketAPIMessageCallback } from '../api/WebSocketAPI';
+/**
+ * This function returns a WebSocket api callback, and call the onDeparturesUpdate function with the list of current departures to display.
+ * @param {function(departures: RealtimeDeparture[])} onDeparturesUpdate callback when list of departures changes, called after 100 ms
+ * @param {boolean} [sortByMinArrivalTime = true] Sort departures by arrival time
+ * @param {number} [maxDepartureAge = 30] max departure age of departures in minutes
+ * @param {number} [timeout = 100] debounce timeout in ms
+ */
+declare const debounceDeparturesMessages: (onDeparturesUpdate: (departures: RealtimeDepartureExtended[]) => {}, sortByMinArrivalTime?: boolean, maxDepartureAge?: number, timeout?: number) => WebSocketAPIMessageCallback<RealtimeDeparture>;
+export default debounceDeparturesMessages;
+//# sourceMappingURL=debounceDeparturesMessages.d.ts.map

package/common/utils/debounceDeparturesMessages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debounceDeparturesMessages.d.ts","sourceRoot":"","sources":["../../../src/common/utils/debounceDeparturesMessages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EACV,2BAA2B,EAE5B,MAAM,qBAAqB,CAAC;AAG7B;;;;;;GAMG;AACH,QAAA,MAAM,0BAA0B,oCACG,yBAAyB,EAAE,KAAK,EAAE,iFAIlE,4BAA4B,iBAAiB,CAwB/C,CAAC;AAEF,eAAe,0BAA0B,CAAC"}

package/common/utils/debounceDeparturesMessages.js

@@ -0,0 +1,24 @@
+import sortAndfilterDepartures from './sortAndFilterDepartures';
+/**
+ * This function returns a WebSocket api callback, and call the onDeparturesUpdate function with the list of current departures to display.
+ * @param {function(departures: RealtimeDeparture[])} onDeparturesUpdate callback when list of departures changes, called after 100 ms
+ * @param {boolean} [sortByMinArrivalTime = true] Sort departures by arrival time
+ * @param {number} [maxDepartureAge = 30] max departure age of departures in minutes
+ * @param {number} [timeout = 100] debounce timeout in ms
+ */
+const debounceDeparturesMessages = (onDeparturesUpdate, sortByMinArrivalTime = true, maxDepartureAge = 30, timeout = 100) => {
+    const departureUpdateTimeout = {};
+    const departureObject = {};
+    return (data) => {
+        const { source, content: departure } = data;
+        if (departureUpdateTimeout[source]) {
+            window.clearTimeout(departureUpdateTimeout[source]);
+        }
+        departureObject[departure.call_id] = departure;
+        departureUpdateTimeout[source] = window.setTimeout(() => {
+            const departures = sortAndfilterDepartures(departureObject, sortByMinArrivalTime || false, maxDepartureAge);
+            onDeparturesUpdate(departures);
+        }, timeout);
+    };
+};
+export default debounceDeparturesMessages;

package/common/utils/debounceWebsocketMessages.d.ts

@@ -0,0 +1,11 @@
+import type { WebSocketAPIMessageCallback } from '../api/WebSocketAPI';
+/**
+ * This function returns a WebSocket api callback, and call the onUpdate function with the list of of subscribed objects changes.
+ *
+ * @param {function(objects: any[])} onUpdate callback when list of subscribed objects changes, called after 100 ms
+ * @param {function(object: any)} [getObjectId = true] function returning the id of an object
+ * @param {number} [timeout = 100] debounce timeout in ms
+ */
+declare const debounceWebsocketMessages: (onUpdate: (objects: any[]) => void, getObjectId?: ((object: any) => string) | undefined, timeout?: number) => WebSocketAPIMessageCallback<any>;
+export default debounceWebsocketMessages;
+//# sourceMappingURL=debounceWebsocketMessages.d.ts.map

package/common/utils/debounceWebsocketMessages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debounceWebsocketMessages.d.ts","sourceRoot":"","sources":["../../../src/common/utils/debounceWebsocketMessages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAE5B,MAAM,qBAAqB,CAAC;AAE7B;;;;;;GAMG;AACH,QAAA,MAAM,yBAAyB,uBACT,GAAG,EAAE,KAAK,IAAI,0BACX,GAAG,KAAK,MAAM,oCAEpC,4BAA4B,GAAG,CA2BjC,CAAC;AAEF,eAAe,yBAAyB,CAAC"}

package/common/utils/debounceWebsocketMessages.js

@@ -0,0 +1,29 @@
+/**
+ * This function returns a WebSocket api callback, and call the onUpdate function with the list of of subscribed objects changes.
+ *
+ * @param {function(objects: any[])} onUpdate callback when list of subscribed objects changes, called after 100 ms
+ * @param {function(object: any)} [getObjectId = true] function returning the id of an object
+ * @param {number} [timeout = 100] debounce timeout in ms
+ */
+const debounceWebsocketMessages = (onUpdate, getObjectId, timeout = 100) => {
+    const updateTimeout = {};
+    const objectsById = {};
+    const objects = [];
+    return (data) => {
+        const { source, content } = data;
+        if (updateTimeout[source]) {
+            window.clearTimeout(updateTimeout[source]);
+        }
+        if (getObjectId) {
+            objectsById[getObjectId(content)] = content;
+        }
+        else {
+            objects.push(content);
+        }
+        updateTimeout[source] = window.setTimeout(() => {
+            const objectToReturn = getObjectId ? Object.values(objectsById) : objects;
+            onUpdate(objectToReturn);
+        }, timeout);
+    };
+};
+export default debounceWebsocketMessages;

package/common/utils/index.d.ts

@@ -8,5 +8,8 @@ export { default as sortByDelay } from "./sortByDelay";
 export { default as renderTrajectories } from "./renderTrajectories";
 export { default as getMaplibreRender } from "./getMaplibreRender";
 export { default as getMapboxRender } from "./getMapboxRender";
+export { default as debounceDeparturesMessages } from "./debounceDeparturesMessages";
+export { default as debounceWebsocketMessages } from "./debounceWebsocketMessages";
+export { default as sortAndFilterDepartures } from "./sortAndFilterDepartures";
 export * as realtimeConfig from "./realtimeConfig";
 //# sourceMappingURL=index.d.ts.map

package/common/utils/index.js

@@ -8,5 +8,8 @@ export { default as sortByDelay } from './sortByDelay';
 export { default as renderTrajectories } from './renderTrajectories';
 export { default as getMaplibreRender } from './getMaplibreRender';
 export { default as getMapboxRender } from './getMapboxRender';
+export { default as debounceDeparturesMessages } from './debounceDeparturesMessages';
+export { default as debounceWebsocketMessages } from './debounceWebsocketMessages';
+export { default as sortAndFilterDepartures } from './sortAndFilterDepartures';
 import * as realtimeConfig_1 from './realtimeConfig';
 export { realtimeConfig_1 as realtimeConfig };

package/common/utils/sortAndFilterDepartures.d.ts

@@ -0,0 +1,16 @@
+import { RealtimeAPIDeparturesById } from '../../api/RealtimeAPI';
+import type { RealtimeDepartureExtended } from '../../types';
+/**
+ * This function sort Departures by arrival time and filter out unwanted departures:
+ *  - when dparture time is in the past
+ *  - when departure are duplicated
+ *  - when departure is not in the next 30 min
+ *
+ * @param {Object} depObject The object containing departures by id.
+ * @param {boolean} [sortByMinArrivalTime=false] If true sort departures by arrival time.
+ * @return {Array<Departure>} Return departures array.
+ * @private
+ */
+declare const sortAndfilterDepartures: (depObject: RealtimeAPIDeparturesById, sortByMinArrivalTime?: boolean, maxDepartureAge?: number) => RealtimeDepartureExtended[];
+export default sortAndfilterDepartures;
+//# sourceMappingURL=sortAndFilterDepartures.d.ts.map

package/common/utils/sortAndFilterDepartures.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortAndFilterDepartures.d.ts","sourceRoot":"","sources":["../../../src/common/utils/sortAndFilterDepartures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAG7D;;;;;;;;;;GAUG;AACH,QAAA,MAAM,uBAAuB,cAChB,yBAAyB,yBACd,OAAO,oBACZ,MAAM,KACtB,yBAAyB,EAwD3B,CAAC;AAEF,eAAe,uBAAuB,CAAC"}

package/common/utils/sortAndFilterDepartures.js

@@ -0,0 +1,58 @@
+import compareDepartures from './compareDepartures';
+/**
+ * This function sort Departures by arrival time and filter out unwanted departures:
+ *  - when dparture time is in the past
+ *  - when departure are duplicated
+ *  - when departure is not in the next 30 min
+ *
+ * @param {Object} depObject The object containing departures by id.
+ * @param {boolean} [sortByMinArrivalTime=false] If true sort departures by arrival time.
+ * @return {Array<Departure>} Return departures array.
+ * @private
+ */
+const sortAndfilterDepartures = (depObject, sortByMinArrivalTime = false, maxDepartureAge = 30) => {
+    const departures = Object.keys(depObject).map((k) => depObject[k]);
+    departures.sort((a, b) => compareDepartures(a, b, sortByMinArrivalTime));
+    const futureDate = new Date();
+    futureDate.setMinutes(futureDate.getMinutes() + maxDepartureAge);
+    const future = futureDate.getTime();
+    const pastDate = new Date();
+    pastDate.setMinutes(pastDate.getMinutes() - maxDepartureAge);
+    const past = pastDate.getTime();
+    const departureArray = [];
+    const platformsBoarding = [];
+    let previousDeparture = null;
+    for (let i = departures.length - 1; i >= 0; i -= 1) {
+        const departure = Object.assign({}, departures[i]);
+        const time = new Date(departure.time).getTime();
+        // Only show departures within the next 30 minutes
+        if (time > past && time < future) {
+            // If 2 trains are boarding at the same platform,
+            // remove the older one.
+            if (departure.state === 'BOARDING') {
+                if (!platformsBoarding.includes(departure.platform)) {
+                    platformsBoarding.push(departure.platform);
+                }
+                else {
+                    departure.state = 'HIDDEN';
+                }
+            }
+            // If two trains with the same line number and destinatin
+            // and a departure difference < 1 minute, hide the second one.
+            if (previousDeparture &&
+                departure.to[0] === previousDeparture.to[0] &&
+                Math.abs(time - previousDeparture.time) < 1000 &&
+                departure.line.name === previousDeparture.line.name) {
+                departure.state = 'HIDDEN';
+            }
+            if (/(STOP_CANCELLED|JOURNEY_CANCELLED)/.test(departure.state)) {
+                departure.cancelled = true;
+            }
+            previousDeparture = departure;
+            previousDeparture.time = time;
+            departureArray.unshift(departure);
+        }
+    }
+    return departureArray;
+};
+export default sortAndfilterDepartures;

package/mapbox/layers/RealtimeLayer.d.ts

@@ -23,7 +23,6 @@ declare const RealtimeLayer_base: {
         style?: import("../../types").RealtimeStyleFunction | undefined;
         styleOptions?: import("../../types").RealtimeStyleOptions | undefined;
         pixelRatio?: number | undefined;
-        minZoomNonTrain: number;
         minZoomInterpolation: number;
         isUpdateBboxOnMoveEnd: boolean;
         hoverVehicleId?: string | undefined;
@@ -32,6 +31,8 @@ declare const RealtimeLayer_base: {
         useRequestAnimationFrame?: boolean | undefined;
         useDebounce?: boolean | undefined;
         useThrottle?: boolean | undefined;
+        mots?: import("../../types").RealtimeMot[] | undefined;
+        motsByZoom: import("../../types").RealtimeMot[][];
         generalizationLevel?: import("../../types").RealtimeGeneralizationLevel | undefined;
         generalizationLevelByZoom: import("../../types").RealtimeGeneralizationLevel[];
         renderTimeIntervalByZoom: number[];
@@ -41,6 +42,7 @@ declare const RealtimeLayer_base: {
         updateTimeDelay?: number | undefined;
         visibilityRef: import("ol/events").EventsKey;
         selectedVehicle: GeoJSONFeature;
+        getMotsByZoom: (zoom: number) => import("../../types").RealtimeMot[];
         getGeneralizationLevelByZoom: (zoom: number) => import("../../types").RealtimeGeneralizationLevel;
         getRenderTimeIntervalByZoom: (zoom: number) => number;
         throttleRenderTrajectories: (viewState: import("../../types").ViewState, noInterpolate?: boolean | undefined) => void;
@@ -64,16 +66,16 @@ declare const RealtimeLayer_base: {
             coordinate: Coordinate;
         }>;
         getTrajectoryInfos(id: string): Promise<{
-            stopSequence: unknown;
-            fullTrajectory: unknown;
+            stopSequence: import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData<import("../../types").RealtimeFullTrajectory> | import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData<GeoJSONFeature[]>;
+            fullTrajectory: import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData<import("../../types").RealtimeFullTrajectory> | import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData<GeoJSONFeature[]>;
         }>;
         purgeTrajectory(trajectory: GeoJSONFeature, extent: [number, number, number, number], zoom: number): boolean;
         addTrajectory(trajectory: GeoJSONFeature): void;
         removeTrajectory(trajectoryOrId: any): void;
         onZoomEnd(): void;
         onDocumentVisibilityChange(): void;
-        onTrajectoryMessage(data: import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData): void;
-        onDeleteTrajectoryMessage(data: import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData): void;
+        onTrajectoryMessage(data: import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData<GeoJSONFeature>): void;
+        onDeleteTrajectoryMessage(data: import("../../common/api/WebSocketAPI").WebSocketAPIMessageEventData<string>): void;
         onFeatureHover(features: Feature<import("ol/geom/Geometry").default>[], layer: import("../../types").AnyRealtimeLayer, coordinate: Coordinate): void;
         onFeatureClick(features: Feature<import("ol/geom/Geometry").default>[], layer: import("../../types").AnyRealtimeLayer, coordinate: Coordinate): void;
     };

package/mapbox/layers/RealtimeLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/mapbox/layers/RealtimeLayer.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExD;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;gBAC1B,OAAO,KAAK;IAqBxB;;;;;;OAMG;IAEH,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM;IAuC/C;;OAEG;IACH,aAAa;IAkBb;;;;;;OAMG;IACH,KAAK;IAQL;;;;OAIG;IACH,IAAI;IASJ,MAAM;IASN;;;OAGG;IACH,kBAAkB,CAChB,GAAG,EAAE,QAAQ,CAAC,kBAAkB,GAAG,UAAU,CAAC,aAAa;IAQ7D;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,CAAC,EAAE,OAAe;IAuDlD;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAQvC,kBAAkB;IAclB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;;OAIG;IACH,MAAM;IAIN,0BAA0B,CACxB,SAAS,EAAE,SAAS,EACpB,aAAa,GAAE,OAAe;IAahC;;;;;OAKG;IACH,SAAS;IAQT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;CAOzB;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/mapbox/layers/RealtimeLayer.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExD;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;gBAC1B,OAAO,KAAK;IAqBxB;;;;;;OAMG;IAEH,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM;IAuC/C;;OAEG;IACH,aAAa;IAkBb;;;;;;OAMG;IACH,KAAK;IAQL;;;;OAIG;IACH,IAAI;IASJ,MAAM;IASN;;;OAGG;IACH,kBAAkB,CAChB,GAAG,EAAE,QAAQ,CAAC,kBAAkB,GAAG,UAAU,CAAC,aAAa;IAQ7D;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,CAAC,EAAE,OAAe;IAuDlD;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAQvC,kBAAkB;IAclB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;;OAIG;IACH,MAAM;IAIN,0BAA0B,CACxB,SAAS,EAAE,SAAS,EACpB,aAAa,GAAE,OAAe;IAahC;;;;;OAKG;IACH,SAAS;IAQT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;CAOzB;AAED,eAAe,aAAa,CAAC"}