mobility-toolbox-js 2.0.0-beta.52 → 2.0.0-beta.54

package/common/utils/{trackerConfig.js → realtimeConfig.js}

@@ -1,15 +1,15 @@
-const trackerRadiusMapping = {
-    0: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    1: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    2: [0, 0, 0, 0, 0, 2, 2, 3, 7, 7, 7, 12, 15, 15, 15, 15, 15],
-    3: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    4: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    5: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    6: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    7: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    8: [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
-    9: [0, 0, 0, 0, 0, 2, 2, 3, 7, 7, 7, 12, 15, 15, 15, 15, 15],
-};
+const radiusMapping = [
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 2, 2, 3, 7, 7, 7, 12, 15, 15, 15, 15, 15],
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7],
+    [0, 0, 0, 0, 0, 2, 2, 3, 7, 7, 7, 12, 15, 15, 15, 15, 15],
+];
 /**
  * Trajserv value: 'Tram',  'Subway / Metro / S-Bahn',  'Train', 'Bus', 'Ferry', 'Cable Car', 'Gondola', 'Funicular', 'Long distance bus', 'Rail',
  * New endpoint use Rail instead of Train.
@@ -74,7 +74,7 @@ export const getTypeIndex = (type) => {
 export const getRadius = (type, zoom) => {
     try {
         const typeIdx = getTypeIndex(type || 0);
-        return trackerRadiusMapping[typeIdx][zoom];
+        return radiusMapping[typeIdx][zoom];
     }
     catch (e) {
         return 1;
@@ -83,25 +83,25 @@ export const getRadius = (type, zoom) => {
 /**
  * @ignore
  */
-export const getBgColor = (type = 0) => {
+export const getBgColor = (type) => {
     try {
         const typeIdx = getTypeIndex(type);
         return bgColors[typeIdx];
     }
     catch (e) {
-        return 1;
+        return '#ffffff';
     }
 };
 /**
  * @ignore
  */
-export const getTextColor = (type = 0) => {
+export const getTextColor = (type) => {
     try {
         const typeIdx = getTypeIndex(type);
         return textColors[typeIdx];
     }
     catch (e) {
-        return 1;
+        return '#ffffff';
     }
 };
 /**

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/common/utils/sortByDelay.d.ts

@@ -1,3 +1,3 @@
+declare const sortByDelay: (traj1: GeoJSONFeature, traj2: GeoJSONFeature) => number;
 export default sortByDelay;
-declare function sortByDelay(traj1: any, traj2: any): number;
 //# sourceMappingURL=sortByDelay.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sortByDelay.d.ts","sourceRoot":"","sources":["../../../src/common/utils/sortByDelay.js"],"names":[],"mappings":";AAAA,6DAoBC"}
+{"version":3,"file":"sortByDelay.d.ts","sourceRoot":"","sources":["../../../src/common/utils/sortByDelay.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,WAAW,oDAGd,MAoBF,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/common/utils/timeUtils.d.ts

@@ -1,5 +1,24 @@
-export function getUTCDateString(now?: Date): string;
-export function getUTCTimeString(date: any): string;
-export function pad(integer: any): any;
-export function getHoursAndMinutes(timeInMs: number): string;
+/**
+ * Get a Date object as UTC date string .
+ * ex: 2019 09 01
+ * @ignore
+ */
+export declare const getUTCDateString: (now?: Date) => string;
+/**
+ * Get the UTC time string of Date object.
+ * ex: 09:05:01.123
+ * @ignore
+ */
+export declare const getUTCTimeString: (date: Date) => string;
+/**
+ * Returns a string representation of a number, with a zero if the number is lower than 10.
+ * @ignore
+ */
+export declare const pad: (integer: number) => string;
+/**
+ * Returns a 'hh:mm' string from a time in ms.
+ * @param {Number} timeInMs Time in milliseconds.
+ * @ignore
+ */
+export declare const getHoursAndMinutes: (timeInMs: number) => string;
 //# sourceMappingURL=timeUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"timeUtils.d.ts","sourceRoot":"","sources":["../../../src/common/utils/timeUtils.js"],"names":[],"mappings":"AAKO,qDAON;AAOM,oDAKM;AAMN,uCAAiE;AAOjE,6DAMN"}
+{"version":3,"file":"timeUtils.d.ts","sourceRoot":"","sources":["../../../src/common/utils/timeUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,kBAAuB,MAOnD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAAU,IAAI,KAAG,MAKjC,CAAC;AAEd;;;GAGG;AACH,eAAO,MAAM,GAAG,YAAa,MAAM,KAAG,MACO,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,aAAc,MAAM,KAAG,MAMrD,CAAC"}

package/common/utils/timeUtils.js

@@ -24,7 +24,7 @@ export const getUTCTimeString = (date) => [
  * Returns a string representation of a number, with a zero if the number is lower than 10.
  * @ignore
  */
-export const pad = (integer) => (integer < 10 ? `0${integer}` : integer);
+export const pad = (integer) => integer < 10 ? `0${integer}` : `${integer}`;
 /**
  * Returns a 'hh:mm' string from a time in ms.
  * @param {Number} timeInMs Time in milliseconds.

package/mapbox/layers/RealtimeLayer.d.ts

@@ -64,16 +64,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;
     };