@golemio/pid 2.3.3-dev.683686072 → 2.3.3-dev.685741706
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/12_metro_line_A_gtfs_trips.sql +12 -12
- package/dist/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.d.ts +1 -1
- package/dist/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.js +7 -11
- package/dist/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/models/helpers/VPPositionsMapper.js +6 -3
- package/dist/integration-engine/vehicle-positions/models/helpers/VPPositionsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsIdGenerator.d.ts +13 -0
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsIdGenerator.js +22 -0
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsIdGenerator.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.js +3 -4
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.js.map +1 -1
- package/package.json +1 -2
|
@@ -112,17 +112,17 @@ INSERT INTO vehiclepositions_metro_runs_messages (route_name, message_timestamp,
|
|
|
112
112
|
('A', concat(CURRENT_DATE,'T08:20:13Z')::timestamp, '9', '9', '175', '1209', -15, concat(CURRENT_DATE,'T08:19:58Z')::timestamp, (SELECT origin_datetime FROM init_values), (SELECT origin_datetime FROM init_values));
|
|
113
113
|
|
|
114
114
|
INSERT INTO vehiclepositions_trips (cis_line_id,cis_trip_number,sequence_id,cis_line_short_name,created_at,gtfs_route_id,gtfs_route_short_name,gtfs_trip_id,id,updated_at,start_cis_stop_id,start_cis_stop_platform_code,start_time,start_timestamp,vehicle_type_id,wheelchair_accessible,create_batch_id,created_by,update_batch_id,updated_by,agency_name_scheduled,origin_route_name,agency_name_real,vehicle_registration_number,gtfs_trip_headsign,start_asw_stop_id,gtfs_route_type,gtfs_block_id,last_position_id,is_canceled,end_timestamp,gtfs_trip_short_name) VALUES
|
|
115
|
-
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_78_220321',concat(CURRENT_DATE,'T10:32:35+02:
|
|
116
|
-
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_77_220901',concat(CURRENT_DATE,'T09:55:10+02:
|
|
117
|
-
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_124_201230',concat(CURRENT_DATE,'T11:02:40+02:
|
|
118
|
-
(NULL,NULL,9,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_294_220901',concat(CURRENT_DATE,'T10:04:35+02:
|
|
115
|
+
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_78_220321',concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:32:35',extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','A','DP PRAHA',NULL,'Skalka',NULL,1,NULL,30,NULL,extract(epoch from concat(CURRENT_DATE,'T09:00:40Z')::timestamp)*1000,NULL),
|
|
116
|
+
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_77_220901',concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'09:55:10',extract(epoch from concat(CURRENT_DATE,'T07:55:10Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','A','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,29,NULL,extract(epoch from concat(CURRENT_DATE,'T08:26:20Z')::timestamp)*1000,NULL),
|
|
117
|
+
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_124_201230',concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'11:02:40',extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','A','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,31,NULL,extract(epoch from concat(CURRENT_DATE,'T09:31:20Z')::timestamp)*1000,NULL),
|
|
118
|
+
(NULL,NULL,9,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_294_220901',concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:04:35',extract(epoch from concat(CURRENT_DATE,'T08:04:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','A','DP PRAHA',NULL,'Skalka',NULL,1,NULL,32,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:40Z')::timestamp)*1000,NULL);
|
|
119
119
|
|
|
120
120
|
INSERT INTO vehiclepositions_positions (created_at,delay,delay_stop_arrival,delay_stop_departure,next_stop_id,shape_dist_traveled,is_canceled,lat,lng,origin_time,origin_timestamp,tracking,trips_id,create_batch_id,created_by,update_batch_id,updated_at,updated_by,id,bearing,cis_last_stop_id,cis_last_stop_sequence,last_stop_id,last_stop_sequence,next_stop_sequence,speed,last_stop_arrival_time,last_stop_departure_time,next_stop_arrival_time,next_stop_departure_time,asw_last_stop_id,state_process,state_position,this_stop_id,this_stop_sequence,tcp_event,last_stop_headsign,last_stop_name,next_stop_name,this_stop_name,valid_to) VALUES
|
|
121
|
-
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,NULL,NULL,'U306Z101P',0,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T10:32:35+02:
|
|
122
|
-
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,0,NULL,NULL,'U462Z102P',13.284,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T09:55:10+02:
|
|
123
|
-
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,NULL,NULL,'U953Z102P',0,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T11:02:40+02:
|
|
124
|
-
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,3,NULL,NULL,'U400Z101P',9.455,NULL,50.081053,14.429208,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T10:04:35+02:
|
|
125
|
-
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,0,NULL,NULL,'U462Z102P',13.284,NULL,50.09837,14.36282,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T09:55:10+02:
|
|
126
|
-
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,NULL,'U953Z102P',0,NULL,50.09837,14.36282,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T11:02:40+02:
|
|
127
|
-
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,NULL,'U306Z101P',0,NULL,50.09837,14.36282,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T10:32:35+02:
|
|
128
|
-
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,-13,NULL,NULL,'U400Z101P',9.656,NULL,50.079954,14.43101,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T10:04:35+02:
|
|
121
|
+
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,NULL,NULL,'U306Z101P',0,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,26,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,NULL,'processed','before_track','U157Z102P',NULL,NULL,NULL,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
122
|
+
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,0,NULL,NULL,'U462Z102P',13.284,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,25,263,NULL,NULL,'U157Z102P',14,15,NULL,extract(epoch from concat(CURRENT_DATE,'T08:20:00Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:20:20Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:21:50Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:22:10Z')::timestamp)*1000,NULL,'processed','at_stop','U157Z102P',14,NULL,NULL,'Bořislavka',NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
123
|
+
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,NULL,NULL,'U953Z102P',0,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,27,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,NULL,'processed','before_track','U157Z102P',NULL,NULL,NULL,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
124
|
+
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,3,NULL,NULL,'U400Z101P',9.455,NULL,50.081053,14.429208,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,28,125,NULL,NULL,'U1072Z101P',9,10,NULL,extract(epoch from concat(CURRENT_DATE,'T08:19:00Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:19:30Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:20:40Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:21:10Z')::timestamp)*1000,NULL,'processed','on_track',NULL,NULL,NULL,NULL,'Můstek',NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
125
|
+
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,0,NULL,NULL,'U462Z102P',13.284,NULL,50.09837,14.36282,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,29,263,NULL,NULL,'U157Z102P',14,15,NULL,extract(epoch from concat(CURRENT_DATE,'T08:20:00Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:20:20Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:21:50Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:22:10Z')::timestamp)*1000,NULL,'processed','at_stop','U157Z102P',14,NULL,NULL,'Bořislavka',NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
126
|
+
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,NULL,'U953Z102P',0,NULL,50.09837,14.36282,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,31,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,NULL,'processed','before_track','U157Z102P',NULL,NULL,NULL,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
127
|
+
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,NULL,'U306Z101P',0,NULL,50.09837,14.36282,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,30,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,NULL,'processed','before_track','U157Z102P',NULL,NULL,NULL,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
128
|
+
(concat(CURRENT_DATE,'T09:14:51Z')::timestamp,-13,NULL,NULL,'U400Z101P',9.656,NULL,50.079954,14.43101,'10:20:13',extract(epoch from concat(CURRENT_DATE,'T08:20:13Z')::timestamp)*1000,2,concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,32,139,NULL,NULL,'U1072Z101P',9,10,NULL,extract(epoch from concat(CURRENT_DATE,'T08:19:00Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:19:30Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:20:40Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:21:10Z')::timestamp)*1000,NULL,'processed','on_track',NULL,NULL,NULL,NULL,'Můstek',NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000);
|
|
@@ -2,7 +2,7 @@ import { BinaryLike } from "crypto";
|
|
|
2
2
|
import { IEventFetchOutput } from "../interfaces/IEventFetchOutput";
|
|
3
3
|
export default class RopidVYMIApiHelper {
|
|
4
4
|
private static _instance;
|
|
5
|
-
private readonly
|
|
5
|
+
private readonly datasource;
|
|
6
6
|
static getInstance: () => RopidVYMIApiHelper;
|
|
7
7
|
private constructor();
|
|
8
8
|
getAllEvents: () => Promise<IEventFetchOutput>;
|
|
@@ -16,23 +16,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
const ropid_vymi_1 = require("../../../../../schema-definitions/ropid-vymi");
|
|
17
17
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
18
18
|
const config_1 = require("@golemio/core/dist/integration-engine/config");
|
|
19
|
-
const DataSourceStreamManager_1 = __importDefault(require("@golemio/core/dist/integration-engine/datasources/DataSourceStreamManager"));
|
|
20
19
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
21
20
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
22
21
|
const crypto_1 = __importDefault(require("crypto"));
|
|
23
|
-
const JSONStream_1 = __importDefault(require("JSONStream"));
|
|
24
22
|
const RopidVYMIApiOutputLevel_1 = require("./RopidVYMIApiOutputLevel");
|
|
25
23
|
class RopidVYMIApiHelper {
|
|
26
24
|
constructor() {
|
|
27
25
|
this.getAllEvents = () => __awaiter(this, void 0, void 0, function* () {
|
|
28
26
|
try {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
data = events;
|
|
32
|
-
digest = this.createDigest(JSON.stringify(data));
|
|
33
|
-
}));
|
|
27
|
+
const events = yield this.datasource.getAll();
|
|
28
|
+
const digest = this.createDigest(JSON.stringify(events));
|
|
34
29
|
return {
|
|
35
|
-
data,
|
|
30
|
+
data: events,
|
|
36
31
|
digest,
|
|
37
32
|
};
|
|
38
33
|
}
|
|
@@ -49,12 +44,13 @@ class RopidVYMIApiHelper {
|
|
|
49
44
|
this.createDigest = (data) => {
|
|
50
45
|
return crypto_1.default.createHash("sha1").update(data).digest("hex");
|
|
51
46
|
};
|
|
52
|
-
this.
|
|
47
|
+
this.datasource = new integration_engine_1.DataSource(ropid_vymi_1.RopidVYMI.events.name + "DataSource", new integration_engine_1.HTTPProtocolStrategy({
|
|
53
48
|
headers: config_1.config.datasources.RopidVYMIApiHeaders,
|
|
54
49
|
method: "GET",
|
|
55
|
-
timeout:
|
|
50
|
+
timeout: 25000,
|
|
56
51
|
url: `${config_1.config.datasources.RopidVYMIApiUrl}?level=${RopidVYMIApiOutputLevel_1.RopidVYMIApiOutputLevel.Standard}`,
|
|
57
|
-
|
|
52
|
+
json: true,
|
|
53
|
+
}), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "vymi-report.vymi-list" }), new golemio_validator_1.JSONSchemaValidator(ropid_vymi_1.RopidVYMI.events.name + "DataSource", ropid_vymi_1.RopidVYMI.events.datasourceJsonSchema));
|
|
58
54
|
}
|
|
59
55
|
}
|
|
60
56
|
exports.default = RopidVYMIApiHelper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidVYMIApiHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6EAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"RopidVYMIApiHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6EAA6D;AAC7D,8EAAoH;AACpH,yEAAsE;AACtE,6EAAuE;AACvE,mFAAkF;AAClF,oDAA4C;AAE5C,uEAAoE;AAEpE,MAAqB,kBAAkB;IAYnC;QAeO,iBAAY,GAAG,GAAqC,EAAE;YACzD,IAAI;gBACA,MAAM,MAAM,GAAsB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBACjE,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBAEzD,OAAO;oBACH,IAAI,EAAE,MAAM;oBACZ,MAAM;iBACT,CAAC;aACL;YAAC,OAAO,GAAQ,EAAE;gBACf,wBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,IAAI,GAAG,YAAY,4BAAW,EAAE;oBAC5B,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,4BAAW,CAAC,0BAA0B,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;iBAClG;aACJ;QACL,CAAC,CAAA,CAAC;QAEK,iBAAY,GAAG,CAAC,IAAgB,EAAU,EAAE;YAC/C,OAAO,gBAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC,CAAC;QAnCE,IAAI,CAAC,UAAU,GAAG,IAAI,+BAAU,CAC5B,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,YAAY,EACpC,IAAI,yCAAoB,CAAC;YACrB,OAAO,EAAE,eAAM,CAAC,WAAW,CAAC,mBAAmB;YAC/C,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,KAAK;YACd,GAAG,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,eAAe,UAAU,iDAAuB,CAAC,QAAQ,EAAE;YACtF,IAAI,EAAE,IAAI;SACb,CAAC,EACF,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE,CAAC,EAClE,IAAI,uCAAmB,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,YAAY,EAAE,sBAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,CACvG,CAAC;IACN,CAAC;;AAzBL,qCAiDC;;AA7CiB,8BAAW,GAAG,GAAG,EAAE;IAC7B,IAAI,CAAC,EAAI,CAAC,SAAS,EAAE;QACjB,EAAI,CAAC,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;KAC7C;IAED,OAAO,EAAI,CAAC,SAAS,CAAC;AAC1B,CAAE,CAAA"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const DateTimeUtils_1 = require("../../helpers/DateTimeUtils");
|
|
4
7
|
const const_1 = require("../../../../const");
|
|
8
|
+
const VPTripsIdGenerator_1 = __importDefault(require("./VPTripsIdGenerator"));
|
|
5
9
|
class VPPositionsMapper {
|
|
6
10
|
static mapCommonRunToDto(runMessage, isCurrent, gtfsTrip, runInput) {
|
|
7
11
|
return {
|
|
@@ -14,7 +18,7 @@ class VPPositionsMapper {
|
|
|
14
18
|
state_process: const_1.StateProcessEnum.TCP_INPUT,
|
|
15
19
|
this_stop_id: runMessage.actual_stop_asw_id,
|
|
16
20
|
tracking: isCurrent ? const_1.PositionTrackingEnum.TRACKING : const_1.PositionTrackingEnum.NOT_TRACKING,
|
|
17
|
-
trips_id:
|
|
21
|
+
trips_id: VPTripsIdGenerator_1.default.generateFromCommonRun(gtfsTrip, runInput),
|
|
18
22
|
tcp_event: runMessage.events,
|
|
19
23
|
};
|
|
20
24
|
}
|
|
@@ -28,8 +32,7 @@ class VPPositionsMapper {
|
|
|
28
32
|
state_process: const_1.StateProcessEnum.UDP_INPUT,
|
|
29
33
|
this_stop_id: runInput.coordinates.gtfs_stop_id,
|
|
30
34
|
tracking: isCurrent ? const_1.PositionTrackingEnum.TRACKING : const_1.PositionTrackingEnum.NOT_TRACKING,
|
|
31
|
-
|
|
32
|
-
trips_id: `${gtfsTrip.start_timestamp}_${gtfsTrip.route_id}_${runInput.trainSetNumberScheduled}_${runInput.trainSetNumberReal}_${runInput.trainNumber}`,
|
|
35
|
+
trips_id: VPTripsIdGenerator_1.default.generateFromMetroRun(gtfsTrip, runInput),
|
|
33
36
|
};
|
|
34
37
|
}
|
|
35
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VPPositionsMapper.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/models/helpers/VPPositionsMapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"VPPositionsMapper.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/models/helpers/VPPositionsMapper.ts"],"names":[],"mappings":";;;;;AAEA,+DAA4E;AAE5E,6CAAsF;AAEtF,8EAAsD;AAEtD,MAAqB,iBAAiB;IAC3B,MAAM,CAAC,iBAAiB,CAC3B,UAAuC,EACvC,SAAkB,EAClB,QAA2B,EAC3B,QAA8B;QAE9B,OAAO;YACH,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;YAC7C,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,WAAW,EAAE,6BAAa,CAAC,qBAAqB,CAAC,CAAC,UAAU,CAAC,0BAA0B,CAAC;YACxF,gBAAgB,EAAE,CAAC,UAAU,CAAC,0BAA0B;YACxD,cAAc,EAAE,yBAAiB,CAAC,OAAO;YACzC,aAAa,EAAE,wBAAgB,CAAC,SAAS;YACzC,YAAY,EAAE,UAAU,CAAC,kBAAkB;YAC3C,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,4BAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,4BAAoB,CAAC,YAAY;YACvF,QAAQ,EAAE,4BAAkB,CAAC,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,CAAC;YACtE,SAAS,EAAE,UAAU,CAAC,MAAM;SAC/B,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAC1B,SAAkB,EAClB,QAA2B,EAC3B,QAAqC;QAErC,OAAO;YACH,GAAG,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG;YAC7B,GAAG,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG;YAC7B,WAAW,EAAE,6BAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YAC7E,gBAAgB,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE;YAC/D,cAAc,EAAE,yBAAiB,CAAC,OAAO;YACzC,aAAa,EAAE,wBAAgB,CAAC,SAAS;YACzC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,YAAY;YAC/C,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,4BAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,4BAAoB,CAAC,YAAY;YACvF,QAAQ,EAAE,4BAAkB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC;SACxE,CAAC;IACN,CAAC;CACJ;AAvCD,oCAuCC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { IMetroRunInputForProcessing } from "../../workers/runs/tasks/interfaces/IMetroRunInputForProcessing";
|
|
2
|
+
import { IVehiclePositionsRun } from "../../transformations";
|
|
3
|
+
import { IGtfsRunTripCache } from "../VehiclePositionsRunsModel";
|
|
4
|
+
export default class VPTripsIdGenerator {
|
|
5
|
+
/**
|
|
6
|
+
* @example 2022-11-04T12:31:00+01:00_10_4873_220926_8215
|
|
7
|
+
*/
|
|
8
|
+
static generateFromCommonRun(gtfsTrip: IGtfsRunTripCache, runInput: IVehiclePositionsRun): string;
|
|
9
|
+
/**
|
|
10
|
+
* @example 2022-11-04T12:37:35+01:00_L991_13_13
|
|
11
|
+
*/
|
|
12
|
+
static generateFromMetroRun(gtfsTrip: IGtfsRunTripCache, runInput: IMetroRunInputForProcessing): string;
|
|
13
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
class VPTripsIdGenerator {
|
|
4
|
+
/**
|
|
5
|
+
* @example 2022-11-04T12:31:00+01:00_10_4873_220926_8215
|
|
6
|
+
*/
|
|
7
|
+
static generateFromCommonRun(gtfsTrip, runInput) {
|
|
8
|
+
const { start_timestamp, trip_id } = gtfsTrip;
|
|
9
|
+
const { registration_number } = runInput;
|
|
10
|
+
return `${start_timestamp}_${trip_id}_${registration_number}`;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* @example 2022-11-04T12:37:35+01:00_L991_13_13
|
|
14
|
+
*/
|
|
15
|
+
static generateFromMetroRun(gtfsTrip, runInput) {
|
|
16
|
+
const { start_timestamp, trip_id } = gtfsTrip;
|
|
17
|
+
const { trainSetNumberScheduled, trainSetNumberReal } = runInput;
|
|
18
|
+
return `${start_timestamp}_${trip_id}_${trainSetNumberScheduled}_${trainSetNumberReal}`;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.default = VPTripsIdGenerator;
|
|
22
|
+
//# sourceMappingURL=VPTripsIdGenerator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VPTripsIdGenerator.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/models/helpers/VPTripsIdGenerator.ts"],"names":[],"mappings":";;AAIA,MAAqB,kBAAkB;IACnC;;OAEG;IACI,MAAM,CAAC,qBAAqB,CAAC,QAA2B,EAAE,QAA8B;QAC3F,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC9C,MAAM,EAAE,mBAAmB,EAAE,GAAG,QAAQ,CAAC;QACzC,OAAO,GAAG,eAAe,IAAI,OAAO,IAAI,mBAAmB,EAAE,CAAC;IAClE,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,oBAAoB,CAAC,QAA2B,EAAE,QAAqC;QACjG,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC9C,MAAM,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,GAAG,QAAQ,CAAC;QACjE,OAAO,GAAG,eAAe,IAAI,OAAO,IAAI,uBAAuB,IAAI,kBAAkB,EAAE,CAAC;IAC5F,CAAC;CACJ;AAlBD,qCAkBC"}
|
|
@@ -6,14 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const DPPUtils_1 = __importDefault(require("../../helpers/DPPUtils"));
|
|
7
7
|
const DateTimeUtils_1 = require("../../helpers/DateTimeUtils");
|
|
8
8
|
const VehiclePositionsTripsModel_1 = require("../VehiclePositionsTripsModel");
|
|
9
|
+
const VPTripsIdGenerator_1 = __importDefault(require("./VPTripsIdGenerator"));
|
|
9
10
|
class VPTripsMapper {
|
|
10
11
|
static mapCommonRunToDto(gtfsTrip, runInput) {
|
|
11
|
-
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), { id:
|
|
12
|
+
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), { id: VPTripsIdGenerator_1.default.generateFromCommonRun(gtfsTrip, runInput), origin_route_name: runInput.route_id, sequence_id: +runInput.run_number, vehicle_registration_number: runInput.registration_number, vehicle_type_id: this.getVehicleTypeId(+gtfsTrip.route_type, !!+gtfsTrip.is_night, !!+gtfsTrip.is_regional, !!+gtfsTrip.is_substitute_transport), wheelchair_accessible: runInput.wheelchair_accessible });
|
|
12
13
|
}
|
|
13
14
|
static mapMetroRunToDto(gtfsTrip, runInput) {
|
|
14
|
-
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), {
|
|
15
|
-
// eslint-disable-next-line max-len
|
|
16
|
-
id: `${gtfsTrip.start_timestamp}_${gtfsTrip.route_id}_${runInput.trainSetNumberScheduled}_${runInput.trainSetNumberScheduled}_${runInput.trainNumber}`, origin_route_name: runInput.routeName, sequence_id: runInput.runNumber, vehicle_type_id: VehiclePositionsTripsModel_1.MPVRouteTypesEnum.METRO, wheelchair_accessible: true });
|
|
15
|
+
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), { id: VPTripsIdGenerator_1.default.generateFromMetroRun(gtfsTrip, runInput), origin_route_name: runInput.routeName, sequence_id: runInput.runNumber, vehicle_type_id: VehiclePositionsTripsModel_1.MPVRouteTypesEnum.METRO, wheelchair_accessible: true });
|
|
17
16
|
}
|
|
18
17
|
static getGTFSAttributes(gtfsTrip) {
|
|
19
18
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VPTripsMapper.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.ts"],"names":[],"mappings":";;;;;AAEA,sEAA8D;AAC9D,+DAA4E;AAG5E,8EAAqF;
|
|
1
|
+
{"version":3,"file":"VPTripsMapper.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.ts"],"names":[],"mappings":";;;;;AAEA,sEAA8D;AAC9D,+DAA4E;AAG5E,8EAAqF;AACrF,8EAAsD;AAEtD,MAAqB,aAAa;IACvB,MAAM,CAAC,iBAAiB,CAAC,QAA2B,EAAE,QAA8B;QACvF,uCACO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KACnC,EAAE,EAAE,4BAAkB,CAAC,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAChE,iBAAiB,EAAE,QAAQ,CAAC,QAAQ,EACpC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,EACjC,2BAA2B,EAAE,QAAQ,CAAC,mBAAmB,EACzD,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAClC,CAAC,QAAQ,CAAC,UAAU,EACpB,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EACpB,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EACvB,CAAC,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CACtC,EACD,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB,IACvD;IACN,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,QAA2B,EAAE,QAAqC;QAC7F,uCACO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KACnC,EAAE,EAAE,4BAAkB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC/D,iBAAiB,EAAE,QAAQ,CAAC,SAAS,EACrC,WAAW,EAAE,QAAQ,CAAC,SAAS,EAC/B,eAAe,EAAE,8CAAiB,CAAC,KAAK,EACxC,qBAAqB,EAAE,IAAI,IAC7B;IACN,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAAC,QAA2B;QACxD,OAAO;YACH,gBAAgB,EAAE,kBAAQ,CAAC,eAAe;YAC1C,qBAAqB,EAAE,kBAAQ,CAAC,eAAe;YAC/C,aAAa,EAAE,QAAQ,CAAC,QAAQ;YAChC,aAAa,EAAE,QAAQ,CAAC,QAAQ;YAChC,qBAAqB,EAAE,QAAQ,CAAC,gBAAgB;YAChD,eAAe,EAAE,QAAQ,CAAC,UAAU;YACpC,kBAAkB,EAAE,QAAQ,CAAC,aAAa;YAC1C,YAAY,EAAE,QAAQ,CAAC,OAAO;YAC9B,UAAU,EAAE,6BAAa,CAAC,mBAAmB,CAAC,QAAQ,CAAC,eAAe,CAAC;YACvE,eAAe,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE;YAC7D,aAAa,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE;SAC5D,CAAC;IACN,CAAC;;AA3CL,gCA+FC;AAlDkB,8BAAgB,GAAG,CAC9B,SAAiB,EACjB,OAAgB,EAChB,UAAmB,EACnB,YAAqB,EACf,EAAE;IACR,IAAI,EAAE,CAAC;IACP,QAAQ,SAAS,EAAE;QACf,KAAK,8CAAiB,CAAC,IAAI;YACvB,IAAI,OAAO,EAAE;gBACT,EAAE,GAAG,8CAAiB,CAAC,UAAU,CAAC;aACrC;iBAAM,IAAI,YAAY,EAAE;gBACrB,EAAE,GAAG,8CAAiB,CAAC,eAAe,CAAC;aAC1C;iBAAM;gBACH,EAAE,GAAG,8CAAiB,CAAC,IAAI,CAAC;aAC/B;YACD,MAAM;QACV,KAAK,8CAAiB,CAAC,KAAK;YACxB,EAAE,GAAG,8CAAiB,CAAC,KAAK,CAAC;YAC7B,MAAM;QACV,KAAK,8CAAiB,CAAC,KAAK;YACxB,EAAE,GAAG,8CAAiB,CAAC,KAAK,CAAC;YAC7B,MAAM;QACV,KAAK,8CAAiB,CAAC,GAAG;YACtB,IAAI,OAAO,IAAI,UAAU,EAAE;gBACvB,EAAE,GAAG,8CAAiB,CAAC,kBAAkB,CAAC;aAC7C;iBAAM,IAAI,OAAO,EAAE;gBAChB,EAAE,GAAG,8CAAiB,CAAC,SAAS,CAAC;aACpC;iBAAM,IAAI,UAAU,EAAE;gBACnB,EAAE,GAAG,8CAAiB,CAAC,YAAY,CAAC;aACvC;iBAAM,IAAI,YAAY,EAAE;gBACrB,EAAE,GAAG,8CAAiB,CAAC,cAAc,CAAC;aACzC;iBAAM;gBACH,EAAE,GAAG,8CAAiB,CAAC,QAAQ,CAAC;aACnC;YACD,MAAM;QACV,KAAK,8CAAiB,CAAC,KAAK;YACxB,EAAE,GAAG,8CAAiB,CAAC,KAAK,CAAC;YAC7B,MAAM;QACV,KAAK,8CAAiB,CAAC,SAAS;YAC5B,EAAE,GAAG,8CAAiB,CAAC,SAAS,CAAC;YACjC,MAAM;QACV,KAAK,8CAAiB,CAAC,UAAU;YAC7B,EAAE,GAAG,8CAAiB,CAAC,UAAU,CAAC;YAClC,MAAM;QACV;YACI,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KAC/C;IACD,OAAO,EAAE,CAAC;AACd,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.3.3-dev.
|
|
3
|
+
"version": "2.3.3-dev.685741706",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -73,7 +73,6 @@
|
|
|
73
73
|
"dependencies": {
|
|
74
74
|
"@golemio/ovapi-gtfs-realtime-bindings": "1.0.0",
|
|
75
75
|
"@turf/turf": "^6.5.0",
|
|
76
|
-
"JSONStream": "^1.3.5",
|
|
77
76
|
"cheap-ruler": "^2.5.1",
|
|
78
77
|
"csv-parser": "^3.0.0",
|
|
79
78
|
"csv-stringify": "^5.6.2",
|