@golemio/pid 2.2.4-dev.546779094 → 2.2.4-dev.546885184
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.d.ts +1 -0
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js +20 -2
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js.map +1 -1
- package/dist/output-gateway/pid/index.d.ts +2 -1
- package/dist/output-gateway/pid/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,4 +5,5 @@ export default class DepartureBoardMapper {
|
|
|
5
5
|
* Initiates all routes. Should respond with correct data to a HTTP requests to all routes.
|
|
6
6
|
*/
|
|
7
7
|
static transformResponseData: (x: IPIDDeparture, preferredTimezone: string, mode?: string | undefined) => any;
|
|
8
|
+
static calculateDepartureMinutes(predicted: Date | null): string | null;
|
|
8
9
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
const shared_1 = require("../../shared");
|
|
5
|
+
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
4
6
|
const lodash_1 = require("lodash");
|
|
5
7
|
const __1 = require("..");
|
|
6
8
|
class DepartureBoardMapper {
|
|
@@ -8,13 +10,27 @@ class DepartureBoardMapper {
|
|
|
8
10
|
const result = data.departures.map((d) => this.transformResponseData(d, preferredTimezone, mode));
|
|
9
11
|
return result;
|
|
10
12
|
}
|
|
13
|
+
static calculateDepartureMinutes(predicted) {
|
|
14
|
+
if (!predicted)
|
|
15
|
+
return null;
|
|
16
|
+
if (!(predicted instanceof Date)) {
|
|
17
|
+
output_gateway_1.log.warn(`Unknown type of predicted date: ${predicted}`);
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
const departure_minutes = Math.round((predicted.getTime() - Date.now()) / (60 * 1000));
|
|
21
|
+
if (departure_minutes < 1)
|
|
22
|
+
return "<1";
|
|
23
|
+
else
|
|
24
|
+
return departure_minutes.toString();
|
|
25
|
+
}
|
|
11
26
|
}
|
|
12
27
|
exports.default = DepartureBoardMapper;
|
|
28
|
+
_a = DepartureBoardMapper;
|
|
13
29
|
/**
|
|
14
30
|
* Initiates all routes. Should respond with correct data to a HTTP requests to all routes.
|
|
15
31
|
*/
|
|
16
32
|
DepartureBoardMapper.transformResponseData = (x, preferredTimezone, mode) => {
|
|
17
|
-
var
|
|
33
|
+
var _b;
|
|
18
34
|
let isAtStop = x.is_delay_available ? x.stop_sequence === x["trip.last_position.this_stop_sequence"] : false;
|
|
19
35
|
const arrivalTimestamp = {
|
|
20
36
|
// with added delay
|
|
@@ -27,6 +43,8 @@ DepartureBoardMapper.transformResponseData = (x, preferredTimezone, mode) => {
|
|
|
27
43
|
predicted: shared_1.RopidRouterUtils.formatTimestamp(x.departure_datetime_real, preferredTimezone),
|
|
28
44
|
// according to trip plan
|
|
29
45
|
scheduled: shared_1.RopidRouterUtils.formatTimestamp(x.departure_datetime, preferredTimezone),
|
|
46
|
+
// minutes till departure. if less than 30 sec return "<1"
|
|
47
|
+
minutes: _a.calculateDepartureMinutes(x.departure_datetime_real),
|
|
30
48
|
};
|
|
31
49
|
// default value
|
|
32
50
|
mode = mode || __1.DepartureMode.DEPARTURES;
|
|
@@ -68,7 +86,7 @@ DepartureBoardMapper.transformResponseData = (x, preferredTimezone, mode) => {
|
|
|
68
86
|
},
|
|
69
87
|
trip: {
|
|
70
88
|
direction: x.direction,
|
|
71
|
-
headsign: (
|
|
89
|
+
headsign: (_b = x.stop_headsign) !== null && _b !== void 0 ? _b : x.trip_headsign,
|
|
72
90
|
id: x.trip_id,
|
|
73
91
|
is_at_stop: isAtStop,
|
|
74
92
|
is_canceled: x.is_canceled || false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export interface IPIDDeparture {
|
|
|
18
18
|
arrival_datetime: string;
|
|
19
19
|
departure_datetime: string;
|
|
20
20
|
arrival_datetime_real: Date | null;
|
|
21
|
-
departure_datetime_real:
|
|
21
|
+
departure_datetime_real: Date | null;
|
|
22
22
|
route_short_name: string;
|
|
23
23
|
trip_id: string;
|
|
24
24
|
trip_headsign: string;
|
|
@@ -112,6 +112,7 @@ export interface IDepartureBoard {
|
|
|
112
112
|
export interface IDepartureTime {
|
|
113
113
|
predicted: string | null;
|
|
114
114
|
scheduled: string | null;
|
|
115
|
+
minutes?: string | null;
|
|
115
116
|
}
|
|
116
117
|
export declare enum DepartureMode {
|
|
117
118
|
DEPARTURES = "departures",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAGA,2CAAyB;AACzB,8CAA4B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAGA,2CAAyB;AACzB,8CAA4B;AAsH5B,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACnB,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,yCAAuB,CAAA;AAC3B,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;AAED,IAAY,eAMX;AAND,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,2CAAwB,CAAA;IACxB,0DAAuC,CAAA;IACvC,oDAAiC,CAAA;IACjC,mEAAgD,CAAA;AACpD,CAAC,EANW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAM1B;AAED,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,mCAAkB,CAAA;IAClB,8BAA8B;AAClC,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB"}
|