@golemio/pid 2.11.7-dev.1165818521 → 2.11.7-dev.1168947446
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/db/example/00_clear_test_data.sql +1 -0
- package/db/example/18_train_trip_with_cis_platform_code.sql +57 -0
- package/db/migrations/postgresql/20240205151434-cis-platform-code.js +53 -0
- package/db/migrations/postgresql/sqls/20240205151434-cis-platform-code-down.sql +341 -0
- package/db/migrations/postgresql/sqls/20240205151434-cis-platform-code-up.sql +382 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js +3 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.js +10 -4
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/CisStopRepository.d.ts +4 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/CisStopRepository.js +19 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/CisStopRepository.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +9 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/TripRepositoryInterfaces.d.ts +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/mpv-net/MpvStopParser.d.ts +10 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/mpv-net/MpvStopParser.js +20 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/mpv-net/MpvStopParser.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/MpvMessageInterfaces.d.ts +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/TransformationInterfaces.d.ts +3 -17
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.js +11 -7
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/{PositionsTransformation.d.ts → MpvMessageTransformation.d.ts} +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/{PositionsTransformation.js → MpvMessageTransformation.js} +15 -55
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/MpvMessageTransformation.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js +2 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js.map +1 -1
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.d.ts +7 -0
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js +13 -1
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js.map +1 -1
- package/dist/output-gateway/pid/index.d.ts +1 -0
- package/dist/output-gateway/pid/index.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopDto.d.ts +3 -0
- package/dist/schema-definitions/ropid-gtfs/models/StopDto.d.ts +3 -2
- package/dist/schema-definitions/ropid-gtfs/models/StopDto.js +7 -0
- package/dist/schema-definitions/ropid-gtfs/models/StopDto.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/StopTimesDto.d.ts +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/StopTimesDto.js +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/StopTimesDto.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.d.ts +1 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js +4 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.d.ts +1 -0
- package/dist/schema-definitions/vehicle-positions/models/CisStopModel.d.ts +11 -0
- package/dist/schema-definitions/vehicle-positions/models/CisStopModel.js +41 -0
- package/dist/schema-definitions/vehicle-positions/models/CisStopModel.js.map +1 -0
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICisStopDto.d.ts +5 -0
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICisStopDto.js +3 -0
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICisStopDto.js.map +1 -0
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IGtfsRtTripDto.d.ts +2 -0
- package/dist/schema-definitions/vehicle-positions/models/views/StopTimeDelayPredictionModel.d.ts +2 -0
- package/dist/schema-definitions/vehicle-positions/models/views/StopTimeDelayPredictionModel.js +8 -0
- package/dist/schema-definitions/vehicle-positions/models/views/StopTimeDelayPredictionModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/interfaces/IStopTimeDelayPredictionDto.d.ts +2 -0
- package/docs/assets/pid_vp_cis_erd.jpg +0 -0
- package/docs/implementation_documentation.md +4 -0
- package/package.json +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PositionsTransformation.js.map +0 -1
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MpvStopParser = void 0;
|
|
4
|
+
class MpvStopParser {
|
|
5
|
+
/**
|
|
6
|
+
* Parse and sanitize current platform code
|
|
7
|
+
* 1/3 -> 1/3
|
|
8
|
+
* -/3 -> 3
|
|
9
|
+
* 1/- -> 1
|
|
10
|
+
*/
|
|
11
|
+
static parsePlatformCode(cisStop) {
|
|
12
|
+
const platformCode = cisStop.$.stan;
|
|
13
|
+
if (!platformCode) {
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
return platformCode.replace(/-\/|\/-/s, "");
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
exports.MpvStopParser = MpvStopParser;
|
|
20
|
+
//# sourceMappingURL=MpvStopParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MpvStopParser.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/mpv-net/MpvStopParser.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IACtB;;;;;OAKG;IACH,MAAM,CAAC,iBAAiB,CAAC,OAAwB;QAC7C,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACpC,IAAI,CAAC,YAAY,EAAE;YACf,OAAO,IAAI,CAAC;SACf;QAED,OAAO,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;CACJ;AAfD,sCAeC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { StatePositionEnum, StateProcessEnum } from "../../../../../const";
|
|
2
2
|
import { ProviderSourceTypeEnum } from "../helpers/ProviderSourceTypeEnum";
|
|
3
|
+
import { ICisStopDto } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/ICisStopDto";
|
|
3
4
|
export interface IPositionTransformationResult {
|
|
4
5
|
asw_last_stop_id: string | null;
|
|
5
6
|
bearing: number | null;
|
|
@@ -18,21 +19,6 @@ export interface IPositionTransformationResult {
|
|
|
18
19
|
is_tracked: boolean | null;
|
|
19
20
|
trips_id: string;
|
|
20
21
|
}
|
|
21
|
-
export interface IStopTransformationResult {
|
|
22
|
-
arrival_delay_type: number | null;
|
|
23
|
-
arrival_time: string | null;
|
|
24
|
-
arrival_timestamp: number | null;
|
|
25
|
-
asw_stop_id: string | null;
|
|
26
|
-
cis_stop_id: number | null;
|
|
27
|
-
cis_stop_platform_code: string | null;
|
|
28
|
-
cis_stop_sequence: number;
|
|
29
|
-
delay_arrival: number | null;
|
|
30
|
-
delay_departure: number | null;
|
|
31
|
-
delay_type: number | null;
|
|
32
|
-
departure_time: string | null;
|
|
33
|
-
departure_timestamp: number | null;
|
|
34
|
-
trips_id: string;
|
|
35
|
-
}
|
|
36
22
|
export interface ITripTransformationResult {
|
|
37
23
|
agency_name_real: string | null;
|
|
38
24
|
agency_name_scheduled: string | null;
|
|
@@ -55,11 +41,11 @@ export interface ITripTransformationResult {
|
|
|
55
41
|
}
|
|
56
42
|
export interface ITransformationResult {
|
|
57
43
|
positions: IPositionTransformationResult[];
|
|
58
|
-
stops:
|
|
44
|
+
stops: ICisStopDto[];
|
|
59
45
|
trips: ITripTransformationResult[];
|
|
60
46
|
}
|
|
61
47
|
export interface ITransformationElement {
|
|
62
48
|
position: IPositionTransformationResult;
|
|
63
|
-
stops:
|
|
49
|
+
stops: ICisStopDto[];
|
|
64
50
|
trip: ITripTransformationResult;
|
|
65
51
|
}
|
|
@@ -6,7 +6,8 @@ export declare class SaveDataToDBTask extends AbstractTask<IMpvMessageInput> {
|
|
|
6
6
|
readonly queueTtl: number;
|
|
7
7
|
readonly schema: typeof SaveDataToDBValidationSchema;
|
|
8
8
|
private readonly tripsRepository;
|
|
9
|
-
private readonly
|
|
9
|
+
private readonly cisStopRepository;
|
|
10
|
+
private readonly messageTransformation;
|
|
10
11
|
constructor(queuePrefix: string);
|
|
11
12
|
protected execute(data: IMpvMessageInput): Promise<void>;
|
|
12
13
|
private sendDataToUpdateGtfsTripId;
|
|
@@ -15,10 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.SaveDataToDBTask = void 0;
|
|
16
16
|
const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
|
|
17
17
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
18
|
+
const CisStopRepository_1 = require("../data-access/CisStopRepository");
|
|
18
19
|
const TripsRepository_1 = require("../data-access/TripsRepository");
|
|
19
20
|
const TripsMapper_1 = __importDefault(require("../data-access/helpers/TripsMapper"));
|
|
20
21
|
const SaveDataToDBSchema_1 = require("../schema/SaveDataToDBSchema");
|
|
21
|
-
const
|
|
22
|
+
const MpvMessageTransformation_1 = require("../transformations/MpvMessageTransformation");
|
|
22
23
|
class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
23
24
|
constructor(queuePrefix) {
|
|
24
25
|
super(queuePrefix);
|
|
@@ -26,22 +27,25 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
26
27
|
this.queueTtl = 5 * 60 * 1000; // 5 minutes
|
|
27
28
|
this.schema = SaveDataToDBSchema_1.SaveDataToDBValidationSchema;
|
|
28
29
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
29
|
-
this.
|
|
30
|
+
this.cisStopRepository = new CisStopRepository_1.CisStopRepository();
|
|
31
|
+
this.messageTransformation = new MpvMessageTransformation_1.MpvMessageTransformation();
|
|
30
32
|
}
|
|
31
33
|
execute(data) {
|
|
32
34
|
var _a;
|
|
33
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
36
|
const taskStartTimestamp = new Date().getTime();
|
|
35
|
-
const
|
|
36
|
-
const tripEntities = yield this.tripsRepository.bulkSave(
|
|
37
|
+
const { trips, positions, stops } = yield this.messageTransformation.transform(data.m.spoj);
|
|
38
|
+
const tripEntities = yield this.tripsRepository.bulkSave(trips,
|
|
37
39
|
// Ignore incoming start_timestamp for existing trips to avoid overwriting existing computed timestamp
|
|
38
40
|
// TODO this is a workaround, dedicated column (gtfs_start_timestamp) will be added
|
|
39
|
-
Object.keys((_a =
|
|
41
|
+
Object.keys((_a = trips[0]) !== null && _a !== void 0 ? _a : {})
|
|
40
42
|
.filter((key) => key !== "start_timestamp")
|
|
41
43
|
.concat("updated_at"), true);
|
|
42
44
|
const { inserted, updated } = TripsMapper_1.default.mapTripEntitiesToUpdateDto(tripEntities, taskStartTimestamp);
|
|
43
|
-
yield this.sendDataToUpdateGtfsTripId(inserted,
|
|
44
|
-
yield this.sendDataToUpdateDelay(updated,
|
|
45
|
+
yield this.sendDataToUpdateGtfsTripId(inserted, positions);
|
|
46
|
+
yield this.sendDataToUpdateDelay(updated, positions);
|
|
47
|
+
// Save cis stops to later propagate platform codes to departure boards
|
|
48
|
+
yield this.cisStopRepository.bulkSave(stops);
|
|
45
49
|
});
|
|
46
50
|
}
|
|
47
51
|
sendDataToUpdateGtfsTripId(insertedTrips, positions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveDataToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"SaveDataToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2FAAqF;AACrF,2EAA6E;AAC7E,wEAAqE;AACrE,oEAAiE;AACjE,qFAA6D;AAI7D,qEAA4E;AAC5E,0FAAuF;AAEvF,MAAa,gBAAiB,SAAQ,sBAA8B;IAShE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QATP,cAAS,GAAG,cAAc,CAAC;QAC3B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,iDAA4B,CAAC;QAQlD,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,iBAAiB,GAAG,IAAI,qCAAiB,EAAE,CAAC;QACjD,IAAI,CAAC,qBAAqB,GAAG,IAAI,mDAAwB,EAAE,CAAC;IAChE,CAAC;IAEe,OAAO,CAAC,IAAsB;;;YAC1C,MAAM,kBAAkB,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC5F,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CACpD,KAAK;YACL,sGAAsG;YACtG,mFAAmF;YACnF,MAAM,CAAC,IAAI,CAAC,MAAA,KAAK,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC;iBACtB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,iBAAiB,CAAC;iBAC1C,MAAM,CAAC,YAAY,CAAC,EACzB,IAAI,CACP,CAAC;YAEF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,qBAAW,CAAC,0BAA0B,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;YACvG,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC3D,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAErD,uEAAuE;YACvE,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;;KAChD;IAEa,0BAA0B,CACpC,aAA4C,EAC5C,SAA0C;;YAE1C,sCAAsC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;gBACtE,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;gBAC5D,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC1C,OAAO,GAAG,CAAC,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;gBAEH,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE;oBAC3E,KAAK,EAAE,aAAa;oBACpB,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBACrF,CAAC,CAAC;aACN;QACL,CAAC;KAAA;IAEa,qBAAqB,CAAC,YAA0C,EAAE,SAA0C;;YACtH,yFAAyF;YACzF,MAAM,UAAU,GAA6B,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAExF,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBAC7C,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACpC;qBAAM;oBACH,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC3D,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;iBACnF;aACJ;YAED,MAAM,MAAM,GAAe,EAAE,CAAC;YAC9B,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;oBACd,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;iBACpB;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClD,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,GAAG,EAAE;oBAC1B,GAAG,EAAE,CAAC;iBACT;aACJ;YAED,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;gBACtB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACjF,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,EAAE;oBACtE,YAAY;oBACZ,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBACrF,CAAC,CAAC;aACN;QACL,CAAC;KAAA;CACJ;AAxFD,4CAwFC"}
|
|
@@ -2,7 +2,7 @@ import { BaseTransformation, ITransformation } from "@golemio/core/dist/integrat
|
|
|
2
2
|
import { Moment } from "@golemio/core/dist/shared/moment-timezone";
|
|
3
3
|
import { IMpvPositionContent } from "../interfaces/MpvMessageInterfaces";
|
|
4
4
|
import { ITransformationElement, ITransformationResult } from "../interfaces/TransformationInterfaces";
|
|
5
|
-
export declare class
|
|
5
|
+
export declare class MpvMessageTransformation extends BaseTransformation implements ITransformation {
|
|
6
6
|
name: string;
|
|
7
7
|
private config;
|
|
8
8
|
private static ORIGIN_TIME_FORMAT;
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.MpvMessageTransformation = void 0;
|
|
16
16
|
const vehicle_positions_1 = require("../../../../../schema-definitions/vehicle-positions");
|
|
17
17
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
18
18
|
const Di_1 = require("@golemio/core/dist/integration-engine/ioc/Di");
|
|
@@ -21,12 +21,13 @@ const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/mom
|
|
|
21
21
|
const const_1 = require("../../../../../const");
|
|
22
22
|
const DPPUtils_1 = __importDefault(require("../helpers/DPPUtils"));
|
|
23
23
|
const ProviderSourceTypeEnum_1 = require("../helpers/ProviderSourceTypeEnum");
|
|
24
|
+
const MpvStopParser_1 = require("../helpers/mpv-net/MpvStopParser");
|
|
24
25
|
var PositionTrackingEnum;
|
|
25
26
|
(function (PositionTrackingEnum) {
|
|
26
27
|
PositionTrackingEnum["NOT_TRACKING"] = "0";
|
|
27
28
|
PositionTrackingEnum["TRACKING"] = "2";
|
|
28
29
|
})(PositionTrackingEnum || (PositionTrackingEnum = {}));
|
|
29
|
-
class
|
|
30
|
+
class MpvMessageTransformation extends transformations_1.BaseTransformation {
|
|
30
31
|
constructor() {
|
|
31
32
|
super();
|
|
32
33
|
/**
|
|
@@ -53,7 +54,7 @@ class PositionsTransformation extends transformations_1.BaseTransformation {
|
|
|
53
54
|
return res;
|
|
54
55
|
});
|
|
55
56
|
this.transformElement = (element) => __awaiter(this, void 0, void 0, function* () {
|
|
56
|
-
var _a, _b
|
|
57
|
+
var _a, _b;
|
|
57
58
|
const attributes = element.$;
|
|
58
59
|
// DPP and regional bus trips to be excluded in HTTP ingress
|
|
59
60
|
const isDPPTrip = attributes.dopr === DPPUtils_1.default.DPP_AGENCY_NAME;
|
|
@@ -67,7 +68,7 @@ class PositionsTransformation extends transformations_1.BaseTransformation {
|
|
|
67
68
|
}
|
|
68
69
|
attributes.lin = attributes.lin || "none";
|
|
69
70
|
attributes.alias = attributes.alias || "none";
|
|
70
|
-
attributes.cpoz = attributes.cpoz || moment_timezone_1.default.tz("Europe/Prague").format(
|
|
71
|
+
attributes.cpoz = attributes.cpoz || moment_timezone_1.default.tz("Europe/Prague").format(MpvMessageTransformation.ORIGIN_TIME_FORMAT);
|
|
71
72
|
const stops = element.zast;
|
|
72
73
|
const { startTimestamp, positionTimestamp } = yield this.deduceTimestamps(stops[0], attributes.cpoz);
|
|
73
74
|
// filter out position with future time (set to be far than 5 minutes from now)
|
|
@@ -147,61 +148,20 @@ class PositionsTransformation extends transformations_1.BaseTransformation {
|
|
|
147
148
|
};
|
|
148
149
|
for (let i = 0; i < stops.length; i++) {
|
|
149
150
|
const stop = stops[i];
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
let departure;
|
|
153
|
-
let isOverMidnight = 0;
|
|
154
|
-
// creating arival from stop.$.prij
|
|
155
|
-
if (stop.$.prij && stop.$.prij !== "") {
|
|
156
|
-
arrival = moment_timezone_1.default.tz("Europe/Prague");
|
|
157
|
-
const arrivalPlain = stop.$.prij.split(":");
|
|
158
|
-
arrival.hour(parseInt(arrivalPlain[0], 10));
|
|
159
|
-
arrival.minute(parseInt(arrivalPlain[1], 10));
|
|
160
|
-
arrival.second(0);
|
|
161
|
-
arrival.millisecond(0);
|
|
162
|
-
// midnight checking
|
|
163
|
-
isOverMidnight = this.checkMidnight(now, arrival); // returns -1, 1 or 0
|
|
164
|
-
arrival.add(isOverMidnight, "d");
|
|
151
|
+
if (!stop.$.zast) {
|
|
152
|
+
continue;
|
|
165
153
|
}
|
|
166
|
-
|
|
167
|
-
if (stop.$.odj && stop.$.odj !== "") {
|
|
168
|
-
departure = moment_timezone_1.default.tz("Europe/Prague");
|
|
169
|
-
const departurePlain = stop.$.odj.split(":");
|
|
170
|
-
departure.hour(parseInt(departurePlain[0], 10));
|
|
171
|
-
departure.minute(parseInt(departurePlain[1], 10));
|
|
172
|
-
departure.second(0);
|
|
173
|
-
departure.millisecond(0);
|
|
174
|
-
// midnight checking
|
|
175
|
-
isOverMidnight = this.checkMidnight(now, departure); // returns -1, 1 or 0
|
|
176
|
-
departure.add(isOverMidnight, "d");
|
|
177
|
-
}
|
|
178
|
-
// TEMP input data attribute rename - OLD: stop.$.zpoz_typ, NEW: stop.$.zpoz_typ_odj
|
|
179
|
-
const delayDepartureType = stop.$.zpoz_typ || stop.$.zpoz_typ_odj;
|
|
154
|
+
const delayDepartureType = stop.$.zpoz_typ_odj;
|
|
180
155
|
const cisStopSequence = i + 1;
|
|
181
|
-
|
|
182
|
-
if (stop.$.zast &&
|
|
183
|
-
res.position.cis_last_stop_id === parseInt(stop.$.zast, 10) &&
|
|
156
|
+
if (res.position.cis_last_stop_id === parseInt(stop.$.zast, 10) &&
|
|
184
157
|
((delayDepartureType && parseInt(delayDepartureType, 10) === 3) ||
|
|
185
158
|
(stop.$.zpoz_typ_prij && parseInt(stop.$.zpoz_typ_prij, 10) === 3))) {
|
|
186
159
|
res.position.cis_last_stop_sequence = cisStopSequence;
|
|
187
160
|
}
|
|
188
|
-
// assign formatted stop id according to agency's stop ids
|
|
189
|
-
const aswStopId = null;
|
|
190
|
-
const cisStopId = stop.$.zast ? parseInt(stop.$.zast, 10) : null;
|
|
191
161
|
res.stops.push({
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
asw_stop_id: aswStopId,
|
|
196
|
-
cis_stop_id: cisStopId,
|
|
197
|
-
cis_stop_platform_code: (_c = stop.$.stan) !== null && _c !== void 0 ? _c : null,
|
|
198
|
-
cis_stop_sequence: cisStopSequence,
|
|
199
|
-
delay_arrival: stop.$.zpoz_prij ? parseInt(stop.$.zpoz_prij, 10) : null,
|
|
200
|
-
delay_departure: stop.$.zpoz_odj ? parseInt(stop.$.zpoz_odj, 10) : null,
|
|
201
|
-
delay_type: delayDepartureType ? parseInt(delayDepartureType, 10) : null,
|
|
202
|
-
departure_time: departure ? stop.$.odj : null,
|
|
203
|
-
departure_timestamp: departure ? departure.utc().valueOf() : null,
|
|
204
|
-
trips_id: primaryKey,
|
|
162
|
+
rt_trip_id: primaryKey,
|
|
163
|
+
cis_stop_group_id: parseInt(stop.$.zast, 10),
|
|
164
|
+
cis_stop_platform_code: MpvStopParser_1.MpvStopParser.parsePlatformCode(stop),
|
|
205
165
|
});
|
|
206
166
|
}
|
|
207
167
|
return res;
|
|
@@ -302,6 +262,6 @@ class PositionsTransformation extends transformations_1.BaseTransformation {
|
|
|
302
262
|
return null;
|
|
303
263
|
}
|
|
304
264
|
}
|
|
305
|
-
exports.
|
|
306
|
-
|
|
307
|
-
//# sourceMappingURL=
|
|
265
|
+
exports.MpvMessageTransformation = MpvMessageTransformation;
|
|
266
|
+
MpvMessageTransformation.ORIGIN_TIME_FORMAT = "HH:mm:ss";
|
|
267
|
+
//# sourceMappingURL=MpvMessageTransformation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MpvMessageTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/MpvMessageTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ let PublicApiTripTransformation = exports.PublicApiTripTransformation = class Pu
|
|
|
18
18
|
super();
|
|
19
19
|
this.name = "PublicApiTripTransformation";
|
|
20
20
|
this.transformInternal = (data) => {
|
|
21
|
+
var _a;
|
|
21
22
|
return {
|
|
22
23
|
gtfs_trip_id: data.gtfs_trip_id,
|
|
23
24
|
route_type: data.gtfs_route_type,
|
|
@@ -38,7 +39,7 @@ let PublicApiTripTransformation = exports.PublicApiTripTransformation = class Pu
|
|
|
38
39
|
last_stop_sequence: data.last_stop_sequence,
|
|
39
40
|
origin_timestamp: data.origin_timestamp.toISOString(),
|
|
40
41
|
registration_number: data.vehicle_registration_number,
|
|
41
|
-
operator: data.agency_name_real,
|
|
42
|
+
operator: (_a = data.agency_name_real) !== null && _a !== void 0 ? _a : data.agency_name_scheduled,
|
|
42
43
|
vehicle_type_id: data.vehicle_type_id,
|
|
43
44
|
},
|
|
44
45
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicApiTripTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6GAA0G;AAC1G,iEAAgE;AAChE,iFAA8E;AAOvE,IAAM,2BAA2B,yCAAjC,MAAM,2BAA4B,SAAQ,+CAAiD;IAI9F;QACI,KAAK,EAAE,CAAC;QAJL,SAAI,GAAG,6BAA6B,CAAC;QAQlC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE
|
|
1
|
+
{"version":3,"file":"PublicApiTripTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6GAA0G;AAC1G,iEAAgE;AAChE,iFAA8E;AAOvE,IAAM,2BAA2B,yCAAjC,MAAM,2BAA4B,SAAQ,+CAAiD;IAI9F;QACI,KAAK,EAAE,CAAC;QAJL,SAAI,GAAG,6BAA6B,CAAC;QAQlC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;;YAC9D,OAAO;gBACH,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,UAAU,EAAE,IAAI,CAAC,eAAe;gBAChC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;gBACjD,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;gBAChC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;gBAChC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAC5C,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,2BAA2B,EAChC,IAAI,CAAC,UAAU,CAClB;gBACD,aAAa,EAAE;oBACX,wBAAwB,EAAE,IAAI,CAAC,qBAAqB;oBACpD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;oBACzC,QAAQ,EAAE,IAAI,CAAC,aAAa;oBAC5B,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,aAAa,EAAE,IAAI,CAAC,kBAAkB;oBACtC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC;oBAC3G,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;oBAC3C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;oBACrD,mBAAmB,EAAE,IAAI,CAAC,2BAA2B;oBACrD,QAAQ,EAAE,MAAA,IAAI,CAAC,gBAAgB,mCAAI,IAAI,CAAC,qBAAqB;oBAC7D,eAAe,EAAE,IAAI,CAAC,eAAe;iBACxC;aACJ,CAAC;QACN,CAAC,CAAC;QAlCE,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,EAAE,CAAC;IACvD,CAAC;CAkCJ,CAAA;sCAzCY,2BAA2B;IADvC,IAAA,qBAAU,GAAE;;GACA,2BAA2B,CAyCvC"}
|
|
@@ -6,4 +6,11 @@ export default class DepartureBoardMapper {
|
|
|
6
6
|
private static transformResponseData;
|
|
7
7
|
private static calculateDepartureMinutes;
|
|
8
8
|
private static determineWheelchairAccessibility;
|
|
9
|
+
/**
|
|
10
|
+
* Platform code is determined by the following rules:
|
|
11
|
+
* - for trains, the last stop platform code is used (CIS) if available
|
|
12
|
+
* - otherwise, the departure platform code is used (GTFS)
|
|
13
|
+
* - for other route types, the departure platform code is used (GTFS)
|
|
14
|
+
*/
|
|
15
|
+
private static determineStopPlatformCode;
|
|
9
16
|
}
|
|
@@ -79,7 +79,7 @@ DepartureBoardMapper.transformResponseData = (x, preferredTimezone, mode) => {
|
|
|
79
79
|
},
|
|
80
80
|
stop: {
|
|
81
81
|
id: x.stop_id,
|
|
82
|
-
platform_code: x
|
|
82
|
+
platform_code: _a.determineStopPlatformCode(x),
|
|
83
83
|
},
|
|
84
84
|
trip: {
|
|
85
85
|
direction: x.direction,
|
|
@@ -111,5 +111,17 @@ DepartureBoardMapper.determineWheelchairAccessibility = (departure) => {
|
|
|
111
111
|
: wheelchair_accessible === AccessibilityEnums_1.GtfsTripWheelchairAccessEnum.AccessibleVehicle;
|
|
112
112
|
}
|
|
113
113
|
};
|
|
114
|
+
/**
|
|
115
|
+
* Platform code is determined by the following rules:
|
|
116
|
+
* - for trains, the last stop platform code is used (CIS) if available
|
|
117
|
+
* - otherwise, the departure platform code is used (GTFS)
|
|
118
|
+
* - for other route types, the departure platform code is used (GTFS)
|
|
119
|
+
*/
|
|
120
|
+
DepartureBoardMapper.determineStopPlatformCode = (departure) => {
|
|
121
|
+
if (departure.route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN && departure["trip.cis_stop_platform_code"] !== null) {
|
|
122
|
+
return departure["trip.cis_stop_platform_code"];
|
|
123
|
+
}
|
|
124
|
+
return departure.platform_code;
|
|
125
|
+
};
|
|
114
126
|
exports.default = DepartureBoardMapper;
|
|
115
127
|
//# sourceMappingURL=DepartureBoardMapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ export interface IPIDDeparture {
|
|
|
36
36
|
"trip.last_position.last_stop_sequence": number | null;
|
|
37
37
|
"trip.last_position.last_stop_name": string | null;
|
|
38
38
|
"trip.last_position.this_stop_sequence": number | null;
|
|
39
|
+
"trip.cis_stop_platform_code": string | null;
|
|
39
40
|
"trip.vehicle_descriptor.is_air_conditioned"?: boolean | null;
|
|
40
41
|
}
|
|
41
42
|
export interface IPIDDepartureOutput {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,8CAA4B;AAC5B,2CAAyB;AAkFzB,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACnB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,yCAAuB,CAAA;AAC3B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,2CAAwB,CAAA;IACxB,0DAAuC,CAAA;IACvC,oDAAiC,CAAA;IACjC,mEAAgD,CAAA;IAChD,qEAAkD,CAAA;IAClD,8EAA2D,CAAA;AAC/D,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAED,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,mCAAkB,CAAA;IAClB,8BAA8B;AAClC,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
|
|
2
2
|
import { Model, ModelAttributes } from "@golemio/core/dist/shared/sequelize";
|
|
3
|
-
import { IStopDto } from "../interfaces/IStopDto";
|
|
4
|
-
export declare class StopDto extends Model<IStopDto> implements IStopDto {
|
|
3
|
+
import { IStopComputedDto, IStopDto } from "../interfaces/IStopDto";
|
|
4
|
+
export declare class StopDto extends Model<IStopDto & IStopComputedDto> implements IStopDto {
|
|
5
5
|
stop_id: string;
|
|
6
6
|
level_id: string;
|
|
7
7
|
location_type: number;
|
|
@@ -18,6 +18,7 @@ export declare class StopDto extends Model<IStopDto> implements IStopDto {
|
|
|
18
18
|
zone_id: string;
|
|
19
19
|
asw_node_id: number;
|
|
20
20
|
asw_stop_id: number;
|
|
21
|
+
computed_cis_stop_id: string | null;
|
|
21
22
|
static attributeModel: ModelAttributes<StopDto>;
|
|
22
23
|
static jsonSchema: JSONSchemaType<IStopDto[]>;
|
|
23
24
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.StopDto = void 0;
|
|
4
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
4
5
|
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
5
6
|
class StopDto extends sequelize_1.Model {
|
|
6
7
|
}
|
|
@@ -22,6 +23,12 @@ StopDto.attributeModel = {
|
|
|
22
23
|
stop_timezone: sequelize_1.DataTypes.STRING,
|
|
23
24
|
asw_node_id: sequelize_1.DataTypes.INTEGER,
|
|
24
25
|
asw_stop_id: sequelize_1.DataTypes.INTEGER,
|
|
26
|
+
computed_cis_stop_id: {
|
|
27
|
+
type: sequelize_1.DataTypes.STRING,
|
|
28
|
+
set() {
|
|
29
|
+
throw new golemio_errors_1.GeneralError("computed_cis_stop_id is read-only", "StopDto");
|
|
30
|
+
},
|
|
31
|
+
},
|
|
25
32
|
};
|
|
26
33
|
StopDto.jsonSchema = {
|
|
27
34
|
type: "array",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StopDto.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-gtfs/models/StopDto.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"StopDto.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-gtfs/models/StopDto.ts"],"names":[],"mappings":";;;AACA,6EAAwE;AACxE,mEAAwF;AAGxF,MAAa,OAAQ,SAAQ,iBAAkC;;AAA/D,0BAqEC;AAlDiB,sBAAc,GAA6B;IACrD,aAAa,EAAE,qBAAS,CAAC,OAAO;IAChC,cAAc,EAAE,qBAAS,CAAC,MAAM;IAChC,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE;IACrD,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,SAAS,EAAE,qBAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,mBAAmB,EAAE,qBAAS,CAAC,OAAO;IACtC,OAAO,EAAE,qBAAS,CAAC,MAAM;IACzB,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,SAAS,EAAE,qBAAS,CAAC,MAAM;IAC3B,SAAS,EAAE,qBAAS,CAAC,MAAM;IAC3B,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,WAAW,EAAE,qBAAS,CAAC,OAAO;IAC9B,WAAW,EAAE,qBAAS,CAAC,OAAO;IAC9B,oBAAoB,EAAE;QAClB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,GAAG;YACC,MAAM,IAAI,6BAAY,CAAC,mCAAmC,EAAE,SAAS,CAAC,CAAC;QAC3E,CAAC;KACJ;CACJ,CAAC;AAEY,kBAAU,GAA+B;IACnD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,mBAAmB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACxC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAChC,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SACnC;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACxB;CACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
|
|
2
2
|
import { Model, ModelAttributes } from "@golemio/core/dist/shared/sequelize";
|
|
3
|
-
import {
|
|
3
|
+
import { IStopTimesComputedDto, IStopTimesDto } from "../interfaces/IStopTimesDto";
|
|
4
4
|
export declare class StopTimesDto extends Model<IStopTimesDto & IStopTimesComputedDto> implements IStopTimesDto {
|
|
5
5
|
trip_id: string;
|
|
6
6
|
stop_sequence: number;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.StopTimesDto = void 0;
|
|
4
|
-
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
5
4
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
5
|
+
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
6
6
|
class StopTimesDto extends sequelize_1.Model {
|
|
7
7
|
}
|
|
8
8
|
exports.StopTimesDto = StopTimesDto;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StopTimesDto.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-gtfs/models/StopTimesDto.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"StopTimesDto.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-gtfs/models/StopTimesDto.ts"],"names":[],"mappings":";;;AACA,6EAAwE;AACxE,mEAAwF;AAGxF,MAAa,YAAa,SAAQ,iBAA4C;;AAA9E,oCAyDC;AA1CiB,2BAAc,GAAkC;IAC1D,YAAY,EAAE,qBAAS,CAAC,MAAM;IAC9B,oBAAoB,EAAE,qBAAS,CAAC,OAAO;IACvC,cAAc,EAAE,qBAAS,CAAC,MAAM;IAChC,sBAAsB,EAAE,qBAAS,CAAC,OAAO;IACzC,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,WAAW,EAAE,qBAAS,CAAC,MAAM;IAC7B,mBAAmB,EAAE,qBAAS,CAAC,MAAM;IACrC,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,OAAO,EAAE,qBAAS,CAAC,MAAM;IACzB,aAAa,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;IAC5D,OAAO,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE;IACrD,SAAS,EAAE,qBAAS,CAAC,OAAO;IAC5B,2BAA2B,EAAE;QACzB,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,GAAG;YACC,MAAM,IAAI,6BAAY,CAAC,0CAA0C,EAAE,cAAc,CAAC,CAAC;QACvF,CAAC;KACJ;CACJ,CAAC;AAEY,uBAAU,GAAoC;IACxD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,oBAAoB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACzC,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,sBAAsB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3C,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvC,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SACjC;QACD,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC;KACzC;CACJ,CAAC"}
|
|
@@ -34,6 +34,7 @@ export declare class DeparturesModel extends Model<DeparturesModel> implements I
|
|
|
34
34
|
next_stop_id: string | null;
|
|
35
35
|
last_stop_sequence: number | null;
|
|
36
36
|
last_stop_id: string | null;
|
|
37
|
+
cis_stop_group_id: number | null;
|
|
37
38
|
static attributeModel: ModelAttributes<DeparturesModel>;
|
|
38
39
|
static jsonSchema: JSONSchemaType<IDeparturesModel>;
|
|
39
40
|
}
|
|
@@ -54,6 +54,7 @@ DeparturesModel.attributeModel = {
|
|
|
54
54
|
next_stop_id: sequelize_1.DataTypes.STRING(30),
|
|
55
55
|
last_stop_sequence: sequelize_1.DataTypes.SMALLINT,
|
|
56
56
|
last_stop_id: sequelize_1.DataTypes.STRING(30),
|
|
57
|
+
cis_stop_group_id: sequelize_1.DataTypes.INTEGER,
|
|
57
58
|
};
|
|
58
59
|
DeparturesModel.jsonSchema = {
|
|
59
60
|
type: "object",
|
|
@@ -150,6 +151,9 @@ DeparturesModel.jsonSchema = {
|
|
|
150
151
|
last_stop_id: {
|
|
151
152
|
type: "string",
|
|
152
153
|
},
|
|
154
|
+
cis_stop_group_id: {
|
|
155
|
+
type: "integer",
|
|
156
|
+
},
|
|
153
157
|
},
|
|
154
158
|
required: ["stop_sequence", "stop_id", "trip_id", "trip_headsign"],
|
|
155
159
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturesModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"DeparturesModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AACxF,uEAA+D;AAG/D,MAAa,eAAgB,SAAQ,iBAAsB;;AAA3D,0CA0LC;AAzLiB,0BAAU,GAAG,kCAAkC,CAAC;AAkChD,8BAAc,GAAqC;IAC7D,aAAa,EAAE;QACX,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;IACD,aAAa,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IACnC,WAAW,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9B,aAAa,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAChC,YAAY,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAClC,gBAAgB,EAAE,qBAAS,CAAC,IAAI;IAChC,cAAc,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IACpC,kBAAkB,EAAE,qBAAS,CAAC,IAAI;IAClC,OAAO,EAAE;QACL,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,SAAS,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAChC,aAAa,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IACnC,mBAAmB,EAAE,qBAAS,CAAC,QAAQ;IACvC,iBAAiB,EAAE,qBAAS,CAAC,QAAQ;IACrC,iBAAiB,EAAE,qBAAS,CAAC,QAAQ;IACrC,OAAO,EAAE;QACL,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,aAAa,EAAE;QACX,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,SAAS,EAAE,KAAK;KACnB;IACD,eAAe,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IACrC,qBAAqB,EAAE,qBAAS,CAAC,QAAQ;IACzC,UAAU,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAChC,IAAI,EAAE,qBAAS,CAAC,IAAI;IACpB,gBAAgB,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IACtC,UAAU,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,kCAAiB,CAAC,iBAAiB;KACpD;IACD,QAAQ,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAC9B,QAAQ,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3B,WAAW,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9B,uBAAuB,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,kBAAkB,EAAE,qBAAS,CAAC,QAAQ;IACtC,YAAY,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAClC,kBAAkB,EAAE,qBAAS,CAAC,QAAQ;IACtC,YAAY,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAClC,iBAAiB,EAAE,qBAAS,CAAC,OAAO;CACvC,CAAC;AAEY,0BAAU,GAAqC;IACzD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,aAAa,EAAE;YACX,IAAI,EAAE,SAAS;SAClB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,QAAQ;SACjB;QACD,gBAAgB,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,CAAC,aAAa,CAAC;SAC5B;QACD,cAAc,EAAE;YACZ,IAAI,EAAE,QAAQ;SACjB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,CAAC,aAAa,CAAC;SAC5B;QACD,OAAO,EAAE;YACL,IAAI,EAAE,QAAQ;SACjB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,mBAAmB,EAAE;YACjB,IAAI,EAAE,SAAS;SAClB;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,SAAS;SAClB;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,SAAS;SAClB;QACD,OAAO,EAAE;YACL,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,eAAe,EAAE;YACb,IAAI,EAAE,QAAQ;SACjB;QACD,qBAAqB,EAAE;YACnB,IAAI,EAAE,SAAS;SAClB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;SACjB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;SACjB;QACD,gBAAgB,EAAE;YACd,IAAI,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,SAAS;SAClB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,uBAAuB,EAAE;YACrB,IAAI,EAAE,QAAQ;SACjB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,SAAS;SAClB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,QAAQ;SACjB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,SAAS;SAClB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,QAAQ;SACjB;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,SAAS;SAClB;KACJ;IACD,QAAQ,EAAE,CAAC,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC;CACrE,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
|
|
2
|
+
import { Model, ModelAttributes } from "@golemio/core/dist/shared/sequelize";
|
|
3
|
+
import { ICisStopDto } from "./interfaces/ICisStopDto";
|
|
4
|
+
export declare class CisStopModel extends Model<CisStopModel> implements ICisStopDto {
|
|
5
|
+
static tableName: string;
|
|
6
|
+
rt_trip_id: string;
|
|
7
|
+
cis_stop_group_id: number;
|
|
8
|
+
cis_stop_platform_code: string | null;
|
|
9
|
+
static attributeModel: ModelAttributes<CisStopModel>;
|
|
10
|
+
static arrayJsonSchema: JSONSchemaType<ICisStopDto[]>;
|
|
11
|
+
}
|