@golemio/pid 2.7.12-dev.936705487 → 2.7.12-dev.938565701
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/migrations/postgresql/20230720075810-preset-column-positions.js +53 -0
- package/db/migrations/postgresql/sqls/20230720075810-preset-column-positions-down.sql +62 -0
- package/db/migrations/postgresql/sqls/20230720075810-preset-column-positions-up.sql +61 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.js +9 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js +5 -9
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.js +5 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/interfaces/ITimeWindow.d.ts +4 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/interfaces/ITimeWindow.js +2 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/interfaces/ITimeWindow.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var dbm;
|
|
4
|
+
var type;
|
|
5
|
+
var seed;
|
|
6
|
+
var fs = require('fs');
|
|
7
|
+
var path = require('path');
|
|
8
|
+
var Promise;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* We receive the dbmigrate dependency from dbmigrate initially.
|
|
12
|
+
* This enables us to not have to rely on NODE_PATH.
|
|
13
|
+
*/
|
|
14
|
+
exports.setup = function(options, seedLink) {
|
|
15
|
+
dbm = options.dbmigrate;
|
|
16
|
+
type = dbm.dataType;
|
|
17
|
+
seed = seedLink;
|
|
18
|
+
Promise = options.Promise;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
exports.up = function(db) {
|
|
22
|
+
var filePath = path.join(__dirname, 'sqls', '20230720075810-preset-column-positions-up.sql');
|
|
23
|
+
return new Promise( function( resolve, reject ) {
|
|
24
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
25
|
+
if (err) return reject(err);
|
|
26
|
+
console.log('received data: ' + data);
|
|
27
|
+
|
|
28
|
+
resolve(data);
|
|
29
|
+
});
|
|
30
|
+
})
|
|
31
|
+
.then(function(data) {
|
|
32
|
+
return db.runSql(data);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
exports.down = function(db) {
|
|
37
|
+
var filePath = path.join(__dirname, 'sqls', '20230720075810-preset-column-positions-down.sql');
|
|
38
|
+
return new Promise( function( resolve, reject ) {
|
|
39
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
40
|
+
if (err) return reject(err);
|
|
41
|
+
console.log('received data: ' + data);
|
|
42
|
+
|
|
43
|
+
resolve(data);
|
|
44
|
+
});
|
|
45
|
+
})
|
|
46
|
+
.then(function(data) {
|
|
47
|
+
return db.runSql(data);
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
exports._meta = {
|
|
52
|
+
"version": 1
|
|
53
|
+
};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
DROP VIEW IF EXISTS analytic.v_ropid_departure_boards;
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
alter table ropid_departures_presets rename to ropid_departures_presets_old;
|
|
5
|
+
CREATE TABLE ropid_departures_presets (
|
|
6
|
+
id integer DEFAULT nextval('ropid_departures_presets_id_seq'::regclass) NOT NULL,
|
|
7
|
+
route_name character varying(100) NOT NULL,
|
|
8
|
+
api_version smallint NOT NULL,
|
|
9
|
+
route character varying(100) NOT NULL,
|
|
10
|
+
url_query_params character varying(400),
|
|
11
|
+
note character varying(1000) NOT NULL,
|
|
12
|
+
|
|
13
|
+
create_batch_id bigint,
|
|
14
|
+
created_at timestamp with time zone,
|
|
15
|
+
created_by character varying(150),
|
|
16
|
+
update_batch_id bigint,
|
|
17
|
+
updated_at timestamp with time zone,
|
|
18
|
+
updated_by character varying(150),
|
|
19
|
+
|
|
20
|
+
is_testing boolean not null default false,
|
|
21
|
+
|
|
22
|
+
CONSTRAINT ropid_departures_presets_pkey PRIMARY KEY (id)
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
create unique index ropid_departures_presets_unique_idx on ropid_departures_presets (route_name);
|
|
26
|
+
insert into ropid_departures_presets (route_name, api_version, route, url_query_params, note, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, is_testing)
|
|
27
|
+
select route_name, api_version, route, url_query_params, note, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, is_testing
|
|
28
|
+
from ropid_departures_presets_old;
|
|
29
|
+
|
|
30
|
+
drop table ropid_departures_presets_old;
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
CREATE OR REPLACE VIEW analytic.v_ropid_departure_boards
|
|
34
|
+
AS SELECT final.lon,
|
|
35
|
+
final.lat,
|
|
36
|
+
final.route_name,
|
|
37
|
+
final.note,
|
|
38
|
+
final.stop_correct,
|
|
39
|
+
count(1) OVER (PARTITION BY (split_part(final.stop_correct, '/'::text, 1))) AS n_ceduli,
|
|
40
|
+
final.alt_idos_name
|
|
41
|
+
FROM ( SELECT stops.lon,
|
|
42
|
+
stops.lat,
|
|
43
|
+
tab.route_name,
|
|
44
|
+
tab.note,
|
|
45
|
+
tab.stop_correct,
|
|
46
|
+
stops.alt_idos_name,
|
|
47
|
+
row_number() OVER (PARTITION BY tab.note) AS n_duplicit
|
|
48
|
+
FROM ( SELECT rdp.route_name,
|
|
49
|
+
rdp.note,
|
|
50
|
+
CASE
|
|
51
|
+
WHEN rdp.url_query_params::text ~~ '%aswIds%'::text THEN replace("substring"(rdp.url_query_params::text, 'aswIds[^=]*?=(.+?(?=&|$))'::text), '_'::text, '/'::text)
|
|
52
|
+
WHEN rdp.url_query_params::text ~~ '%cisIds%'::text THEN "substring"(rdp.url_query_params::text, 'cisIds[^=]*?=(.+?(?=&|$))'::text)
|
|
53
|
+
ELSE NULL::text
|
|
54
|
+
END AS stop_correct
|
|
55
|
+
FROM ropid_departures_presets rdp) tab
|
|
56
|
+
LEFT JOIN ropidgtfs_cis_stops stops ON
|
|
57
|
+
CASE
|
|
58
|
+
WHEN tab.stop_correct ~~ '%/%'::text THEN tab.stop_correct = stops.id::text
|
|
59
|
+
ELSE tab.stop_correct = split_part(stops.id::text, '/'::text, 1)
|
|
60
|
+
END OR tab.stop_correct = stops.cis::text) final
|
|
61
|
+
WHERE final.n_duplicit = 1
|
|
62
|
+
ORDER BY final.stop_correct;
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
DROP VIEW IF EXISTS analytic.v_ropid_departure_boards;
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
alter table ropid_departures_presets rename to ropid_departures_presets_old;
|
|
5
|
+
CREATE TABLE ropid_departures_presets (
|
|
6
|
+
id integer DEFAULT nextval('ropid_departures_presets_id_seq'::regclass) NOT NULL,
|
|
7
|
+
route_name character varying(100) NOT NULL,
|
|
8
|
+
api_version smallint NOT NULL,
|
|
9
|
+
route character varying(100) NOT NULL,
|
|
10
|
+
url_query_params character varying(400),
|
|
11
|
+
note character varying(1000) NOT NULL,
|
|
12
|
+
is_testing boolean not null default false,
|
|
13
|
+
|
|
14
|
+
create_batch_id bigint,
|
|
15
|
+
created_at timestamp with time zone,
|
|
16
|
+
created_by character varying(150),
|
|
17
|
+
update_batch_id bigint,
|
|
18
|
+
updated_at timestamp with time zone,
|
|
19
|
+
updated_by character varying(150),
|
|
20
|
+
|
|
21
|
+
CONSTRAINT ropid_departures_presets_new_pkey PRIMARY KEY (id)
|
|
22
|
+
);
|
|
23
|
+
|
|
24
|
+
create unique index ropid_departures_presets_new_unique_idx on ropid_departures_presets (route_name);
|
|
25
|
+
insert into ropid_departures_presets (route_name, api_version, route, url_query_params, note, is_testing, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by)
|
|
26
|
+
select route_name, api_version, route, url_query_params, note, is_testing, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by
|
|
27
|
+
from ropid_departures_presets_old;
|
|
28
|
+
|
|
29
|
+
drop table ropid_departures_presets_old;
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
CREATE OR REPLACE VIEW analytic.v_ropid_departure_boards
|
|
33
|
+
AS SELECT final.lon,
|
|
34
|
+
final.lat,
|
|
35
|
+
final.route_name,
|
|
36
|
+
final.note,
|
|
37
|
+
final.stop_correct,
|
|
38
|
+
count(1) OVER (PARTITION BY (split_part(final.stop_correct, '/'::text, 1))) AS n_ceduli,
|
|
39
|
+
final.alt_idos_name
|
|
40
|
+
FROM ( SELECT stops.lon,
|
|
41
|
+
stops.lat,
|
|
42
|
+
tab.route_name,
|
|
43
|
+
tab.note,
|
|
44
|
+
tab.stop_correct,
|
|
45
|
+
stops.alt_idos_name,
|
|
46
|
+
row_number() OVER (PARTITION BY tab.note) AS n_duplicit
|
|
47
|
+
FROM ( SELECT rdp.route_name,
|
|
48
|
+
rdp.note,
|
|
49
|
+
CASE
|
|
50
|
+
WHEN rdp.url_query_params::text ~~ '%aswIds%'::text THEN replace("substring"(rdp.url_query_params::text, 'aswIds[^=]*?=(.+?(?=&|$))'::text), '_'::text, '/'::text)
|
|
51
|
+
WHEN rdp.url_query_params::text ~~ '%cisIds%'::text THEN "substring"(rdp.url_query_params::text, 'cisIds[^=]*?=(.+?(?=&|$))'::text)
|
|
52
|
+
ELSE NULL::text
|
|
53
|
+
END AS stop_correct
|
|
54
|
+
FROM ropid_departures_presets rdp) tab
|
|
55
|
+
LEFT JOIN ropidgtfs_cis_stops stops ON
|
|
56
|
+
CASE
|
|
57
|
+
WHEN tab.stop_correct ~~ '%/%'::text THEN tab.stop_correct = stops.id::text
|
|
58
|
+
ELSE tab.stop_correct = split_part(stops.id::text, '/'::text, 1)
|
|
59
|
+
END OR tab.stop_correct = stops.cis::text) final
|
|
60
|
+
WHERE final.n_duplicit = 1
|
|
61
|
+
ORDER BY final.stop_correct;
|
|
@@ -26,6 +26,7 @@ export declare abstract class AbstractGTFSTripRunManager {
|
|
|
26
26
|
* originally based on route id and run number
|
|
27
27
|
*/
|
|
28
28
|
protected getAdjacentTrips(schedule: IScheduleDto[], timestampScheduled: Moment, currentTripId: string | undefined): IScheduleDto[];
|
|
29
|
-
protected abstract
|
|
29
|
+
protected abstract getAdjacentTripTimeWindow(): ITimeWindow;
|
|
30
|
+
private isTripAdjacent;
|
|
30
31
|
private isSameStop;
|
|
31
32
|
}
|
|
@@ -69,6 +69,15 @@ class AbstractGTFSTripRunManager {
|
|
|
69
69
|
getAdjacentTrips(schedule, timestampScheduled, currentTripId) {
|
|
70
70
|
return schedule.filter((scheduledTrip) => scheduledTrip.trip_id !== currentTripId && this.isTripAdjacent(scheduledTrip, timestampScheduled.valueOf()));
|
|
71
71
|
}
|
|
72
|
+
isTripAdjacent(scheduledTrip, messageScheduledTimestamp) {
|
|
73
|
+
const { startTimeWindowInMinutes, endTimeWindowInMinutes } = this.getAdjacentTripTimeWindow();
|
|
74
|
+
const startTimestamp = new Date(scheduledTrip.start_timestamp).getTime();
|
|
75
|
+
const endTimestamp = new Date(scheduledTrip.end_timestamp).getTime();
|
|
76
|
+
const leftBound = messageScheduledTimestamp - endTimeWindowInMinutes * 60 * 1000;
|
|
77
|
+
const rightBound = messageScheduledTimestamp + startTimeWindowInMinutes * 60 * 1000;
|
|
78
|
+
return ((leftBound <= endTimestamp && endTimestamp <= messageScheduledTimestamp) ||
|
|
79
|
+
(rightBound >= startTimestamp && startTimestamp >= messageScheduledTimestamp));
|
|
80
|
+
}
|
|
72
81
|
}
|
|
73
82
|
exports.AbstractGTFSTripRunManager = AbstractGTFSTripRunManager;
|
|
74
83
|
//# sourceMappingURL=AbstractGTFSTripRunManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractGTFSTripRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,wEAAqE;AACrE,yEAAsE;AACtE,mEAAuF;AAGvF,oDAAiD;AACjD,wCAAqC;AAIrC,MAAsB,0BAA0B;IAI5C,YACuB,mBAAwC,EACxC,eAAgC,EAChC,cAAoC,EACpC,uBAAgD,EAChD,WAAoB,KAAK;;QAJzB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAsB;QACpC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,aAAQ,GAAR,QAAQ,CAAiB;QAWzC,+BAA0B,GAAG,CAAO,YAAuC,EAA2B,EAAE;YAC3G,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,YAAY,CAAC;YAClE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,QAAQ,IAAI,UAAU,EAAE,CAAC,CAAC;YAC7F,IAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,EAAE;gBAC5B,OAAO,gBAAgB,CAAC,QAAQ,CAAC;aACpC;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;YAE7G,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBACxD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;gBACnC,IAAI,CAAC,eAAe,GAAG,6BAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC9E,IAAI,CAAC,aAAa,GAAG,6BAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAE1E,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC;aACxH;YAED,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAClC,GAAG,QAAQ,IAAI,UAAU,EAAE,EAC3B,EAAE,QAAQ,EAAE,cAAc,EAAE,EAC5B,SAAS,EACT,iBAAO,CAAC,sBAAsB,EAAE,CACnC,CAAC;YAEF,OAAO,cAAc,CAAC;QAC1B,CAAC,CAAA,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractGTFSTripRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { AbstractGTFSTripRunManager } from "./AbstractGTFSTripRunManager";
|
|
|
4
4
|
import { IDelayMessage } from "./interfaces/IDelayMessage";
|
|
5
5
|
export declare class GTFSTripCommonRunManager extends AbstractGTFSTripRunManager {
|
|
6
6
|
generateDelayMsg(schedule: IScheduleDto[], input: IUpdateRunsGtfsTripInput): Promise<IDelayMessage>;
|
|
7
|
-
protected
|
|
7
|
+
protected getAdjacentTripTimeWindow(): ITimeWindow;
|
|
8
8
|
private generateDelayMsgFromCurrentTrip;
|
|
9
9
|
private isCurrentTripTracking;
|
|
10
10
|
private updateLastTripsAndPositions;
|
|
@@ -38,15 +38,11 @@ class GTFSTripCommonRunManager extends AbstractGTFSTripRunManager_1.AbstractGTFS
|
|
|
38
38
|
return this.updateLastTripsAndPositions(schedule, timestampScheduled, currentTrip === null || currentTrip === void 0 ? void 0 : currentTrip.trip_id, input, delayMsg);
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const leftBound = messageScheduledTimestamp - endTimeWindowInMinutes * 60 * 1000;
|
|
47
|
-
const rightBound = messageScheduledTimestamp + startTimeWindowInMinutes * 60 * 1000;
|
|
48
|
-
return ((leftBound <= endTimestamp && endTimestamp <= messageScheduledTimestamp) ||
|
|
49
|
-
(rightBound >= startTimestamp && startTimestamp >= messageScheduledTimestamp));
|
|
41
|
+
getAdjacentTripTimeWindow() {
|
|
42
|
+
return {
|
|
43
|
+
startTimeWindowInMinutes: this.config.getValue("old.datasources.pid.vehicle-positions.adjacentTrips.common.startTimeWindowInMinutes", 60),
|
|
44
|
+
endTimeWindowInMinutes: this.config.getValue("old.datasources.pid.vehicle-positions.adjacentTrips.common.endTimeWindowInMinutes", 15),
|
|
45
|
+
};
|
|
50
46
|
}
|
|
51
47
|
generateDelayMsgFromCurrentTrip(delayMsg, gtfsCurrentTrip, timestampScheduled, input) {
|
|
52
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSTripCommonRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,8EAA4D;AAC5D,gGAA2E;AAC3E,mDAAyC;AACzC,6EAA+D;AAE/D,6EAA0E;AAG1E,MAAa,wBAAyB,SAAQ,uDAA0B;IACvD,gBAAgB,CAAC,QAAwB,EAAE,KAA+B;;YACnF,MAAM,kBAAkB,GAAG,IAAA,yBAAM,EAAC,KAAK,CAAC,WAAW,CAAC,+BAA+B,CAAC,CAAC;YACrF,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YAC5E,IAAI,QAAQ,GAAkB;gBAC1B,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE;gBACb,QAAQ;aACX,CAAC;YAEF,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE;gBACtB,QAAQ,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;aAC3G;iBAAM;gBACH,wBAAG,CAAC,OAAO,CAAC,qEAAqE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aAC7G;YAED,8BAA8B;YAC9B,OAAO,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjH,CAAC;KAAA;IAES,
|
|
1
|
+
{"version":3,"file":"GTFSTripCommonRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { AbstractGTFSTripRunManager } from "./AbstractGTFSTripRunManager";
|
|
|
4
4
|
import { IDelayMessage } from "./interfaces/IDelayMessage";
|
|
5
5
|
export declare class GTFSTripMetroRunManager extends AbstractGTFSTripRunManager {
|
|
6
6
|
generateDelayMsg(schedule: IScheduleDto[], input: IMetroRunInputForProcessing): Promise<IDelayMessage>;
|
|
7
|
-
protected
|
|
7
|
+
protected getAdjacentTripTimeWindow(): ITimeWindow;
|
|
8
8
|
private generateDelayMsgFromCurrentTrip;
|
|
9
9
|
private updateLastTripsAndPositions;
|
|
10
10
|
private updateTrip;
|
|
@@ -36,11 +36,11 @@ class GTFSTripMetroRunManager extends AbstractGTFSTripRunManager_1.AbstractGTFST
|
|
|
36
36
|
return this.updateLastTripsAndPositions(schedule, timestampScheduled, currentTrip === null || currentTrip === void 0 ? void 0 : currentTrip.trip_id, input, delayMsg);
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
39
|
+
getAdjacentTripTimeWindow() {
|
|
40
|
+
return {
|
|
41
|
+
startTimeWindowInMinutes: this.config.getValue("old.datasources.pid.vehicle-positions.adjacentTrips.metro.startTimeWindowInMinutes", 15),
|
|
42
|
+
endTimeWindowInMinutes: this.config.getValue("old.datasources.pid.vehicle-positions.adjacentTrips.metro.endTimeWindowInMinutes", 2),
|
|
43
|
+
};
|
|
44
44
|
}
|
|
45
45
|
generateDelayMsgFromCurrentTrip(delayMsg, gtfsCurrentTrip, input) {
|
|
46
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSTripMetroRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,8EAA4D;AAC5D,gGAA2E;AAC3E,6EAA0E;AAG1E,MAAa,uBAAwB,SAAQ,uDAA0B;IACtD,gBAAgB,CAAC,QAAwB,EAAE,KAAkC;;YACtF,MAAM,kBAAkB,GAAG,IAAA,yBAAM,EAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YAC5E,IAAI,QAAQ,GAAkB;gBAC1B,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE;gBACb,QAAQ;aACX,CAAC;YAEF,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE;gBACtB,QAAQ,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;aACvF;iBAAM;gBACH,wBAAG,CAAC,OAAO,CAAC,oEAAoE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aAC5G;YAED,8BAA8B;YAC9B,OAAO,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjH,CAAC;KAAA;IAES,
|
|
1
|
+
{"version":3,"file":"GTFSTripMetroRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ITimeWindow.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/interfaces/ITimeWindow.ts"],"names":[],"mappings":""}
|