@golemio/pid 5.17.3-dev.2717798752 → 5.17.3-dev.2733359238
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 -1
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/helpers/MpvnetXmlErrorHandler.d.ts +2 -0
- package/dist/output-gateway/pid/helpers/MpvnetXmlErrorHandler.js +31 -0
- package/dist/output-gateway/pid/helpers/MpvnetXmlErrorHandler.js.map +1 -0
- package/dist/output-gateway/pid/helpers/MpvnetXmlSerializer.d.ts +2 -0
- package/dist/output-gateway/pid/helpers/MpvnetXmlSerializer.js +16 -2
- package/dist/output-gateway/pid/helpers/MpvnetXmlSerializer.js.map +1 -1
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.d.ts +3 -1
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js +20 -13
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js.map +1 -1
- package/dist/output-gateway/pid/routers/v2/V2PIDRouter.js +2 -0
- package/dist/output-gateway/pid/routers/v2/V2PIDRouter.js.map +1 -1
- package/docs/implementation_documentation.md +12 -0
- package/docs/openapi-output.yaml +33 -1
- package/docs/processing/transferboards_filtering.md +10 -5
- package/package.json +1 -1
|
@@ -115,7 +115,7 @@ let V4TransferBoardsController = V4TransferBoardsController_1 = class V4Transfer
|
|
|
115
115
|
// compute accessibility for available transfers
|
|
116
116
|
this.enhanceInPlaceWithTimeAndInfo(transferCacheDto, stopsInfo);
|
|
117
117
|
const guaranteedTransferTripIds = new Set(TransferBoardFilter_1.TransferBoardFilter.havingConnectionFromTripId(transferCacheDto.currentTripId, transferCacheDto.transfers, transferCacheDto.delayedTimeFrom).flatMap((t) => t.departure.trip_id));
|
|
118
|
-
transferCacheDto.transfers = TransferBoardFilter_1.TransferBoardFilter.minimalTransferTime(transferCacheDto.transfers, transferCacheDto.delayedTimeFrom, guaranteedTransferTripIds);
|
|
118
|
+
transferCacheDto.transfers = TransferBoardFilter_1.TransferBoardFilter.minimalTransferTime(transferCacheDto.transfers, transferCacheDto.delayedTimeFrom, guaranteedTransferTripIds, transferCacheDto.currentStop?.platform_code ?? null);
|
|
119
119
|
transferCacheDto.transfers = TransferBoardFilter_1.TransferBoardFilter.sameStopNameTransfer(transferCacheDto.transfers, transferStop.stop_id, sameNameStopIds, guaranteedTransferTripIds, false);
|
|
120
120
|
const tripIdsToFilter = new Set(TransferBoardFilter_1.TransferBoardFilter.filterOutKeepAlwaysTransfer(transferCacheDto.transfers).map((transfer) => transfer.departure.trip_id));
|
|
121
121
|
for (const guaranteedTripId of guaranteedTransferTripIds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V4TransferBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v4/V4TransferBoardsController.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"V4TransferBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v4/V4TransferBoardsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.mpvnetXmlErrorHandler = mpvnetXmlErrorHandler;
|
|
4
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
5
|
+
const Logger_1 = require("@golemio/core/dist/output-gateway/Logger");
|
|
6
|
+
const MpvnetXmlSerializer_1 = require("./MpvnetXmlSerializer");
|
|
7
|
+
const isOperational = (err) => {
|
|
8
|
+
return ((err instanceof golemio_errors_1.AbstractGolemioError && !(err instanceof golemio_errors_1.FatalError || err instanceof golemio_errors_1.CustomError)) ||
|
|
9
|
+
(err instanceof golemio_errors_1.CustomError && err.isOperational === true));
|
|
10
|
+
};
|
|
11
|
+
function mpvnetXmlErrorHandler(err, _req, res, next) {
|
|
12
|
+
if (res.headersSent) {
|
|
13
|
+
next(err);
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
let message;
|
|
17
|
+
let status;
|
|
18
|
+
if (isOperational(err)) {
|
|
19
|
+
const errStatus = err.status;
|
|
20
|
+
const errObject = golemio_errors_1.HTTPErrorHandler.handle(err, Logger_1.log, errStatus && errStatus < 500 ? "warn" : "error");
|
|
21
|
+
message = errObject.error_message;
|
|
22
|
+
status = errObject.error_status || 500;
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
Logger_1.log.error(err);
|
|
26
|
+
message = "Internal Server Error";
|
|
27
|
+
status = 500;
|
|
28
|
+
}
|
|
29
|
+
res.set("Content-Type", "text/xml; charset=utf-8").status(status).send(MpvnetXmlSerializer_1.MpvnetXmlSerializer.serializeError(message));
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=MpvnetXmlErrorHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MpvnetXmlErrorHandler.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/MpvnetXmlErrorHandler.ts"],"names":[],"mappings":";;AAYA,sDAqBC;AAhCD,6EAA2H;AAC3H,qEAA+D;AAC/D,+DAA0E;AAE1E,MAAM,aAAa,GAAG,CAAC,GAAY,EAAW,EAAE;IAC5C,OAAO,CACH,CAAC,GAAG,YAAY,qCAAoB,IAAI,CAAC,CAAC,GAAG,YAAY,2BAAU,IAAI,GAAG,YAAY,4BAAW,CAAC,CAAC;QACnG,CAAC,GAAG,YAAY,4BAAW,IAAI,GAAG,CAAC,aAAa,KAAK,IAAI,CAAC,CAC7D,CAAC;AACN,CAAC,CAAC;AAEF,SAAgB,qBAAqB,CAAC,GAAY,EAAE,IAAa,EAAE,GAAa,EAAE,IAAkB;IAChG,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO;IACX,CAAC;IAED,IAAI,OAAe,CAAC;IACpB,IAAI,MAAc,CAAC;IAEnB,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,SAAS,GAAI,GAA4B,CAAC,MAAM,CAAC;QACvD,MAAM,SAAS,GAAG,iCAAgB,CAAC,MAAM,CAAC,GAAY,EAAE,YAAG,EAAE,SAAS,IAAI,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9G,OAAO,GAAG,SAAS,CAAC,aAAa,CAAC;QAClC,MAAM,GAAG,SAAS,CAAC,YAAY,IAAI,GAAG,CAAC;IAC3C,CAAC;SAAM,CAAC;QACJ,YAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,OAAO,GAAG,uBAAuB,CAAC;QAClC,MAAM,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,yCAAmB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;AACxH,CAAC"}
|
|
@@ -2,6 +2,8 @@ import { DepartureBoardsResponseDTO } from "../dto/DepartureBoardsDTO";
|
|
|
2
2
|
export declare class MpvnetXmlSerializer {
|
|
3
3
|
private static readonly builder;
|
|
4
4
|
static serialize(dto: DepartureBoardsResponseDTO): string;
|
|
5
|
+
static serializeError(message: string): string;
|
|
6
|
+
private static buildTblAttributes;
|
|
5
7
|
private static buildStopNode;
|
|
6
8
|
private static buildDeparture;
|
|
7
9
|
private static buildInfotext;
|
|
@@ -25,13 +25,27 @@ class MpvnetXmlSerializer {
|
|
|
25
25
|
static serialize(dto) {
|
|
26
26
|
const tree = {
|
|
27
27
|
TBL: {
|
|
28
|
-
|
|
29
|
-
"@_text": "Odjezdy poskytuje Golemio",
|
|
28
|
+
...MpvnetXmlSerializer.buildTblAttributes(),
|
|
30
29
|
t: MpvnetXmlSerializer.buildStopNode(dto),
|
|
31
30
|
},
|
|
32
31
|
};
|
|
33
32
|
return MpvnetXmlSerializer.builder.build(tree);
|
|
34
33
|
}
|
|
34
|
+
static serializeError(message) {
|
|
35
|
+
const tree = {
|
|
36
|
+
TBL: {
|
|
37
|
+
...MpvnetXmlSerializer.buildTblAttributes(),
|
|
38
|
+
t: { "@_id": "0", "@_stan": "", "@_err": message },
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
return MpvnetXmlSerializer.builder.build(tree);
|
|
42
|
+
}
|
|
43
|
+
static buildTblAttributes() {
|
|
44
|
+
return {
|
|
45
|
+
"@_cas": MpvnetXmlSerializer.formatTblCas(new Date()),
|
|
46
|
+
"@_text": "Odjezdy poskytuje Golemio",
|
|
47
|
+
};
|
|
48
|
+
}
|
|
35
49
|
static buildStopNode(dto) {
|
|
36
50
|
const rawZast = dto.stops[0]?.stop_name ?? "";
|
|
37
51
|
const node = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MpvnetXmlSerializer.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/MpvnetXmlSerializer.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAiE;AACjE,gGAA+D;AAK/D,+EAA6E;AAC7E,4EAA8E;AAC9E,2EAA+D;AAE/D,MAAM,eAAe,GAAG,eAAe,CAAC;AACxC,MAAM,aAAa,GAAG,IAAI,CAAC;AAC3B,MAAM,WAAW,GAAG,IAAI,CAAC;AACzB,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AAC/C,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"MpvnetXmlSerializer.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/MpvnetXmlSerializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ export declare class TransferBoardFilter {
|
|
|
9
9
|
private static shouldKeepTransferAlways;
|
|
10
10
|
static filterOutKeepAlwaysTransfer(transfers: IDepartureWithPosition[]): IDepartureWithPosition[];
|
|
11
11
|
static keepAlwaysLinesAndTripIds(transfers: IDepartureWithPosition[], tripIdsToKeep: Set<string>): IDepartureWithPosition[];
|
|
12
|
-
static minimalTransferTime(transfers: IDepartureWithPosition[], delayedTimeFrom: Date, keepTripIds: Set<string
|
|
12
|
+
static minimalTransferTime(transfers: IDepartureWithPosition[], delayedTimeFrom: Date, keepTripIds: Set<string>, currentStopPlatformCode: string | null): IDepartureWithPosition[];
|
|
13
|
+
private static minimalTransferTimeMs;
|
|
14
|
+
private static platformDiffers;
|
|
13
15
|
static sameStopNameTransfer(transfers: Array<IDepartureWithPosition | {
|
|
14
16
|
departure: IPublicGtfsDepartureCacheDto;
|
|
15
17
|
}>, currentStopId: string, allowedStopIds: string[], keepTripIds: Set<string> | null, keepDeparturesWithConnections: boolean): Array<IDepartureWithPosition | {
|
|
@@ -3,17 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TransferBoardFilter = void 0;
|
|
4
4
|
const GtfsStopParser_1 = require("../../../helpers/GtfsStopParser");
|
|
5
5
|
const RouteTypeEnums_1 = require("../../../helpers/RouteTypeEnums");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
[RouteTypeEnums_1.GTFSRouteTypeEnum.EXT_MISCELLANEOUS, 60_000],
|
|
10
|
-
[RouteTypeEnums_1.GTFSRouteTypeEnum.FERRY, 120_000],
|
|
11
|
-
[RouteTypeEnums_1.GTFSRouteTypeEnum.FUNICULAR, 120_000],
|
|
12
|
-
[RouteTypeEnums_1.GTFSRouteTypeEnum.METRO, 120_000],
|
|
13
|
-
[RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN, 120_000],
|
|
14
|
-
[RouteTypeEnums_1.GTFSRouteTypeEnum.TRAM, 60_000],
|
|
15
|
-
[RouteTypeEnums_1.GTFSRouteTypeEnum.TROLLEYBUS, 60_000],
|
|
16
|
-
]);
|
|
6
|
+
const TRAIN_TRANSFER_TIME_MS = 120 * 1000;
|
|
7
|
+
const METRO_TRANSFER_TIME_MS = 60 * 1000;
|
|
8
|
+
const PLATFORM_MISMATCH_TRANSFER_TIME_MS = 60 * 1000;
|
|
17
9
|
const DIFFERENT_STOP_NAME_ALLOWED = new Map([
|
|
18
10
|
[RouteTypeEnums_1.GTFSRouteTypeEnum.BUS, false],
|
|
19
11
|
[RouteTypeEnums_1.GTFSRouteTypeEnum.EXT_MISCELLANEOUS, true],
|
|
@@ -78,19 +70,34 @@ class TransferBoardFilter {
|
|
|
78
70
|
return TransferBoardFilter.shouldKeepTransferAlways(t) || tripIdsToKeep.has(t.departure.trip_id);
|
|
79
71
|
});
|
|
80
72
|
}
|
|
81
|
-
static minimalTransferTime(transfers, delayedTimeFrom, keepTripIds) {
|
|
73
|
+
static minimalTransferTime(transfers, delayedTimeFrom, keepTripIds, currentStopPlatformCode) {
|
|
82
74
|
const arrivalTime = delayedTimeFrom.getTime();
|
|
83
75
|
return transfers.filter((t) => {
|
|
84
76
|
if (keepTripIds.has(t.departure.trip_id)) {
|
|
85
77
|
return true;
|
|
86
78
|
}
|
|
87
|
-
const transferTimeMs = TRANSFER_TIMES_MS.get(t.departure.route_type) || DEFAULT_TRANSFER_TIME_MS;
|
|
88
79
|
if (t.departure.predictedDepartureTimestamp == null) {
|
|
89
80
|
return false;
|
|
90
81
|
}
|
|
82
|
+
const transferTimeMs = TransferBoardFilter.minimalTransferTimeMs(t.departure, currentStopPlatformCode);
|
|
91
83
|
return arrivalTime + transferTimeMs < t.departure.predictedDepartureTimestamp;
|
|
92
84
|
});
|
|
93
85
|
}
|
|
86
|
+
static minimalTransferTimeMs(departure, currentStopPlatformCode) {
|
|
87
|
+
if (departure.route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN) {
|
|
88
|
+
return TRAIN_TRANSFER_TIME_MS;
|
|
89
|
+
}
|
|
90
|
+
if (departure.route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.METRO) {
|
|
91
|
+
return METRO_TRANSFER_TIME_MS;
|
|
92
|
+
}
|
|
93
|
+
if (TransferBoardFilter.platformDiffers(departure.platform_code, currentStopPlatformCode)) {
|
|
94
|
+
return PLATFORM_MISMATCH_TRANSFER_TIME_MS;
|
|
95
|
+
}
|
|
96
|
+
return 0;
|
|
97
|
+
}
|
|
98
|
+
static platformDiffers(a, b) {
|
|
99
|
+
return !a || !b || a !== b;
|
|
100
|
+
}
|
|
94
101
|
static sameStopNameTransfer(transfers, currentStopId, allowedStopIds, keepTripIds, keepDeparturesWithConnections) {
|
|
95
102
|
const allowedStopIdsAsws = new Set(allowedStopIds.map(GtfsStopParser_1.GtfsStopParser.normalizedStopId));
|
|
96
103
|
const currentStopAsw = GtfsStopParser_1.GtfsStopParser.normalizedStopId(currentStopId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransferBoardFilter.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/TransferBoardFilter.ts"],"names":[],"mappings":";;;AAAA,oEAAyD;AACzD,oEAA4D;AAK5D,MAAM,
|
|
1
|
+
{"version":3,"file":"TransferBoardFilter.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/TransferBoardFilter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.v2PidRouter = exports.V2PIDRouter = void 0;
|
|
4
4
|
const V2DepartureBoardsController_1 = require("../../controllers/v2/V2DepartureBoardsController");
|
|
5
|
+
const MpvnetXmlErrorHandler_1 = require("../../helpers/MpvnetXmlErrorHandler");
|
|
5
6
|
const ParamValidatorManager_1 = require("../../helpers/ParamValidatorManager");
|
|
6
7
|
const Di_1 = require("../../ioc/Di");
|
|
7
8
|
const OgPidToken_1 = require("../../ioc/OgPidToken");
|
|
@@ -67,6 +68,7 @@ class V2PIDRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
67
68
|
this.router.get("/departureboards/xml", validation, ...this.commonMiddleware("PIDDepartureBoardsXml"), Validation_1.checkErrors,
|
|
68
69
|
// max-age 5 seconds, stale-while-revalidate 5 seconds
|
|
69
70
|
this.cacheHeaderMiddleware.getMiddleware(5, 5), this.departureBoardsController.getDepartureBoardXml);
|
|
71
|
+
this.router.use("/departureboards/xml", MpvnetXmlErrorHandler_1.mpvnetXmlErrorHandler);
|
|
70
72
|
};
|
|
71
73
|
this.registerDepartureBoardsMinimalRoutes = () => {
|
|
72
74
|
this.router.get("/departureboards/minimal", [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2PIDRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/routers/v2/V2PIDRouter.ts"],"names":[],"mappings":";;;AAAA,kGAAiG;AAEjG,+EAA8E;AAC9E,qCAAgD;AAChD,qDAAoD;AACpD,yDAAsE;AACtE,sFAAmF;AAEnF,6EAAsG;AACtG,+DAA+F;AAC/F,+DAA2D;AAC3D,mFAA2E;AAC3E,6CAA8G;AAE9G,MAAa,WAAY,SAAQ,+BAAc;IAM3C;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QANlB,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAehC,eAAU,GAAG,GAAS,EAAE;YAC9B,IAAI,CAAC,6BAA6B,EAAE,CAAC;YACrC,IAAI,CAAC,oCAAoC,EAAE,CAAC;QAChD,CAAC,CAAC;QAEM,kCAA6B,GAAG,GAAG,EAAE;YACzC,MAAM,EACF,iBAAiB,EACjB,eAAe,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAC1D,GAAG,4BAAgB,CAAC;YACrB,MAAM,UAAU,GAAG;gBACf,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE;gBAC1B,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE;gBAC1B,IAAA,yBAAK,EAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;gBACvB,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;gBACzB,2DAA2D;gBAC3D,IAAA,yBAAK,EAAC,CAAC,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,IAAA,yBAAK,EAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC3G,yEAAyE;gBACzE,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,6CAAqB,CAAC,kBAAkB,EAAE,CAAC;gBAC7E,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,kBAAU,EAAE,GAAG,EAAE,kBAAU,EAAE,CAAC;gBACtE,IAAA,yBAAK,EAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;gBAClE,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;gBACpE,IAAA,yBAAK,EAAC,eAAe,CAAC;qBACjB,QAAQ,EAAE;qBACV,KAAK,CACF,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;oBAC3B,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,EAAE,EAAE,EAAE,iCAAyB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,sCAA8B,GAAG,CAAC,CAAC,EAAE,CAC7F;qBACA,GAAG,EAAE;qBACL,OAAO,EAAE;gBACd,IAAA,yBAAK,EAAC,cAAc,CAAC;qBAChB,QAAQ,EAAE;qBACV,KAAK,CAAC;oBACH,EAAE,EAAE,sCAA8B,GAAG,CAAC;oBACtC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,sCAA8B,GAAG,iCAAyB,GAAG,CAAC,CAAC;iBAC5E,CAAC;qBACD,GAAG,EAAE;qBACL,OAAO,EAAE;gBACd,IAAA,yBAAK,EAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAC7E,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC;gBAC5C,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACrD,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACvD,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;gBACnC,IAAA,yBAAK,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,6CAAqB,CAAC,oBAAoB,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAC7G,IAAA,yBAAK,EAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAClE,IAAA,yBAAK,EAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAC5D,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACjD,IAAA,yBAAK,EAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACpF,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;aACxD,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,kBAAkB,EAClB,UAAU,EACV,GAAG,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAC9C,wBAAW;YACX,sDAAsD;YACtD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,yBAAyB,CAAC,iBAAiB,CACnD,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,sBAAsB,EACtB,UAAU,EACV,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,EACjD,wBAAW;YACX,sDAAsD;YACtD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CACtD,CAAC;
|
|
1
|
+
{"version":3,"file":"V2PIDRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/routers/v2/V2PIDRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1568,6 +1568,12 @@ Worker má na starost stahování VYMI (JIS) událostí a infotextů, jejich tra
|
|
|
1568
1568
|
- zobrazované minuty u garantovaného přestupu jsou nastaveny na čas příjezdu aktuálního spoje (ne na plánovaný odjezd navazujícího spoje)
|
|
1569
1569
|
- garantované přestupy jsou vyjmuty z filtru opačného směru a filtru podskupiny linky – jsou přidány do `tripIdsToKeep` před spuštěním `findRelevantTripIdsFromLines`, takže projdou bez ohledu na zastávkovou sekvenci
|
|
1570
1570
|
- typy "vždy zobrazit" (metro, vlak, přívoz, lanovka) filtr `findRelevantTripIdsFromLines` zcela přeskakují
|
|
1571
|
+
- minimální přestupní čas (`TransferBoardFilter.minimalTransferTime`) — odjezdy s příliš malou rezervou mezi predikovaným příjezdem vozidla a predikovaným odjezdem navazujícího spoje jsou zahozeny; rezerva závisí na nástupišti (`minimalTransferTimeMs`, z `platform_code` aktuální zastávky a navazujícího odjezdu), platí první odpovídající pravidlo
|
|
1572
|
+
- **vlak**: 120 s vždy (bez ohledu na nástupiště)
|
|
1573
|
+
- **metro**: 60 s vždy (bez ohledu na nástupiště)
|
|
1574
|
+
- **ostatní typy** (autobus, tramvaj, trolejbus, přívoz, lanovka): 60 s při odjezdu z jiného nástupiště, 0 s ze stejného nástupiště
|
|
1575
|
+
- porovnání nástupišť (`platformDiffers`): nástupiště jsou různá, pokud je některý `platform_code` null/prázdný nebo se kódy neshodují (`!a || !b || a !== b`); chybějící nebo prázdný `platform_code` tak znamená rezervu 60 s, nikdy 0 s; vlak zůstává na 120 s i při chybějícím nástupišti
|
|
1576
|
+
- garantované přestupy jsou z tohoto filtru vyjmuty; odjezdy bez predikovaného času odjezdu jsou zahozeny
|
|
1571
1577
|
- dostupnost pro vozíčkáře (`is_wheelchair_accessible`)
|
|
1572
1578
|
- **metro**: určeno výhradně podle `wheelchair_boarding` zastávky (hodnota `1` = přístupná)
|
|
1573
1579
|
- **ostatní typy dopravy**: primárně z RT dat vozidla (`detailed_info.is_wheelchair_accessible`); pokud RT data nejsou k dispozici, použije se GTFS příznak `wheelchair_accessible` z `trips.txt` (`1` = přístupné vozidlo)
|
|
@@ -1612,6 +1618,12 @@ Worker má na starost stahování VYMI (JIS) událostí a infotextů, jejich tra
|
|
|
1612
1618
|
- zobrazované minuty u garantovaného přestupu jsou nastaveny na čas příjezdu aktuálního spoje (ne na plánovaný odjezd navazujícího spoje)
|
|
1613
1619
|
- garantované přestupy jsou vyjmuty z filtru opačného směru a filtru podskupiny linky – jsou přidány do `tripIdsToKeep` před spuštěním `findRelevantTripIdsFromLines`, takže projdou bez ohledu na zastávkovou sekvenci
|
|
1614
1620
|
- typy "vždy zobrazit" (metro, vlak, přívoz, lanovka) filtr `findRelevantTripIdsFromLines` zcela přeskakují
|
|
1621
|
+
- minimální přestupní čas (`TransferBoardFilter.minimalTransferTime`) — odjezdy s příliš malou rezervou mezi predikovaným příjezdem vozidla a predikovaným odjezdem navazujícího spoje jsou zahozeny; rezerva závisí na nástupišti (`minimalTransferTimeMs`, z `platform_code` aktuální zastávky a navazujícího odjezdu), platí první odpovídající pravidlo
|
|
1622
|
+
- **vlak**: 120 s vždy (bez ohledu na nástupiště)
|
|
1623
|
+
- **metro**: 60 s vždy (bez ohledu na nástupiště)
|
|
1624
|
+
- **ostatní typy** (autobus, tramvaj, trolejbus, přívoz, lanovka): 60 s při odjezdu z jiného nástupiště, 0 s ze stejného nástupiště
|
|
1625
|
+
- porovnání nástupišť (`platformDiffers`): nástupiště jsou různá, pokud je některý `platform_code` null/prázdný nebo se kódy neshodují (`!a || !b || a !== b`); chybějící nebo prázdný `platform_code` tak znamená rezervu 60 s, nikdy 0 s; vlak zůstává na 120 s i při chybějícím nástupišti
|
|
1626
|
+
- garantované přestupy jsou z tohoto filtru vyjmuty; odjezdy bez predikovaného času odjezdu jsou zahozeny
|
|
1615
1627
|
- dostupnost pro vozíčkáře (`is_wheelchair_accessible`)
|
|
1616
1628
|
- **metro**: určeno výhradně podle `wheelchair_boarding` zastávky (hodnota `1` = přístupná)
|
|
1617
1629
|
- **ostatní typy dopravy**: primárně z RT dat vozidla (`detailed_info.is_wheelchair_accessible`); pokud RT data nejsou k dispozici, použije se GTFS příznak `wheelchair_accessible` z `trips.txt` (`1` = přístupné vozidlo)
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -975,6 +975,10 @@ paths:
|
|
|
975
975
|
(`ids` / `cisIds` / `aswIds` / `names`, at least one required, max 100 stops).
|
|
976
976
|
|
|
977
977
|
See the example response below for the exact attribute set.
|
|
978
|
+
|
|
979
|
+
**Error responses on this endpoint are XML** (see the `400`, `404`, `413` and `500` responses
|
|
980
|
+
below), except for errors raised before the request reaches this endpoint's handler
|
|
981
|
+
(e.g. authentication failures) — those still return the standard JSON error envelope.
|
|
978
982
|
deprecated: true
|
|
979
983
|
tags:
|
|
980
984
|
- 🚏 PID Departure Boards (v2)
|
|
@@ -1047,11 +1051,39 @@ paths:
|
|
|
1047
1051
|
schema:
|
|
1048
1052
|
type: string
|
|
1049
1053
|
"400":
|
|
1050
|
-
|
|
1054
|
+
description: Bad request - invalid query parameters
|
|
1055
|
+
content:
|
|
1056
|
+
text/xml; charset=utf-8:
|
|
1057
|
+
schema:
|
|
1058
|
+
type: string
|
|
1059
|
+
example: |
|
|
1060
|
+
<TBL cas="2026-03-20T15:30:00" text="Odjezdy poskytuje Golemio"><t id="0" stan="" err="Bad request"/></TBL>
|
|
1051
1061
|
"401":
|
|
1052
1062
|
$ref: "#/components/responses/UnauthorizedError"
|
|
1053
1063
|
"404":
|
|
1054
1064
|
description: Not found
|
|
1065
|
+
content:
|
|
1066
|
+
text/xml; charset=utf-8:
|
|
1067
|
+
schema:
|
|
1068
|
+
type: string
|
|
1069
|
+
example: |
|
|
1070
|
+
<TBL cas="2026-03-20T15:30:00" text="Odjezdy poskytuje Golemio"><t id="0" stan="" err="Not Found"/></TBL>
|
|
1071
|
+
"413":
|
|
1072
|
+
description: Payload too large
|
|
1073
|
+
content:
|
|
1074
|
+
text/xml; charset=utf-8:
|
|
1075
|
+
schema:
|
|
1076
|
+
type: string
|
|
1077
|
+
example: |
|
|
1078
|
+
<TBL cas="2026-03-20T15:30:00" text="Odjezdy poskytuje Golemio"><t id="0" stan="" err="Payload Too Large. Try using ?limit parameter with lower number, if applicable."/></TBL>
|
|
1079
|
+
"500":
|
|
1080
|
+
description: Internal server error
|
|
1081
|
+
content:
|
|
1082
|
+
text/xml; charset=utf-8:
|
|
1083
|
+
schema:
|
|
1084
|
+
type: string
|
|
1085
|
+
example: |
|
|
1086
|
+
<TBL cas="2026-03-20T15:30:00" text="Odjezdy poskytuje Golemio"><t id="0" stan="" err="Internal Server Error"/></TBL>
|
|
1055
1087
|
|
|
1056
1088
|
/v2/pid/departureboards/minimal:
|
|
1057
1089
|
get:
|
|
@@ -162,14 +162,19 @@ The result is two sets: `guaranteedTripIds` and `guaranteedConnections`.
|
|
|
162
162
|
|
|
163
163
|
**Where:** `TransferBoardFilter.minimalTransferTime()`
|
|
164
164
|
|
|
165
|
-
Departures whose
|
|
165
|
+
Departures whose predicted departure is too close to the vehicle's arrival are dropped — not enough time to board. The required reserve is **platform-aware**, resolved per departure in `minimalTransferTimeMs` from the current stop's `platform_code` and the departure's `platform_code`. The first matching rule wins:
|
|
166
166
|
|
|
167
167
|
| Mode | Minimum gap |
|
|
168
168
|
|---|---|
|
|
169
|
-
|
|
|
170
|
-
| Metro
|
|
169
|
+
| Train | 120 s always (ignores platform) |
|
|
170
|
+
| Metro | 60 s always (ignores platform) |
|
|
171
|
+
| Everything else (bus, tram, trolleybus, ferry, funicular) | 60 s if the departure is on a different platform, 0 s if on the same platform |
|
|
171
172
|
|
|
172
|
-
**
|
|
173
|
+
**Platform comparison (`platformDiffers`):** two platforms count as different when either code is null/empty, or when the codes are not strictly equal (`!a || !b || a !== b`). So a missing or empty platform on either side means the 60 s reserve applies — never downgraded to 0 s. Train is unaffected: its rule is checked before the platform comparison, so it always keeps 120 s even with a missing platform.
|
|
174
|
+
|
|
175
|
+
**Guaranteed transfers are exempt** — the connection is guaranteed, so time is irrelevant. Departures with no predicted departure timestamp are dropped unless guaranteed.
|
|
176
|
+
|
|
177
|
+
The current stop's platform reaches this stage via `transferCacheDto.currentStop?.platform_code ?? null` in `V4TransferBoardsController`.
|
|
173
178
|
|
|
174
179
|
---
|
|
175
180
|
|
|
@@ -300,7 +305,7 @@ The last stage applies three rules:
|
|
|
300
305
|
|---|---|---|---|
|
|
301
306
|
| Stage 6 same-line opposite direction | Yes (when `direction_id` known) | Yes (when `direction_id` known) | Yes |
|
|
302
307
|
| Stage 7 pre-filter (wrong stop name) | Yes | No | No (exempt) |
|
|
303
|
-
| Stage 11 min transfer time |
|
|
308
|
+
| Stage 11 min transfer time | 60 s if different platform, 0 s if same platform | Train 120 s; metro 60 s; ferry/funicular use the platform rule (60 s / 0 s) | **No** |
|
|
304
309
|
| Stage 12 same-stop-name | Yes | No | **No** |
|
|
305
310
|
| Stage 16 direction filter | Yes | **No** | **No** |
|
|
306
311
|
| Stage 17 combine | All types pass via their category | — | — |
|