@golemio/pid 2.4.1-dev.754751981 → 2.4.1-dev.754936953
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/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.d.ts +1 -3
- package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.js +4 -13
- package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,7 +12,6 @@ export declare abstract class AbstractGTFSTripRunManager {
|
|
|
12
12
|
protected readonly runTripsRedisRepository: RunTripsRedisRepository;
|
|
13
13
|
protected readonly testMode: boolean;
|
|
14
14
|
private turnaroundEstimateInSeconds;
|
|
15
|
-
private nodeExtractRegex;
|
|
16
15
|
constructor(positionsRepository: VehiclePositionsPositionsModel, tripsRepository: VehiclePositionsTripsModel, runsRepository: VehiclePositionsRunsModel, runTripsRedisRepository: RunTripsRedisRepository, testMode?: boolean);
|
|
17
16
|
abstract generateDelayMsg(schedule: IGtfsRunTripCache[], input: IVehiclePositionsRunCommon | IMetroRunInputForProcessing): Promise<IDelayMessage>;
|
|
18
17
|
setAndReturnScheduledTrips: (scheduleData: IVehiclePositionsSchedule) => Promise<IGtfsRunTripCache[]>;
|
|
@@ -23,6 +22,5 @@ export declare abstract class AbstractGTFSTripRunManager {
|
|
|
23
22
|
*/
|
|
24
23
|
protected getAdjacentTrips(schedule: IGtfsRunTripCache[], timestampScheduled: Moment, currentTripId: string | undefined): IGtfsRunTripCache[];
|
|
25
24
|
private isTripAdjacent;
|
|
26
|
-
private
|
|
27
|
-
private getNodeId;
|
|
25
|
+
private isSameStop;
|
|
28
26
|
}
|
|
@@ -25,7 +25,6 @@ class AbstractGTFSTripRunManager {
|
|
|
25
25
|
this.runsRepository = runsRepository;
|
|
26
26
|
this.runTripsRedisRepository = runTripsRedisRepository;
|
|
27
27
|
this.testMode = testMode;
|
|
28
|
-
this.nodeExtractRegex = /^U(?<nodeId>\d+)Z?\d*P?$/; // extracts 321 from stopId U321Z6P
|
|
29
28
|
this.setAndReturnScheduledTrips = (scheduleData) => __awaiter(this, void 0, void 0, function* () {
|
|
30
29
|
const { route_id, run_number, msg_last_timestamp } = scheduleData;
|
|
31
30
|
const scheduledTripIds = yield this.runTripsRedisRepository.get(`${route_id}_${run_number}`);
|
|
@@ -37,24 +36,16 @@ class AbstractGTFSTripRunManager {
|
|
|
37
36
|
const trip = scheduledTrips[index];
|
|
38
37
|
trip.start_timestamp = DateTimeUtils_1.DateTimeUtils.formatSQLTimestamp(trip.start_timestamp);
|
|
39
38
|
trip.end_timestamp = DateTimeUtils_1.DateTimeUtils.formatSQLTimestamp(trip.end_timestamp);
|
|
40
|
-
trip.requiredTurnaroundSeconds = this.
|
|
41
|
-
? this.turnaroundEstimateInSeconds
|
|
42
|
-
: 0;
|
|
39
|
+
trip.requiredTurnaroundSeconds = this.isSameStop(trip, scheduledTrips, index) ? 0 : this.turnaroundEstimateInSeconds;
|
|
43
40
|
}
|
|
44
41
|
yield this.runTripsRedisRepository.set(`${route_id}_${run_number}`, { schedule: scheduledTrips }, undefined, vehicle_positions_1.VehiclePositionsUtils.getNextExpireTimestamp());
|
|
45
42
|
return scheduledTrips;
|
|
46
43
|
});
|
|
47
|
-
this.
|
|
44
|
+
this.isSameStop = (trip, scheduledTrips, index) => {
|
|
48
45
|
if (index === 0) {
|
|
49
|
-
return
|
|
46
|
+
return true;
|
|
50
47
|
}
|
|
51
|
-
|
|
52
|
-
const nextTripFirstNode = this.getNodeId(scheduledTrips[index - 1].last_stop_id);
|
|
53
|
-
return currentTripLastNode && currentTripLastNode === nextTripFirstNode;
|
|
54
|
-
};
|
|
55
|
-
this.getNodeId = (stopId) => {
|
|
56
|
-
var _a, _b;
|
|
57
|
-
return (_b = (_a = this.nodeExtractRegex.exec(stopId)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.nodeId;
|
|
48
|
+
return trip.first_stop_id === scheduledTrips[index - 1].last_stop_id;
|
|
58
49
|
};
|
|
59
50
|
this.turnaroundEstimateInSeconds = (_a = config_1.config.vehiclePositions.turnaroundTimeInSeconds) !== null && _a !== void 0 ? _a : 30;
|
|
60
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractGTFSTripRunManager.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAyF;AAUzF,yEAAsE;AACtE,gGAA2E;AAC3E,oDAAiD;AAGjD,MAAsB,0BAA0B;
|
|
1
|
+
{"version":3,"file":"AbstractGTFSTripRunManager.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.ts"],"names":[],"mappings":"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"}
|