@golemio/pid 5.1.0-dev.2167808359 → 5.1.0-dev.2170798836
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/controllers/v4/V4TransferBoardsController.js +1 -2
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js +2 -4
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js.map +1 -1
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js +3 -4
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js.map +1 -1
- package/dist/output-gateway/pid/service/transformations/TransferDepartureTransformation.js +3 -4
- package/dist/output-gateway/pid/service/transformations/TransferDepartureTransformation.js.map +1 -1
- package/dist/output-gateway/public/service/transformations/PublicDepartureTransformation.d.ts +0 -6
- package/dist/output-gateway/public/service/transformations/PublicDepartureTransformation.js +4 -16
- package/dist/output-gateway/public/service/transformations/PublicDepartureTransformation.js.map +1 -1
- package/dist/output-gateway/shared/DepartureCalculator.d.ts +2 -2
- package/dist/output-gateway/shared/DepartureCalculator.js +19 -19
- package/dist/output-gateway/shared/DepartureCalculator.js.map +1 -1
- package/dist/output-gateway/shared/PlatformCodeResolver.d.ts +29 -0
- package/dist/output-gateway/shared/PlatformCodeResolver.js +36 -0
- package/dist/output-gateway/shared/PlatformCodeResolver.js.map +1 -0
- package/dist/output-gateway/shared/index.d.ts +2 -0
- package/dist/output-gateway/shared/index.js +2 -0
- package/dist/output-gateway/shared/index.js.map +1 -1
- package/package.json +1 -1
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.d.ts +0 -16
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.js +0 -29
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.js.map +0 -1
|
@@ -29,7 +29,6 @@ const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/tr
|
|
|
29
29
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
30
30
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
31
31
|
const TransferDepartureCacheTransformation_1 = require("../../service/transformations/TransferDepartureCacheTransformation");
|
|
32
|
-
const DepartureCalculator_1 = require("../../../shared/DepartureCalculator");
|
|
33
32
|
const GtfsStopParser_1 = require("../../../../helpers/GtfsStopParser");
|
|
34
33
|
const DepartureBoardMapper_1 = __importDefault(require("../../helpers/DepartureBoardMapper"));
|
|
35
34
|
const RouteTypeEnums_1 = require("../../../../helpers/RouteTypeEnums");
|
|
@@ -167,7 +166,7 @@ let V4TransferBoardsController = V4TransferBoardsController_1 = class V4Transfer
|
|
|
167
166
|
t.position?.detailed_info?.is_wheelchair_accessible ?? DEFAULT_VEHICLE_ACCESSIBILITY;
|
|
168
167
|
}
|
|
169
168
|
t.departure.is_wheelchair_accessible = DepartureBoardMapper_1.default.resolveAccessibility(accessibility);
|
|
170
|
-
t.departure.predictedDepartureDate =
|
|
169
|
+
t.departure.predictedDepartureDate = shared_1.DepartureCalculator.getPredictedDepartureTime(new Date(t.departure.departure_datetime), t.departure.arrival_datetime ? new Date(t.departure.arrival_datetime) : null, t.position?.delay ?? null);
|
|
171
170
|
t.departure.predictedDepartureTimestamp = t.departure.predictedDepartureDate.getTime();
|
|
172
171
|
return t;
|
|
173
172
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V4TransferBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v4/V4TransferBoardsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAEA,2EAA0E;AAC1E,2EAA0E;AAC1E,wEAAqE;AAErE,qDAAoD;AACpD,wEAAuE;AACvE,gEAA+D;AAC/D,wEAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"V4TransferBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v4/V4TransferBoardsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
const AccessibilityEnums_1 = require("../../../helpers/AccessibilityEnums");
|
|
5
5
|
const RouteTypeEnums_1 = require("../../../helpers/RouteTypeEnums");
|
|
6
6
|
const shared_1 = require("../../shared");
|
|
7
|
-
const DepartureCalculator_1 = require("../../shared/DepartureCalculator");
|
|
8
7
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
9
8
|
const __1 = require("..");
|
|
10
|
-
const PlatformCodeResolver_1 = require("../service/helpers/PlatformCodeResolver");
|
|
11
9
|
class DepartureBoardMapper {
|
|
12
10
|
static mapDepartures(data, preferredTimezone, mode) {
|
|
13
11
|
const result = data.departures.map((d) => this.transformResponseData(d, preferredTimezone, mode));
|
|
@@ -23,7 +21,7 @@ class DepartureBoardMapper {
|
|
|
23
21
|
output_gateway_1.log.warn(`Unknown type of predicted date: ${predicted}`);
|
|
24
22
|
return null;
|
|
25
23
|
}
|
|
26
|
-
const departure_minutes =
|
|
24
|
+
const departure_minutes = shared_1.DepartureCalculator.getDepartureMinutes(predicted);
|
|
27
25
|
if (departure_minutes < 1) {
|
|
28
26
|
return "<1";
|
|
29
27
|
}
|
|
@@ -101,7 +99,7 @@ DepartureBoardMapper.transformResponseData = (x, preferredTimezone, mode) => {
|
|
|
101
99
|
},
|
|
102
100
|
stop: {
|
|
103
101
|
id: x.stop_id,
|
|
104
|
-
platform_code:
|
|
102
|
+
platform_code: shared_1.PlatformCodeResolver.resolveDirect(x, x["trip.cis_stop_platform_code"]),
|
|
105
103
|
},
|
|
106
104
|
trip: {
|
|
107
105
|
direction: x.direction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":";;;AAAA,4EAA2G;AAC3G,oEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":";;;AAAA,4EAA2G;AAC3G,oEAA4D;AAC5D,yCAAyF;AACzF,sEAAwD;AACxD,0BAA+G;AAE/G,MAAqB,oBAAoB;IAC9B,MAAM,CAAC,aAAa,CAAC,IAAS,EAAE,iBAAyB,EAAE,IAAY;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;QAEjH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAAC,IAA4B;QAC3D,OAAO,EAAoB,CAAC,gCAAgC,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAyEO,MAAM,CAAC,yBAAyB,CAAC,SAAsB;QAC3D,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,IAAI,CAAC,CAAC,SAAS,YAAY,IAAI,CAAC,EAAE,CAAC;YAC/B,oBAAG,CAAC,IAAI,CAAC,mCAAmC,SAAS,EAAE,CAAC,CAAC;YACzD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,iBAAiB,GAAG,4BAAmB,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC7E,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,iBAAiB,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IAEO,MAAM,CAAC,gCAAgC,CAAC,SAAiD;QAC7F,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,GAAG,SAAS,CAAC;QAE7F,IAAI,SAAS,CAAC,YAAY,CAAC,KAAK,kCAAiB,CAAC,KAAK,EAAE,CAAC;YACtD,QAAQ,mBAAmB,EAAE,CAAC;gBAC1B,KAAK,mDAA8B,CAAC,iBAAiB;oBACjD,OAAO,IAAI,CAAC;gBAChB,KAAK,mDAA8B,CAAC,mBAAmB,CAAC;gBACxD,KAAK,mDAA8B,CAAC,aAAa,CAAC;gBAClD;oBACI,OAAO,KAAK,CAAC;YACrB,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,OAAO,0BAA0B,KAAK,SAAS;gBAClD,CAAC,CAAC,0BAA0B;gBAC5B,CAAC,CAAC,qBAAqB,KAAK,iDAA4B,CAAC,iBAAiB,CAAC;QACnF,CAAC;IACL,CAAC;;;AAvGD;;GAEG;AACY,0CAAqB,GAAG,CAAC,CAAgB,EAAE,iBAAyB,EAAE,IAAa,EAAuB,EAAE;IACvH,IAAI,QAAQ,GAAG,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAE7G,MAAM,gBAAgB,GAAmB;QACrC,mBAAmB;QACnB,SAAS,EAAE,yBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,qBAAqB,EAAE,iBAAiB,CAAC;QACvF,yBAAyB;QACzB,SAAS,EAAE,yBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;KACrF,CAAC;IACF,MAAM,kBAAkB,GAAmB;QACvC,mBAAmB;QACnB,SAAS,EAAE,yBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,uBAAuB,EAAE,iBAAiB,CAAC;QACzF,yBAAyB;QACzB,SAAS,EAAE,yBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;QACpF,0DAA0D;QAC1D,OAAO,EAAE,EAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,uBAAuB,CAAC;KACrE,CAAC;IAEF,gBAAgB;IAChB,IAAI,GAAI,IAAsB,IAAI,iBAAa,CAAC,UAAU,CAAC;IAC3D,+EAA+E;IAC/E,IAAI,CAAC,IAAI,KAAK,iBAAa,CAAC,UAAU,IAAI,IAAI,KAAK,iBAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACjH,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC;QAClC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC;IACtC,CAAC;IAED,4EAA4E;IAC5E,IAAI,CAAC,IAAI,KAAK,iBAAa,CAAC,QAAQ,IAAI,IAAI,KAAK,iBAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,iBAAiB,EAAE,CAAC;QAC/G,kBAAkB,CAAC,SAAS,GAAG,IAAI,CAAC;QACpC,kBAAkB,CAAC,SAAS,GAAG,IAAI,CAAC;IACxC,CAAC;IAED,OAAO;QACH,iBAAiB,EAAE,gBAAgB;QACnC,KAAK,EAAE;YACH,YAAY,EAAE,CAAC,CAAC,kBAAkB;YAClC,OAAO,EAAE,CAAC,CAAC,aAAa,EAAE,kCAAkC;YAC5D,OAAO,EAAE,CAAC,CAAC,aAAa,EAAE,kCAAkC;SAC/D;QACD,mBAAmB,EAAE,kBAAkB;QACvC,SAAS,EAAE;YACP,EAAE,EAAE,CAAC,CAAC,iCAAiC,CAAC;YACxC,IAAI,EAAE,CAAC,CAAC,mCAAmC,CAAC;SAC/C;QACD,KAAK,EAAE;YACH,UAAU,EAAE,CAAC,CAAC,gBAAgB;YAC9B,IAAI,EAAE,CAAC,CAAC,UAAU;YAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ,KAAK,GAAG;YAC5B,WAAW,EAAE,CAAC,CAAC,WAAW,KAAK,GAAG;YAClC,uBAAuB,EAAE,CAAC,CAAC,uBAAuB,KAAK,GAAG;SAC7D;QACD,IAAI,EAAE;YACF,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,aAAa,EAAE,6BAAoB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,6BAA6B,CAAC,CAAC;SACzF;QACD,IAAI,EAAE;YACF,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,QAAQ,EAAE,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,aAAa;YAC5C,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,KAAK;YACnC,wBAAwB,EAAE,EAAoB,CAAC,gCAAgC,CAAC,CAAC,CAAC;YAClF,kBAAkB,EAAE,CAAC,CAAC,4CAA4C,CAAC,IAAI,IAAI;YAC3E,UAAU,EAAE,CAAC,CAAC,eAAe,IAAI,IAAI;SACxC;KACJ,CAAC;AACN,CAAC,AAlEmC,CAkElC;kBAhFe,oBAAoB"}
|
package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js
CHANGED
|
@@ -8,11 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.TransferDepartureCacheTransformation = void 0;
|
|
10
10
|
const RouteTypeEnums_1 = require("../../../../helpers/RouteTypeEnums");
|
|
11
|
-
const DepartureCalculator_1 = require("../../../shared/DepartureCalculator");
|
|
12
11
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
13
12
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
14
13
|
const HeadsignFormatter_1 = require("../helpers/HeadsignFormatter");
|
|
15
|
-
const
|
|
14
|
+
const shared_1 = require("../../../shared");
|
|
16
15
|
let TransferDepartureCacheTransformation = class TransferDepartureCacheTransformation extends AbstractTransformation_1.AbstractTransformation {
|
|
17
16
|
constructor() {
|
|
18
17
|
super(...arguments);
|
|
@@ -52,7 +51,7 @@ let TransferDepartureCacheTransformation = class TransferDepartureCacheTransform
|
|
|
52
51
|
type: departure.route_type,
|
|
53
52
|
},
|
|
54
53
|
stop: {
|
|
55
|
-
platform_code:
|
|
54
|
+
platform_code: shared_1.PlatformCodeResolver.fromStopTimeCisShort(data.departure, data.stopTime),
|
|
56
55
|
},
|
|
57
56
|
trip: {
|
|
58
57
|
headsign: HeadsignFormatter_1.HeadsignFormatter.format(departure.trip_headsign),
|
|
@@ -65,7 +64,7 @@ let TransferDepartureCacheTransformation = class TransferDepartureCacheTransform
|
|
|
65
64
|
};
|
|
66
65
|
}
|
|
67
66
|
calculateDepartureMinutes(departureTime) {
|
|
68
|
-
const departure_minutes =
|
|
67
|
+
const departure_minutes = shared_1.DepartureCalculator.getDepartureMinutes(departureTime);
|
|
69
68
|
if (departure_minutes < 1 && departure_minutes >= 0) {
|
|
70
69
|
return "<1";
|
|
71
70
|
}
|
package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransferDepartureCacheTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uEAA4D;AAE5D,
|
|
1
|
+
{"version":3,"file":"TransferDepartureCacheTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uEAA4D;AAE5D,6GAA0G;AAC1G,iEAAgE;AAChE,oEAAiE;AACjE,4CAAuE;AAGhE,IAAM,oCAAoC,GAA1C,MAAM,oCAAqC,SAAQ,+CAGzD;IAHM;;QAII,SAAI,GAAG,sCAAsC,CAAC;QAE9C,mBAAc,GAAG,CAAC,IAA8B,EAAmC,EAAE;YACxF,MAAM,UAAU,GAA+C,IAAI,GAAG,EAAE,CAAC;YACzE,MAAM,GAAG,GAAoC,EAAE,CAAC;YAEhD,KAAK,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;gBACnD,IAAI,SAAS,CAAC,UAAU,KAAK,kCAAiB,CAAC,KAAK,EAAE,CAAC;oBACnD,MAAM,wBAAwB,GAAG,GAAG,SAAS,CAAC,gBAAgB,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;oBACtF,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;oBACrD,IAAI,GAAG,EAAE,CAAC;wBACN,IAAI,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;4BAC9C,SAAS;wBACb,CAAC;wBACD,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAChC,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,sBAA8B,CAAC,CAC3E,CAAC;wBACF,UAAU,CAAC,GAAG,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;oBAClD,CAAC;yBAAM,CAAC;wBACJ,UAAU,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;oBACxG,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACxE,CAAC;YACL,CAAC;YAED,OAAO,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;QACxD,CAAC,CAAC;QAEQ,sBAAiB,GAAG,CAAC,IAA4B,EAAE,EAAE;YAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;YAC3B,OAAO;gBACH,mBAAmB,EAAE;oBACjB,OAAO,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,sBAA8B,CAAC,CAAC;iBACtF;gBACD,KAAK,EAAE;oBACH,UAAU,EAAE,SAAS,CAAC,gBAAgB;oBACtC,IAAI,EAAE,SAAS,CAAC,UAAU;iBAC7B;gBACD,IAAI,EAAE;oBACF,aAAa,EAAE,6BAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC;iBAC1F;gBACD,IAAI,EAAE;oBACF,QAAQ,EAAE,qCAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC;oBAC3D,EAAE,EAAE,SAAS,CAAC,OAAO;oBACrB,wBAAwB,EAAE,SAAS,CAAC,wBAAwB,IAAI,IAAI;iBACvE;gBACD,KAAK,EAAE,EAAE;gBACT,iBAAiB,EAAE,IAAI;aAC1B,CAAC;QACN,CAAC,CAAC;IAUN,CAAC;IARW,yBAAyB,CAAC,aAAmB;QACjD,MAAM,iBAAiB,GAAG,4BAAmB,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACjF,IAAI,iBAAiB,GAAG,CAAC,IAAI,iBAAiB,IAAI,CAAC,EAAE,CAAC;YAClD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,iBAAiB,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;CACJ,CAAA;AAhEY,oFAAoC;+CAApC,oCAAoC;IADhD,IAAA,qBAAU,GAAE;GACA,oCAAoC,CAgEhD"}
|
|
@@ -7,10 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.TransferDepartureTransformation = void 0;
|
|
10
|
-
const DepartureCalculator_1 = require("../../../shared/DepartureCalculator");
|
|
11
10
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
12
11
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
13
|
-
const
|
|
12
|
+
const shared_1 = require("../../../shared");
|
|
14
13
|
let TransferDepartureTransformation = class TransferDepartureTransformation extends AbstractTransformation_1.AbstractTransformation {
|
|
15
14
|
constructor() {
|
|
16
15
|
super(...arguments);
|
|
@@ -25,7 +24,7 @@ let TransferDepartureTransformation = class TransferDepartureTransformation exte
|
|
|
25
24
|
type: departure.route_type,
|
|
26
25
|
},
|
|
27
26
|
stop: {
|
|
28
|
-
platform_code:
|
|
27
|
+
platform_code: shared_1.PlatformCodeResolver.resolveDirect(departure, departure["trip.cis_stop_platform_code"]),
|
|
29
28
|
},
|
|
30
29
|
trip: {
|
|
31
30
|
headsign: departure.stop_headsign ?? departure.trip_headsign,
|
|
@@ -38,7 +37,7 @@ let TransferDepartureTransformation = class TransferDepartureTransformation exte
|
|
|
38
37
|
if (!predicted) {
|
|
39
38
|
return null;
|
|
40
39
|
}
|
|
41
|
-
const departure_minutes =
|
|
40
|
+
const departure_minutes = shared_1.DepartureCalculator.getDepartureMinutes(predicted);
|
|
42
41
|
if (departure_minutes < 1) {
|
|
43
42
|
return "<1";
|
|
44
43
|
}
|
package/dist/output-gateway/pid/service/transformations/TransferDepartureTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransferDepartureTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/TransferDepartureTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"TransferDepartureTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/TransferDepartureTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,6GAA0G;AAC1G,iEAAgE;AAChE,4CAAuE;AAGhE,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,+CAA8D;IAA5G;;QACI,SAAI,GAAG,iCAAiC,CAAC;QAEtC,sBAAiB,GAAG,CAAC,SAA6B,EAAE,EAAE;YAC5D,OAAO;gBACH,mBAAmB,EAAE;oBACjB,OAAO,EAAE,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,uBAAuB,CAAC;iBAC7E;gBACD,KAAK,EAAE;oBACH,UAAU,EAAE,SAAS,CAAC,gBAAgB;oBACtC,IAAI,EAAE,SAAS,CAAC,UAAU;iBAC7B;gBACD,IAAI,EAAE;oBACF,aAAa,EAAE,6BAAoB,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,6BAA6B,CAAC,CAAC;iBACzG;gBACD,IAAI,EAAE;oBACF,QAAQ,EAAE,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,aAAa;oBAC5D,EAAE,EAAE,SAAS,CAAC,OAAO;iBACxB;aACJ,CAAC;QACN,CAAC,CAAC;IAcN,CAAC;IAZW,yBAAyB,CAAC,SAAsB;QACpD,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,iBAAiB,GAAG,4BAAmB,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC7E,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,iBAAiB,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;CACJ,CAAA;AAlCY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,qBAAU,GAAE;GACA,+BAA+B,CAkC3C"}
|
package/dist/output-gateway/public/service/transformations/PublicDepartureTransformation.d.ts
CHANGED
|
@@ -26,10 +26,4 @@ export declare class PublicDepartureTransformation extends AbstractTransformatio
|
|
|
26
26
|
};
|
|
27
27
|
vehicle: IPublicApiDepartureVehicle;
|
|
28
28
|
};
|
|
29
|
-
/**
|
|
30
|
-
* Determine platform code based on the following rules:
|
|
31
|
-
* if current stop time is known, use its RT CIS platform code (if available)
|
|
32
|
-
* otherwise use GTFS schedule platform code
|
|
33
|
-
*/
|
|
34
|
-
private determinePlatformCode;
|
|
35
29
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PublicDepartureTransformation = void 0;
|
|
4
4
|
const RouteTypeEnums_1 = require("../../../../helpers/RouteTypeEnums");
|
|
5
|
-
const
|
|
5
|
+
const shared_1 = require("../../../shared");
|
|
6
6
|
const RopidRouterUtils_1 = require("../../../shared/RopidRouterUtils");
|
|
7
7
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
8
8
|
const const_1 = require("../../../../const");
|
|
@@ -15,7 +15,7 @@ class PublicDepartureTransformation extends AbstractTransformation_1.AbstractTra
|
|
|
15
15
|
const delayInSeconds = vehiclePosition?.delay ?? null;
|
|
16
16
|
const departureTime = new Date(departure.departure_datetime);
|
|
17
17
|
const arrivalTime = departure.arrival_datetime ? new Date(departure.arrival_datetime) : null;
|
|
18
|
-
const predictedDepartureTime =
|
|
18
|
+
const predictedDepartureTime = shared_1.DepartureCalculator.getPredictedDepartureTime(departureTime, arrivalTime, delayInSeconds);
|
|
19
19
|
let vehicle;
|
|
20
20
|
if (vehiclePosition?.state_position === const_1.StatePositionEnum.CANCELED || !vehiclePosition) {
|
|
21
21
|
vehicle = {
|
|
@@ -38,12 +38,12 @@ class PublicDepartureTransformation extends AbstractTransformation_1.AbstractTra
|
|
|
38
38
|
timestamp_scheduled: RopidRouterUtils_1.RopidRouterUtils.formatTimestamp(departureTime) ?? departure.departure_datetime,
|
|
39
39
|
timestamp_predicted: RopidRouterUtils_1.RopidRouterUtils.formatTimestamp(predictedDepartureTime) ?? departure.departure_datetime,
|
|
40
40
|
delay_seconds: delayInSeconds,
|
|
41
|
-
minutes:
|
|
41
|
+
minutes: shared_1.DepartureCalculator.getDepartureMinutes(predictedDepartureTime),
|
|
42
42
|
},
|
|
43
43
|
stop: {
|
|
44
44
|
id: departure.stop_id,
|
|
45
45
|
sequence: departure.stop_sequence,
|
|
46
|
-
platform_code:
|
|
46
|
+
platform_code: shared_1.PlatformCodeResolver.fromStopTimeCisShort(departure, inputDto.stopTime),
|
|
47
47
|
},
|
|
48
48
|
route: {
|
|
49
49
|
type: RouteTypeEnums_1.GTFSRouteTypeEnum[departure.route_type].toLowerCase(),
|
|
@@ -57,18 +57,6 @@ class PublicDepartureTransformation extends AbstractTransformation_1.AbstractTra
|
|
|
57
57
|
vehicle,
|
|
58
58
|
};
|
|
59
59
|
};
|
|
60
|
-
/**
|
|
61
|
-
* Determine platform code based on the following rules:
|
|
62
|
-
* if current stop time is known, use its RT CIS platform code (if available)
|
|
63
|
-
* otherwise use GTFS schedule platform code
|
|
64
|
-
*/
|
|
65
|
-
this.determinePlatformCode = (inputDto) => {
|
|
66
|
-
const { departure, stopTime } = inputDto;
|
|
67
|
-
if (stopTime) {
|
|
68
|
-
return stopTime.cis_stop_platform_code;
|
|
69
|
-
}
|
|
70
|
-
return departure.platform_code;
|
|
71
|
-
};
|
|
72
60
|
}
|
|
73
61
|
}
|
|
74
62
|
exports.PublicDepartureTransformation = PublicDepartureTransformation;
|
package/dist/output-gateway/public/service/transformations/PublicDepartureTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicDepartureTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/service/transformations/PublicDepartureTransformation.ts"],"names":[],"mappings":";;;AAAA,uEAA4D;AAG5D,
|
|
1
|
+
{"version":3,"file":"PublicDepartureTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/public/service/transformations/PublicDepartureTransformation.ts"],"names":[],"mappings":";;;AAAA,uEAA4D;AAG5D,4CAAuE;AACvE,uEAA+D;AAC/D,6GAA0G;AAC1G,6CAA8C;AAE9C,MAAa,6BAA8B,SAAQ,+CAGlD;IAHD;;QAIW,SAAI,GAAG,+BAA+B,CAAC;QAEpC,sBAAiB,GAAG,CAAC,QAA2C,EAAE,EAAE;YAC1E,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,QAAQ,CAAC;YAEnE,MAAM,cAAc,GAAG,eAAe,EAAE,KAAK,IAAI,IAAI,CAAC;YACtD,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7F,MAAM,sBAAsB,GAAG,4BAAmB,CAAC,yBAAyB,CAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YAEzH,IAAI,OAAmC,CAAC;YAExC,IAAI,eAAe,EAAE,cAAc,KAAK,yBAAiB,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrF,OAAO,GAAG;oBACN,EAAE,EAAE,IAAI;oBACR,wBAAwB,EAAE,IAAI;oBAC9B,kBAAkB,EAAE,IAAI;oBACxB,WAAW,EAAE,IAAI;iBACpB,CAAC;YACN,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG;oBACN,EAAE,EAAE,eAAe,CAAC,UAAU,IAAI,IAAI;oBACtC,wBAAwB,EAAE,eAAe,CAAC,aAAa,CAAC,wBAAwB,IAAI,IAAI;oBACxF,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,IAAI,IAAI;oBACjE,WAAW,EAAE,iBAAiB,EAAE,gBAAgB,IAAI,IAAI;iBAC3D,CAAC;YACN,CAAC;YAED,OAAO;gBACH,SAAS,EAAE;oBACP,mBAAmB,EAAE,mCAAgB,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,SAAS,CAAC,kBAAkB;oBACpG,mBAAmB,EAAE,mCAAgB,CAAC,eAAe,CAAC,sBAAsB,CAAC,IAAI,SAAS,CAAC,kBAAkB;oBAC7G,aAAa,EAAE,cAAc;oBAC7B,OAAO,EAAE,4BAAmB,CAAC,mBAAmB,CAAC,sBAAsB,CAAC;iBAC3E;gBACD,IAAI,EAAE;oBACF,EAAE,EAAE,SAAS,CAAC,OAAO;oBACrB,QAAQ,EAAE,SAAS,CAAC,aAAa;oBACjC,aAAa,EAAE,6BAAoB,CAAC,oBAAoB,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC;iBACzF;gBACD,KAAK,EAAE;oBACH,IAAI,EAAE,kCAAiB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE;oBAC3D,UAAU,EAAE,SAAS,CAAC,gBAAgB;iBACzC;gBACD,IAAI,EAAE;oBACF,EAAE,EAAE,SAAS,CAAC,OAAO;oBACrB,QAAQ,EAAE,SAAS,CAAC,aAAa;oBACjC,WAAW,EAAE,eAAe,EAAE,cAAc,KAAK,yBAAiB,CAAC,QAAQ;iBAC9E;gBACD,OAAO;aACV,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA;AAxDD,sEAwDC"}
|
|
@@ -2,9 +2,9 @@ export declare class DepartureCalculator {
|
|
|
2
2
|
/**
|
|
3
3
|
* Calculates the predicted departure time based on the scheduled departure time, arrival time and delay.
|
|
4
4
|
**/
|
|
5
|
-
static getPredictedDepartureTime
|
|
5
|
+
static getPredictedDepartureTime(departureTime: Date, arrivalTime: Date | null, delayInSeconds: number | null): Date;
|
|
6
6
|
/**
|
|
7
7
|
* Calculates the number of minutes until the predicted departure time.
|
|
8
8
|
**/
|
|
9
|
-
static getDepartureMinutes
|
|
9
|
+
static getDepartureMinutes(predictedDepartureTime: Date): number;
|
|
10
10
|
}
|
|
@@ -2,25 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DepartureCalculator = void 0;
|
|
4
4
|
class DepartureCalculator {
|
|
5
|
+
/**
|
|
6
|
+
* Calculates the predicted departure time based on the scheduled departure time, arrival time and delay.
|
|
7
|
+
**/
|
|
8
|
+
static getPredictedDepartureTime(departureTime, arrivalTime, delayInSeconds) {
|
|
9
|
+
let delayInSecondsWithDefault = delayInSeconds ?? 0;
|
|
10
|
+
let adjustedDepartureTime = new Date(departureTime.getTime() + delayInSecondsWithDefault * 1000);
|
|
11
|
+
if (arrivalTime !== null && delayInSecondsWithDefault > 0) {
|
|
12
|
+
const dwellInSeconds = (departureTime.getTime() - arrivalTime.getTime()) / 1000;
|
|
13
|
+
const minDwellInSeconds = Math.min(delayInSecondsWithDefault, dwellInSeconds);
|
|
14
|
+
adjustedDepartureTime.setTime(adjustedDepartureTime.getTime() - minDwellInSeconds * 1000);
|
|
15
|
+
}
|
|
16
|
+
return adjustedDepartureTime;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Calculates the number of minutes until the predicted departure time.
|
|
20
|
+
**/
|
|
21
|
+
static getDepartureMinutes(predictedDepartureTime) {
|
|
22
|
+
return Math.round((predictedDepartureTime.getTime() - new Date().getTime()) / (60 * 1000));
|
|
23
|
+
}
|
|
5
24
|
}
|
|
6
25
|
exports.DepartureCalculator = DepartureCalculator;
|
|
7
|
-
/**
|
|
8
|
-
* Calculates the predicted departure time based on the scheduled departure time, arrival time and delay.
|
|
9
|
-
**/
|
|
10
|
-
DepartureCalculator.getPredictedDepartureTime = (departureTime, arrivalTime, delayInSeconds) => {
|
|
11
|
-
let delayInSecondsWithDefault = delayInSeconds ?? 0;
|
|
12
|
-
let adjustedDepartureTime = new Date(departureTime.getTime() + delayInSecondsWithDefault * 1000);
|
|
13
|
-
if (arrivalTime && delayInSecondsWithDefault > 0) {
|
|
14
|
-
const dwellInSeconds = (departureTime.getTime() - arrivalTime.getTime()) / 1000;
|
|
15
|
-
const minDwellInSeconds = Math.min(delayInSecondsWithDefault, dwellInSeconds);
|
|
16
|
-
adjustedDepartureTime.setTime(adjustedDepartureTime.getTime() - minDwellInSeconds * 1000);
|
|
17
|
-
}
|
|
18
|
-
return adjustedDepartureTime;
|
|
19
|
-
};
|
|
20
|
-
/**
|
|
21
|
-
* Calculates the number of minutes until the predicted departure time.
|
|
22
|
-
**/
|
|
23
|
-
DepartureCalculator.getDepartureMinutes = (predictedDepartureTime) => {
|
|
24
|
-
return Math.round((predictedDepartureTime.getTime() - new Date().getTime()) / (60 * 1000));
|
|
25
|
-
};
|
|
26
26
|
//# sourceMappingURL=DepartureCalculator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureCalculator.js","sourceRoot":"","sources":["../../../src/output-gateway/shared/DepartureCalculator.ts"],"names":[],"mappings":";;;AAAA,MAAa,mBAAmB
|
|
1
|
+
{"version":3,"file":"DepartureCalculator.js","sourceRoot":"","sources":["../../../src/output-gateway/shared/DepartureCalculator.ts"],"names":[],"mappings":";;;AAAA,MAAa,mBAAmB;IAC5B;;QAEI;IACG,MAAM,CAAC,yBAAyB,CAAC,aAAmB,EAAE,WAAwB,EAAE,cAA6B;QAChH,IAAI,yBAAyB,GAAG,cAAc,IAAI,CAAC,CAAC;QACpD,IAAI,qBAAqB,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,yBAAyB,GAAG,IAAI,CAAC,CAAC;QAEjG,IAAI,WAAW,KAAK,IAAI,IAAI,yBAAyB,GAAG,CAAC,EAAE,CAAC;YACxD,MAAM,cAAc,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;YAChF,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;YAE9E,qBAAqB,CAAC,OAAO,CAAC,qBAAqB,CAAC,OAAO,EAAE,GAAG,iBAAiB,GAAG,IAAI,CAAC,CAAC;QAC9F,CAAC;QAED,OAAO,qBAAqB,CAAC;IACjC,CAAC;IAED;;QAEI;IACG,MAAM,CAAC,mBAAmB,CAAC,sBAA4B;QAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAC/F,CAAC;CACJ;AAxBD,kDAwBC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { GTFSRouteTypeEnum } from "../../helpers/RouteTypeEnums";
|
|
2
|
+
type MinimalDeparture = {
|
|
3
|
+
route_type: GTFSRouteTypeEnum;
|
|
4
|
+
platform_code: string | null;
|
|
5
|
+
};
|
|
6
|
+
type PossiblyStopTime = {
|
|
7
|
+
cis_stop_platform_code: string | null;
|
|
8
|
+
} | null;
|
|
9
|
+
export declare class PlatformCodeResolver {
|
|
10
|
+
private static shortPlatformRegex;
|
|
11
|
+
/**
|
|
12
|
+
* Platform code is determined by the following rules:
|
|
13
|
+
* - for trains, the last stop platform code is used (CIS) if available
|
|
14
|
+
* - otherwise, the departure platform code is used (GTFS)
|
|
15
|
+
* - for other route types, the departure platform code is used (GTFS)
|
|
16
|
+
* @param departure Must have `route_type` and `platform_code` properties
|
|
17
|
+
* @param cisStopPlatformCode For trains - this is where the `cis_stop_platform_code` goes
|
|
18
|
+
* @param makeItShort Applies parsing for trains to get shorter platform from 6J/26J => 6J
|
|
19
|
+
*/
|
|
20
|
+
static resolveDirect(departure: MinimalDeparture, cisStopPlatformCode: string | null, makeItShort?: boolean): string | null;
|
|
21
|
+
/**
|
|
22
|
+
* Determine platform code based on the following rules:
|
|
23
|
+
* if current stop time is known, use its RT CIS platform code (if available)
|
|
24
|
+
* otherwise use GTFS schedule platform code
|
|
25
|
+
*/
|
|
26
|
+
static fromStopTimeCisShort(departure: MinimalDeparture, stopTime: PossiblyStopTime): string | null;
|
|
27
|
+
private static shortTrainPlatform;
|
|
28
|
+
}
|
|
29
|
+
export {};
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PlatformCodeResolver = void 0;
|
|
4
|
+
const RouteTypeEnums_1 = require("../../helpers/RouteTypeEnums");
|
|
5
|
+
class PlatformCodeResolver {
|
|
6
|
+
/**
|
|
7
|
+
* Platform code is determined by the following rules:
|
|
8
|
+
* - for trains, the last stop platform code is used (CIS) if available
|
|
9
|
+
* - otherwise, the departure platform code is used (GTFS)
|
|
10
|
+
* - for other route types, the departure platform code is used (GTFS)
|
|
11
|
+
* @param departure Must have `route_type` and `platform_code` properties
|
|
12
|
+
* @param cisStopPlatformCode For trains - this is where the `cis_stop_platform_code` goes
|
|
13
|
+
* @param makeItShort Applies parsing for trains to get shorter platform from 6J/26J => 6J
|
|
14
|
+
*/
|
|
15
|
+
static resolveDirect(departure, cisStopPlatformCode, makeItShort = false) {
|
|
16
|
+
const { route_type, platform_code } = departure;
|
|
17
|
+
if (route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN && cisStopPlatformCode != null) {
|
|
18
|
+
return makeItShort ? this.shortTrainPlatform(cisStopPlatformCode) : cisStopPlatformCode;
|
|
19
|
+
}
|
|
20
|
+
return platform_code;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Determine platform code based on the following rules:
|
|
24
|
+
* if current stop time is known, use its RT CIS platform code (if available)
|
|
25
|
+
* otherwise use GTFS schedule platform code
|
|
26
|
+
*/
|
|
27
|
+
static fromStopTimeCisShort(departure, stopTime) {
|
|
28
|
+
return PlatformCodeResolver.resolveDirect(departure, stopTime?.cis_stop_platform_code ?? null, true);
|
|
29
|
+
}
|
|
30
|
+
static shortTrainPlatform(platformCode) {
|
|
31
|
+
return (platformCode.match(PlatformCodeResolver.shortPlatformRegex) ?? [platformCode])[0];
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
exports.PlatformCodeResolver = PlatformCodeResolver;
|
|
35
|
+
PlatformCodeResolver.shortPlatformRegex = /[^/-]+/g;
|
|
36
|
+
//# sourceMappingURL=PlatformCodeResolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PlatformCodeResolver.js","sourceRoot":"","sources":["../../../src/output-gateway/shared/PlatformCodeResolver.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAU5D,MAAa,oBAAoB;IAG7B;;;;;;;;OAQG;IACI,MAAM,CAAC,aAAa,CACvB,SAA2B,EAC3B,mBAAkC,EAClC,cAAuB,KAAK;QAE5B,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;QAChD,IAAI,UAAU,KAAK,kCAAiB,CAAC,KAAK,IAAI,mBAAmB,IAAI,IAAI,EAAE,CAAC;YACxE,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC;QAC5F,CAAC;QAED,OAAO,aAAa,CAAC;IACzB,CAAC;IACD;;;;OAIG;IACI,MAAM,CAAC,oBAAoB,CAAC,SAA2B,EAAE,QAA0B;QACtF,OAAO,oBAAoB,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,sBAAsB,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC;IACzG,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAAC,YAAoB;QAClD,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;;AAnCL,oDAoCC;AAnCkB,uCAAkB,GAAG,SAAS,CAAC"}
|
|
@@ -15,4 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./RopidRouterUtils"), exports);
|
|
18
|
+
__exportStar(require("./PlatformCodeResolver"), exports);
|
|
19
|
+
__exportStar(require("./DepartureCalculator"), exports);
|
|
18
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,wDAAsC"}
|
package/package.json
CHANGED
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { ITransferDeparture, IDepartureWithPosition } from "../..";
|
|
2
|
-
export declare class PlatformCodeResolver {
|
|
3
|
-
/**
|
|
4
|
-
* Platform code is determined by the following rules:
|
|
5
|
-
* - for trains, the last stop platform code is used (CIS) if available
|
|
6
|
-
* - otherwise, the departure platform code is used (GTFS)
|
|
7
|
-
* - for other route types, the departure platform code is used (GTFS)
|
|
8
|
-
*/
|
|
9
|
-
static resolve(departure: ITransferDeparture): string | null;
|
|
10
|
-
/**
|
|
11
|
-
* Determine platform code based on the following rules:
|
|
12
|
-
* if current stop time is known, use its RT CIS platform code (if available)
|
|
13
|
-
* otherwise use GTFS schedule platform code
|
|
14
|
-
*/
|
|
15
|
-
static determinePlatformCode(inputDto: IDepartureWithPosition): string | null;
|
|
16
|
-
}
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PlatformCodeResolver = void 0;
|
|
4
|
-
const RouteTypeEnums_1 = require("../../../../helpers/RouteTypeEnums");
|
|
5
|
-
class PlatformCodeResolver {
|
|
6
|
-
/**
|
|
7
|
-
* Platform code is determined by the following rules:
|
|
8
|
-
* - for trains, the last stop platform code is used (CIS) if available
|
|
9
|
-
* - otherwise, the departure platform code is used (GTFS)
|
|
10
|
-
* - for other route types, the departure platform code is used (GTFS)
|
|
11
|
-
*/
|
|
12
|
-
static resolve(departure) {
|
|
13
|
-
if (departure.route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN && departure["trip.cis_stop_platform_code"] !== null) {
|
|
14
|
-
return departure["trip.cis_stop_platform_code"];
|
|
15
|
-
}
|
|
16
|
-
return departure.platform_code;
|
|
17
|
-
}
|
|
18
|
-
/**
|
|
19
|
-
* Determine platform code based on the following rules:
|
|
20
|
-
* if current stop time is known, use its RT CIS platform code (if available)
|
|
21
|
-
* otherwise use GTFS schedule platform code
|
|
22
|
-
*/
|
|
23
|
-
static determinePlatformCode(inputDto) {
|
|
24
|
-
const { departure, stopTime } = inputDto;
|
|
25
|
-
return stopTime?.cis_stop_platform_code || departure.platform_code;
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
exports.PlatformCodeResolver = PlatformCodeResolver;
|
|
29
|
-
//# sourceMappingURL=PlatformCodeResolver.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"PlatformCodeResolver.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/helpers/PlatformCodeResolver.ts"],"names":[],"mappings":";;;AAAA,uEAA4D;AAG5D,MAAa,oBAAoB;IAC7B;;;;;OAKG;IACI,MAAM,CAAC,OAAO,CAAC,SAA6B;QAC/C,IAAI,SAAS,CAAC,UAAU,KAAK,kCAAiB,CAAC,KAAK,IAAI,SAAS,CAAC,6BAA6B,CAAC,KAAK,IAAI,EAAE,CAAC;YACxG,OAAO,SAAS,CAAC,6BAA6B,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,SAAS,CAAC,aAAa,CAAC;IACnC,CAAC;IACD;;;;OAIG;IACI,MAAM,CAAC,qBAAqB,CAAC,QAAgC;QAChE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;QAEzC,OAAO,QAAQ,EAAE,sBAAsB,IAAI,SAAS,CAAC,aAAa,CAAC;IACvE,CAAC;CACJ;AAxBD,oDAwBC"}
|