@golemio/pid 2.11.5-dev.1146592586 → 2.11.5-dev.1149335142
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/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.js +4 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.js +1 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.js.map +1 -1
- package/package.json +1 -1
|
@@ -18,7 +18,7 @@ class CommonDelayAtStop extends AbstractDelayAtStop_1.default {
|
|
|
18
18
|
if (this.didVehicleArrive(position)) {
|
|
19
19
|
context.lastPositionLastStop.arrival_delay = (_c = positionToUpdate === null || positionToUpdate === void 0 ? void 0 : positionToUpdate.delay_stop_arrival) !== null && _c !== void 0 ? _c : context.lastPositionDelay;
|
|
20
20
|
}
|
|
21
|
-
else if (this.didVehicleDepart(position)) {
|
|
21
|
+
else if (this.didVehicleDepart(position, context)) {
|
|
22
22
|
context.lastPositionLastStop.departure_delay = (_d = positionToUpdate === null || positionToUpdate === void 0 ? void 0 : positionToUpdate.delay_stop_departure) !== null && _d !== void 0 ? _d : context.lastPositionDelay;
|
|
23
23
|
}
|
|
24
24
|
return context;
|
|
@@ -35,7 +35,7 @@ class CommonDelayAtStop extends AbstractDelayAtStop_1.default {
|
|
|
35
35
|
if (this.didVehicleArrive(position)) {
|
|
36
36
|
positionToUpdate.delay_stop_arrival = this.calcDelayAtStop(position.origin_timestamp.getTime(), positionToUpdate.last_stop_arrival_time);
|
|
37
37
|
}
|
|
38
|
-
else if (this.didVehicleDepart(position)) {
|
|
38
|
+
else if (this.didVehicleDepart(position, context)) {
|
|
39
39
|
positionToUpdate.delay_stop_departure = this.calcDelayAtStop(position.origin_timestamp.getTime(), positionToUpdate.last_stop_departure_time);
|
|
40
40
|
}
|
|
41
41
|
return this.updatePositionStopDelays(positionToUpdate, context);
|
|
@@ -46,8 +46,8 @@ class CommonDelayAtStop extends AbstractDelayAtStop_1.default {
|
|
|
46
46
|
didVehicleArrive(position) {
|
|
47
47
|
return position.tcp_event === const_1.TCPEventEnum.ARRIVAL_ANNOUNCED;
|
|
48
48
|
}
|
|
49
|
-
didVehicleDepart(position) {
|
|
50
|
-
return position.tcp_event === const_1.TCPEventEnum.DEPARTURED;
|
|
49
|
+
didVehicleDepart(position, context) {
|
|
50
|
+
return position.tcp_event === const_1.TCPEventEnum.DEPARTURED && context.lastPositionLastStop.departure_delay === null;
|
|
51
51
|
}
|
|
52
52
|
updatePositionStopDelays(positionToUpdate, context) {
|
|
53
53
|
const { delay_stop_arrival, delay_stop_departure } = positionToUpdate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.ts"],"names":[],"mappings":";;;;;AAGA,sDAA4D;AAC5D,gFAAwD;AAExD,MAAqB,iBAAkB,SAAQ,6BAAmB;IACvD,aAAa,CAChB,OAAoC,EACpC,gBAA0C,EAC1C,QAAoC;;QAEpC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;YACrD,OAAO,OAAO,CAAC;SAClB;QAED,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAEjE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,EAAE;YACxC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,GAAG,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,mCAAI,IAAI,CAAC;SACxH;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACjC,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,mCAAI,OAAO,CAAC,iBAAiB,CAAC;SAClH;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"CommonDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ class PropagateTrainDelayTask extends AbstractPropagateDelayTask_1.AbstractPropa
|
|
|
33
33
|
order: [["start_timestamp", "ASC"]],
|
|
34
34
|
raw: true,
|
|
35
35
|
});
|
|
36
|
-
return trip.gtfs_trip_id;
|
|
36
|
+
return trip === null || trip === void 0 ? void 0 : trip.gtfs_trip_id;
|
|
37
37
|
});
|
|
38
38
|
this.logger = ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.Logger);
|
|
39
39
|
this.blockStopsRepository = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.BlockStopsRedisRepository);
|
|
@@ -47,7 +47,6 @@ class PropagateTrainDelayTask extends AbstractPropagateDelayTask_1.AbstractPropa
|
|
|
47
47
|
const { gtfs_trip_id, gtfs_block_id, vehicle_registration_number, start_timestamp, end_timestamp } = delayedPositions.trip;
|
|
48
48
|
try {
|
|
49
49
|
const nextGtfsTripId = yield this.getNextGtfsTripId(gtfs_block_id, start_timestamp);
|
|
50
|
-
// if list trip in the block there is nothing to propagate
|
|
51
50
|
if (!nextGtfsTripId) {
|
|
52
51
|
continue;
|
|
53
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropagateTrainDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,sDAA2D;AAC3D,gGAAqF;AAErF,wEAAqE;AAErE,mEAAuF;AACvF,mEAAyD;AAGzD,mFAAqF;AACrF,sFAAmF;AAEnF,MAAa,uBAAwB,SAAQ,uDAAqD;IAU9F,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,qBAAqB,CAAC;QAClC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,0DAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"PropagateTrainDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.ts"],"names":[],"mappings":"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"}
|