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

package/ol/layers/RealtimeLayer.d.ts

@@ -5,8 +5,9 @@ import { Coordinate } from 'ol/coordinate';
 import { ObjectEvent } from 'ol/Object';
 import Layer from './Layer';
 import { RealtimeLayerMixinOptions } from '../../common/mixins/RealtimeLayerMixin';
-import { AnyMap, LayerGetFeatureInfoResponse, RealtimeTrainId } from '../../types';
+import { AnyMap, LayerGetFeatureInfoResponse, RealtimeFullTrajectory, RealtimeTrainId } from '../../types';
 import { RealtimeTrajectory } from '../../api/typedefs';
+import { WebSocketAPIMessageEventData } from '../../common/api/WebSocketAPI';
 export declare type OlRealtimeLayerOptions = RealtimeLayerMixinOptions & {
     fullTrajectoryStyle: (feature: FeatureLike, resolution: number, options: any) => void;
 };
@@ -29,7 +30,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;
@@ -38,6 +38,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[];
@@ -47,6 +49,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;
@@ -70,16 +73,16 @@ declare const RealtimeLayer_base: {
             coordinate: Coordinate;
         }>;
         getTrajectoryInfos(id: string): Promise<{
-            stopSequence: unknown;
-            fullTrajectory: unknown;
+            stopSequence: WebSocketAPIMessageEventData<RealtimeFullTrajectory> | WebSocketAPIMessageEventData<GeoJSONFeature[]>;
+            fullTrajectory: WebSocketAPIMessageEventData<RealtimeFullTrajectory> | 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: WebSocketAPIMessageEventData<GeoJSONFeature>): void;
+        onDeleteTrajectoryMessage(data: 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/ol/layers/RealtimeLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/RealtimeLayer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAKxC,OAAO,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAc,EACZ,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,MAAM,EACN,2BAA2B,EAE3B,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAKxD,oBAAY,sBAAsB,GAAG,yBAAyB,GAAG;IAC/D,mBAAmB,EAAE,CACnB,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,GAAG,KACT,IAAI,CAAC;CACX,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF;;;;;;;;;;;;;;;;;GAiBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;IACtC;;;;;OAKG;gBACS,OAAO,EAAE,sBAAsB;IAiG3C,WAAW,CAAC,GAAG,EAAE,MAAM;IA4BvB;;OAEG;IACH,aAAa;IAKb;;;;OAIG;IACH,0BAA0B,CAAC,UAAU,EAAE,UAAU;IAcjD;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,EAAE,OAAO;IAoBzC;;;;OAIG;IACH,0BAA0B,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO;IAyBvE;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAQvC;;;;;OAKG;IAEH,SAAS,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW;IAerC;;;;;;OAMG;IAEH,SAAS;IAIT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAQxB;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAWxB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;OAGG;IACH,mBAAmB,CAAC,EAAE,EAAE,eAAe;IAmBvC;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,sBAAsB;CAGzC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/RealtimeLayer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAKxC,OAAO,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAc,EACZ,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,MAAM,EACN,2BAA2B,EAC3B,sBAAsB,EACtB,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAK7E,oBAAY,sBAAsB,GAAG,yBAAyB,GAAG;IAC/D,mBAAmB,EAAE,CACnB,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,GAAG,KACT,IAAI,CAAC;CACX,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF;;;;;;;;;;;;;;;;;GAiBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;IACtC;;;;;OAKG;gBACS,OAAO,EAAE,sBAAsB;IAiG3C,WAAW,CAAC,GAAG,EAAE,MAAM;IA4BvB;;OAEG;IACH,aAAa;IAKb;;;;OAIG;IACH,0BAA0B,CAAC,UAAU,EAAE,UAAU;IAcjD;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,EAAE,OAAO;IAoBzC;;;;OAIG;IACH,0BAA0B,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO;IAyBvE;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAQvC;;;;;OAKG;IAEH,SAAS,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW;IAerC;;;;;;OAMG;IAEH,SAAS;IAIT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAQxB;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAWxB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;OAGG;IACH,mBAAmB,CAAC,EAAE,EAAE,eAAe;IAmBvC;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,sBAAsB;CAGzC;AAED,eAAe,aAAa,CAAC"}

package/ol/layers/RealtimeLayer.js

@@ -281,9 +281,9 @@ class RealtimeLayer extends mixin(Layer) {
     highlightTrajectory(id) {
         this.api
             .getFullTrajectory(id, this.mode, this.generalizationLevel)
-            .then((fullTrajectory) => {
-            const vectorSource = this.vectorLayer.getSource();
-            vectorSource.clear();
+            .then((data) => {
+            const fullTrajectory = data.content;
+            this.vectorLayer.getSource().clear();
             if (!fullTrajectory ||
                 !fullTrajectory.features ||
                 !fullTrajectory.features.length) {

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": "2.0.0-beta.53",
+  "version": "2.0.0-beta.55",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

package/types/common.d.ts

@@ -16,7 +16,7 @@ import type {
 } from '../ol';
 import { RealtimeTrajectory } from '../api/typedefs';
 import CommonLayer, { LayerCommonOptions } from '../common/layers/LayerCommon';
-import { RoutingParameters } from '.';
+import type { RoutingParameters } from '.';
 
 export type StyleCache = { [key: string]: AnyCanvas };
 

package/types/realtime.d.ts

@@ -132,8 +132,6 @@ export interface RealtimeStop {
   state?: RealtimeStopState;
   stationId: RealtimeStationId;
   stationName: string;
-  arrivalTimeWithDelay: number; // TODO: add by cleanStopTime function
-  departureTimeWithDelay: number; // TODO: add by cleanStopTime function
 }
 
 export interface RealtimeStopSequence {

package/common/utils/cleanStopTime.d.ts

@@ -1,8 +0,0 @@
-import { RealtimeStopSequence } from '../../types';
-/**
- * Remove the delay from arrivalTime and departureTime
- * @private
- */
-declare const cleanStopTime: (content: RealtimeStopSequence) => RealtimeStopSequence;
-export default cleanStopTime;
-//# sourceMappingURL=cleanStopTime.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"cleanStopTime.d.ts","sourceRoot":"","sources":["../../../src/common/utils/cleanStopTime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;GAGG;AACH,QAAA,MAAM,aAAa,YAAa,oBAAoB,KAAG,oBAmBtD,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/common/utils/cleanStopTime.js

@@ -1,25 +0,0 @@
-/**
- * Remove the delay from arrivalTime and departureTime
- * @private
- */
-const cleanStopTime = (content) => {
-    content.stations.forEach((station) => {
-        // eslint-disable-next-line no-param-reassign
-        station.arrivalTimeWithDelay = station.arrivalTime;
-        if (station.departureTime) {
-            // eslint-disable-next-line no-param-reassign
-            station.departureTimeWithDelay = station.departureTime;
-        }
-        if (station.arrivalDelay) {
-            // eslint-disable-next-line no-param-reassign
-            station.arrivalTime -= station.arrivalDelay;
-            if (station.departureTime) {
-                // eslint-disable-next-line no-param-reassign
-                station.departureTime -= station.arrivalDelay;
-            }
-        }
-    });
-    // eslint-disable-next-line consistent-return
-    return content;
-};
-export default cleanStopTime;