@golemio/pid 2.7.2-dev.871263965 → 2.7.2-dev.872515006
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/02_pid_line_example_115.sql +8 -8
- package/db/example/03_ropidgtfs_dump.sql +7 -7
- package/db/example/05_vehicle_positions_dump.sql +25 -25
- package/db/example/08_update_delay_dump.sql +106 -106
- package/db/example/10_cancelledTrip_example.sql +2 -2
- package/db/example/12_metro_line_A_gtfs_trips.sql +12 -12
- package/db/example/13_http-propagate-delay.sql +12 -12
- package/db/example/14_nightDelays.sql +3 -3
- package/db/migrations/postgresql/20230517133728-replace-bigint-timestamps.js +53 -0
- package/db/migrations/postgresql/sqls/20230517133728-replace-bigint-timestamps-down.sql +235 -0
- package/db/migrations/postgresql/sqls/20230517133728-replace-bigint-timestamps-up.sql +235 -0
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.js +5 -5
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js +7 -8
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts +6 -6
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +12 -12
- 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/helpers/PositionsMapper.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/PositionsMapper.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/PositionsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.js +6 -7
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DateTimeUtils.d.ts +0 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DateTimeUtils.js +0 -6
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DateTimeUtils.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js +29 -28
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/ValidToCalculator.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/ValidToCalculator.js +5 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/ValidToCalculator.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/MetroDelayAtStop.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/MetroDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.js +4 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.d.ts +2 -2
- 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 +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js +1 -1
- 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/interfaces/IUpdateRunsGtfsTripInput.d.ts +10 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/{helpers/interfaces/IGtfsRtRecord.js → interfaces/IUpdateRunsGtfsTripInput.js} +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/IUpdateRunsGtfsTripInput.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/TransformationInterfaces.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/VPInterfaces.d.ts +13 -13
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/schema/UpdateRunsGtfsTripIdSchema.d.ts +3 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/schema/UpdateRunsGtfsTripIdSchema.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PositionsTransformation.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PositionsTransformation.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PositionsTransformation.js.map +1 -1
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js +1 -1
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js.map +1 -1
- package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.d.ts +12 -6
- package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.js.map +1 -1
- package/dist/output-gateway/shared/RopidRouterUtils.d.ts +1 -1
- package/dist/output-gateway/shared/RopidRouterUtils.js +3 -5
- package/dist/output-gateway/shared/RopidRouterUtils.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.d.ts +2 -2
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js +4 -2
- 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 +2 -2
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.js +6 -4
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.d.ts +7 -7
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js +19 -14
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js +6 -4
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunWithMessageDto.d.ts +6 -0
- package/dist/{integration-engine/vehicle-positions/workers/runs/interfaces/ICommonRunWithMessage.js → schema-definitions/vehicle-positions/models/interfaces/ICommonRunWithMessageDto.js} +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunWithMessageDto.js.map +1 -0
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunsMessagesModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IGtfsRtTripDto.d.ts +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IPositionDto.d.ts +7 -7
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IVPTripsModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IVPTripsPositionAttributes.d.ts +9 -9
- package/package.json +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/interfaces/ICommonRunWithMessage.d.ts +0 -6
- package/dist/integration-engine/vehicle-positions/workers/runs/interfaces/ICommonRunWithMessage.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/interfaces/IGtfsRtRecord.d.ts +0 -34
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/interfaces/IGtfsRtRecord.js.map +0 -1
|
@@ -108,11 +108,10 @@ class RawQueryProvider {
|
|
|
108
108
|
start_cis_stop_id,
|
|
109
109
|
start_asw_stop_id,
|
|
110
110
|
start_timestamp,
|
|
111
|
-
|
|
112
|
-
DATE_TRUNC('day',
|
|
113
|
-
|
|
114
|
-
DATE_TRUNC('day',
|
|
115
|
-
extract(isodow from DATE_TRUNC('day', TO_TIMESTAMP(start_timestamp/1000)) - INTERVAL '1 day')
|
|
111
|
+
DATE_TRUNC('day', start_timestamp) AS start_date,
|
|
112
|
+
extract(isodow from DATE_TRUNC('day', start_timestamp)) AS start_date_name,
|
|
113
|
+
DATE_TRUNC('day', start_timestamp) - INTERVAL '1 day' AS start_date_day_before,
|
|
114
|
+
extract(isodow from DATE_TRUNC('day', start_timestamp) - INTERVAL '1 day')
|
|
116
115
|
AS start_date_day_before_name
|
|
117
116
|
FROM "${const_1.PG_SCHEMA}".vehiclepositions_trips
|
|
118
117
|
WHERE id = $tripId
|
|
@@ -232,8 +231,8 @@ class RawQueryProvider {
|
|
|
232
231
|
gtfs_trip.route_type as gtfs_route_type,
|
|
233
232
|
gtfs_trip.trip_headsign as gtfs_trip_headsign,
|
|
234
233
|
gtfs_trip.start_timestamp::time at time zone '${DateTimeUtils_1.DateTimeUtils.TIMEZONE}' as start_time,
|
|
235
|
-
|
|
236
|
-
|
|
234
|
+
gtfs_trip.start_timestamp,
|
|
235
|
+
gtfs_trip.end_timestamp,
|
|
237
236
|
gtfs_trip.run_number as internal_run_number,
|
|
238
237
|
gtfs_trip.origin_route_name as internal_route_name
|
|
239
238
|
from "${const_1.PG_SCHEMA}".${TripWithLastPositionModel_1.TripWithLastPositionModel.tableName} vp_trip_with_position
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AAAA,sEAAuC;AACvC,+GAA4E;AAC5E,6GAA0E;AAC1E,6IAA0G;AAC1G,mDAA8C;AAC9C,+DAA4D;AAE5D,MAAa,gBAAgB;IAClB,MAAM,CAAC,yBAAyB,CAAC,MAAc;QAClD,OAAO,gCAAgC,iBAAS,KAAK,2BAAY,CAAC,UAAU,cAAc,MAAM,iBAAiB,CAAC;IACtH,CAAC;IAEM,MAAM,CAAC,2BAA2B;QACrC,OAAO;;;;;;;oBAOK,iBAAS,KAAK,2BAAY,CAAC,UAAU;;SAEhD,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,2BAA2B,CAAC,gBAAwB,EAAE,yBAAiC;QACjG,4BAA4B;QAC5B,OAAO;;mBAEI,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;oBACR,iBAAS;0BACH,iBAAS,0BAA0B,iBAAS;0BAC5C,iBAAS,8BAA8B,iBAAS;yBACjD,iBAAS;sBACZ,iBAAS;;yBAEN,iBAAS,qDAAqD,iBAAS;;iBAE/E,iBAAS;;wBAEF,iBAAS;;;mBAGd,iBAAS;qCACS,iBAAS;;kEAEoB,iBAAS;;oCAEvC,iBAAS;;;;;;;;;;;;;;uBActB,iBAAS;8CACc,iBAAS;4BAC3B,gBAAgB;;;oDAGQ,iBAAS;;;qDAGR,iBAAS;;;;;uBAKvC,iBAAS;8CACc,iBAAS;4BAC3B,yBAAyB;;;oDAGD,iBAAS;;;qDAGR,iBAAS;;;;;;;SAOrD,CAAC;QACF,2BAA2B;IAC/B,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,4BAA4B;QAC5B,OAAO
|
|
1
|
+
{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AAAA,sEAAuC;AACvC,+GAA4E;AAC5E,6GAA0E;AAC1E,6IAA0G;AAC1G,mDAA8C;AAC9C,+DAA4D;AAE5D,MAAa,gBAAgB;IAClB,MAAM,CAAC,yBAAyB,CAAC,MAAc;QAClD,OAAO,gCAAgC,iBAAS,KAAK,2BAAY,CAAC,UAAU,cAAc,MAAM,iBAAiB,CAAC;IACtH,CAAC;IAEM,MAAM,CAAC,2BAA2B;QACrC,OAAO;;;;;;;oBAOK,iBAAS,KAAK,2BAAY,CAAC,UAAU;;SAEhD,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,2BAA2B,CAAC,gBAAwB,EAAE,yBAAiC;QACjG,4BAA4B;QAC5B,OAAO;;mBAEI,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;oBACR,iBAAS;0BACH,iBAAS,0BAA0B,iBAAS;0BAC5C,iBAAS,8BAA8B,iBAAS;yBACjD,iBAAS;sBACZ,iBAAS;;yBAEN,iBAAS,qDAAqD,iBAAS;;iBAE/E,iBAAS;;wBAEF,iBAAS;;;mBAGd,iBAAS;qCACS,iBAAS;;kEAEoB,iBAAS;;oCAEvC,iBAAS;;;;;;;;;;;;;;uBActB,iBAAS;8CACc,iBAAS;4BAC3B,gBAAgB;;;oDAGQ,iBAAS;;;qDAGR,iBAAS;;;;;uBAKvC,iBAAS;8CACc,iBAAS;4BAC3B,yBAAyB;;;oDAGD,iBAAS;;;qDAGR,iBAAS;;;;;;;SAOrD,CAAC;QACF,2BAA2B;IAC/B,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,4BAA4B;QAC5B,OAAO;;;;;;;;;;;oBAWK,iBAAS;;;;mBAIV,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;;mBAET,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;oBACR,iBAAS;;0BAEH,iBAAS,0BAA0B,iBAAS;0BAC5C,iBAAS,8BAA8B,iBAAS;yBACjD,iBAAS;sBACZ,iBAAS;;yBAEN,iBAAS,qDAAqD,iBAAS,8BAA8B,iBAAS;;mBAEpH,iBAAS;uBACL,iBAAS;;;2BAGL,iBAAS;kDACc,iBAAS;;;;;;;;;;;;;;wDAcH,iBAAS;;;yDAGR,iBAAS;;;;;2BAKvC,iBAAS;kDACc,iBAAS;;;;;;;;;;;;;;wDAcH,iBAAS;;;yDAGR,iBAAS;;;;;;;SAOzD,CAAC;QACF,2BAA2B;IAC/B,CAAC;IAEM,MAAM,CAAC,+BAA+B;QACzC,OAAO;sBACO,iBAAS,KAAK,2BAAY,CAAC,UAAU;;;;;;;;;SASlD,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,OAAO;sBACO,iBAAS,KAAK,2BAAY,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;oEAqBS,6BAAa,CAAC,QAAQ;;;;;wBAKlE,iBAAS,KAAK,qDAAyB,CAAC,SAAS;8BAC3C,iBAAS,KAAK,2CAAoB,CAAC,YAAY,CAAC,WAAW;;;iEAGxB,yBAAiB,CAAC,WAAW;;;SAGrF,CAAC;IACN,CAAC;CACJ;AAlPD,4CAkPC"}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export default class DPPUtils {
|
|
|
5
5
|
static DPP_AGENCY_NAME: string;
|
|
6
6
|
static TIME_THRESHOLD_IN_MS: number;
|
|
7
7
|
static DISTANCE_THRESHOLD_IN_KM: number;
|
|
8
|
-
static isInvisible: (agencyNameScheduled: string, originTimestamp:
|
|
8
|
+
static isInvisible: (agencyNameScheduled: string, originTimestamp: Date, startTimestamp: number, currentCoordinates: [number, number], firstStopCoordinates: [number, number], schedule: IGtfsRunTripCache[] | undefined, gtfsTripId: string, lastPositionTracking: Feature<Point, IVPTripsPositionAttributes> | null, tracking: number) => boolean;
|
|
9
9
|
private static isOnTheWayFromGarage;
|
|
10
10
|
private static isOnTheWayToGarage;
|
|
11
11
|
}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js
CHANGED
|
@@ -7,7 +7,7 @@ const const_1 = require("../../../../../const");
|
|
|
7
7
|
const PositionCalculator_1 = __importDefault(require("./PositionCalculator"));
|
|
8
8
|
class DPPUtils {
|
|
9
9
|
static isOnTheWayFromGarage(originTimestamp, firstSegment, currentCoordinates, firstStopCoordinates) {
|
|
10
|
-
if (originTimestamp < new Date(firstSegment.start_timestamp).valueOf() - this.TIME_THRESHOLD_IN_MS) {
|
|
10
|
+
if (originTimestamp.getTime() < new Date(firstSegment.start_timestamp).valueOf() - this.TIME_THRESHOLD_IN_MS) {
|
|
11
11
|
const distanceFromFirstStop = PositionCalculator_1.default.getDistanceInKilometers(currentCoordinates, firstStopCoordinates);
|
|
12
12
|
return distanceFromFirstStop > this.DISTANCE_THRESHOLD_IN_KM;
|
|
13
13
|
}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DPPUtils.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.ts"],"names":[],"mappings":";;;;;AAGA,gDAAiD;AACjD,8EAAsD;AAEtD,MAAqB,QAAQ;IAiCjB,MAAM,CAAC,oBAAoB,CAC/B,
|
|
1
|
+
{"version":3,"file":"DPPUtils.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.ts"],"names":[],"mappings":";;;;;AAGA,gDAAiD;AACjD,8EAAsD;AAEtD,MAAqB,QAAQ;IAiCjB,MAAM,CAAC,oBAAoB,CAC/B,eAAqB,EACrB,YAA+B,EAC/B,kBAAoC,EACpC,oBAAsC;QAEtC,IAAI,eAAe,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,oBAAoB,EAAE;YAC1G,MAAM,qBAAqB,GAAG,4BAAkB,CAAC,uBAAuB,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;YAEnH,OAAO,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,CAAC;SAChE;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAC7B,WAA8B,EAC9B,UAAkB,EAClB,QAAgB,EAChB,oBAAuE;QAEvE,qGAAqG;QACrG,+GAA+G;QAC/G,OAAO,CACH,WAAW,CAAC,OAAO,KAAK,UAAU,IAAI,QAAQ,KAAK,4BAAoB,CAAC,YAAY,IAAI,oBAAoB,IAAI,IAAI,CACvH,CAAC;IACN,CAAC;;AA3DL,2BA4DC;AA3DiB,wBAAe,GAAG,UAAU,CAAC;AAC7B,6BAAoB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACrC,iCAAwB,GAAG,GAAG,CAAC;AAE7C,4FAA4F;AAC9E,oBAAW,GAAG,CACxB,mBAA2B,EAC3B,eAAqB,EACrB,cAAsB,EACtB,kBAAoC,EACpC,oBAAsC,EACtC,QAAyC,EACzC,UAAkB,EAClB,oBAAuE,EACvE,QAAgB,EACT,EAAE;;IACT,uFAAuF;IACvF,qFAAqF;IACrF,IAAI,mBAAmB,KAAK,QAAQ,CAAC,eAAe;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5B,MAAM,QAAQ,GAAG,MAAA,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,IAAI,cAAc,CAAC,0CAAE,IAAI,CAAC;IACvG,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC;IACjE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3C,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAExD,OAAO,CACH,QAAQ,CAAC,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,kBAAkB,EAAE,oBAAoB,CAAC;QACtG,QAAQ,CAAC,kBAAkB,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CACvF,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -6,10 +6,6 @@ export declare class DateTimeUtils {
|
|
|
6
6
|
* @example 2022-10-26 08:55:10+01 -> 2022-10-26T09:55:10+02:00
|
|
7
7
|
*/
|
|
8
8
|
static formatSQLTimestamp(sqlTimestamp: string): string;
|
|
9
|
-
/**
|
|
10
|
-
* @example 1666770910000 -> 09:55:10
|
|
11
|
-
*/
|
|
12
|
-
static parseUTCTimeFromEpoch(unixTimestamp?: number): string;
|
|
13
9
|
/**
|
|
14
10
|
* @example 2022-10-26T08:55:10+01:00 -> 09:55:10
|
|
15
11
|
*/
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DateTimeUtils.js
CHANGED
|
@@ -9,12 +9,6 @@ class DateTimeUtils {
|
|
|
9
9
|
static formatSQLTimestamp(sqlTimestamp) {
|
|
10
10
|
return luxon_1.DateTime.fromSQL(sqlTimestamp).setZone(this.TIMEZONE).toFormat(this.FORMAT_DATE_TIME);
|
|
11
11
|
}
|
|
12
|
-
/**
|
|
13
|
-
* @example 1666770910000 -> 09:55:10
|
|
14
|
-
*/
|
|
15
|
-
static parseUTCTimeFromEpoch(unixTimestamp = new Date().getTime()) {
|
|
16
|
-
return luxon_1.DateTime.fromMillis(unixTimestamp).setZone(this.TIMEZONE).toFormat(this.FORMAT_TIME);
|
|
17
|
-
}
|
|
18
12
|
/**
|
|
19
13
|
* @example 2022-10-26T08:55:10+01:00 -> 09:55:10
|
|
20
14
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateTimeUtils.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DateTimeUtils.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAE3D,MAAa,aAAa;IAMtB;;OAEG;IACI,MAAM,CAAC,kBAAkB,CAAC,YAAoB;QACjD,OAAO,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACjG,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"DateTimeUtils.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DateTimeUtils.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAE3D,MAAa,aAAa;IAMtB;;OAEG;IACI,MAAM,CAAC,kBAAkB,CAAC,YAAoB;QACjD,OAAO,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACjG,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,mBAAmB,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACrE,OAAO,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC5F,CAAC;;AAlBL,sCAmBC;AAlBiB,sBAAQ,GAAG,eAAe,CAAC;AACzC,iEAAiE;AAClD,8BAAgB,GAAG,yBAAyB,CAAC;AAC7C,yBAAW,GAAG,UAAU,CAAC"}
|
|
@@ -51,15 +51,15 @@ export default class PositionsManager {
|
|
|
51
51
|
*/
|
|
52
52
|
private static getClosestPoint;
|
|
53
53
|
/**
|
|
54
|
-
* Returns
|
|
54
|
+
* Returns date object for stop time
|
|
55
55
|
* + given by start of day when trip starts
|
|
56
56
|
* + and GTFS HH:mm:ss format of stop time in seconds
|
|
57
57
|
*
|
|
58
58
|
* @param {number} startDayTimestamp - Unix timestamp of local time midnight before trip starts
|
|
59
59
|
* @param {number} timeSeconds - Number of seconds given by HH:mm:ss format of GTFS stop time
|
|
60
|
-
* @returns {
|
|
60
|
+
* @returns {Date} - Returns date object
|
|
61
61
|
*/
|
|
62
|
-
private static
|
|
62
|
+
private static getLocalTimeToDateObject;
|
|
63
63
|
/**
|
|
64
64
|
* Corrects time delay at stop with dwelling time
|
|
65
65
|
*
|
|
@@ -104,7 +104,7 @@ class PositionsManager {
|
|
|
104
104
|
* Vehicle sent a TCP message that was scheduled to be sent after termination
|
|
105
105
|
*/
|
|
106
106
|
static isScheduledAfterTermination({ properties }, tripEndTimestamp) {
|
|
107
|
-
return !!(properties.scheduled_timestamp && properties.scheduled_timestamp >= tripEndTimestamp);
|
|
107
|
+
return !!(properties.scheduled_timestamp && properties.scheduled_timestamp.getTime() >= tripEndTimestamp);
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
exports.default = PositionsManager;
|
|
@@ -116,8 +116,9 @@ _a = PositionsManager;
|
|
|
116
116
|
* @returns {Promise<IProcessedPositions>} - Returns computed/updated positions
|
|
117
117
|
*/
|
|
118
118
|
PositionsManager.computePositions = (tripPositions, schedule) => __awaiter(void 0, void 0, void 0, function* () {
|
|
119
|
-
|
|
120
|
-
const
|
|
119
|
+
var _b, _c;
|
|
120
|
+
const startTimestamp = tripPositions.start_timestamp.getTime();
|
|
121
|
+
const endTimestamp = (_c = (_b = tripPositions.end_timestamp) === null || _b === void 0 ? void 0 : _b.getTime()) !== null && _c !== void 0 ? _c : 0;
|
|
121
122
|
const startDayTimestamp = _a.getStartDayTimestamp(startTimestamp, tripPositions.gtfsData.shapes_anchor_points[0].time_scheduled_seconds);
|
|
122
123
|
const gtfsRouteType = tripPositions.gtfs_route_type;
|
|
123
124
|
const context = PositionsManager.getCurrentContext(tripPositions);
|
|
@@ -161,17 +162,17 @@ PositionsManager.updatePositions = (options, schedule) => __awaiter(void 0, void
|
|
|
161
162
|
// if there is no delay to duplicate and DPP trip is far from start then invisible
|
|
162
163
|
const setAsInvisible = !lastPositionDelayed &&
|
|
163
164
|
DPPUtils_1.default.isInvisible(tripPositions.agency_name_scheduled, position.origin_timestamp, startTimestamp, [position.lng, position.lat], firstShapesAnchorPoint.coordinates, schedule, tripPositions.gtfs_trip_id, context.lastPositionTracking, position.tracking);
|
|
164
|
-
positionToUpdate = Object.assign({ id: position.id, next_stop_arrival_time: startDayTimestamp + firstStopTime.arrival_time_seconds * 1000, next_stop_departure_time: startDayTimestamp + firstStopTime.departure_time_seconds * 1000, next_stop_id: firstStopTime.stop_id, next_stop_sequence: firstStopTime.stop_sequence, next_stop_name: firstStopTime.stop.stop_name, shape_dist_traveled: firstStopTime.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : const_1.StatePositionEnum.BEFORE_TRACK, state_process: const_1.StateProcessEnum.PROCESSED }, (firstStopTime.stop_headsign && {
|
|
165
|
+
positionToUpdate = Object.assign({ id: position.id, next_stop_arrival_time: new Date(startDayTimestamp + firstStopTime.arrival_time_seconds * 1000), next_stop_departure_time: new Date(startDayTimestamp + firstStopTime.departure_time_seconds * 1000), next_stop_id: firstStopTime.stop_id, next_stop_sequence: firstStopTime.stop_sequence, next_stop_name: firstStopTime.stop.stop_name, shape_dist_traveled: firstStopTime.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : const_1.StatePositionEnum.BEFORE_TRACK, state_process: const_1.StateProcessEnum.PROCESSED }, (firstStopTime.stop_headsign && {
|
|
165
166
|
last_stop_headsign: firstStopTime.stop_headsign,
|
|
166
167
|
}));
|
|
167
168
|
if (positionToUpdate.state_position === const_1.StatePositionEnum.BEFORE_TRACK) {
|
|
168
|
-
positionToUpdate.delay = _a.getDelayBeforeTrack(lastPositionDelayed === null || lastPositionDelayed === void 0 ? void 0 : lastPositionDelayed.delay, firstStopTime.departure_time_seconds, position.origin_timestamp, startDayTimestamp);
|
|
169
|
+
positionToUpdate.delay = _a.getDelayBeforeTrack(lastPositionDelayed === null || lastPositionDelayed === void 0 ? void 0 : lastPositionDelayed.delay, firstStopTime.departure_time_seconds, position.origin_timestamp.getTime(), startDayTimestamp);
|
|
169
170
|
}
|
|
170
171
|
}
|
|
171
172
|
else {
|
|
172
173
|
// if there is tracking 2 position with same origin_timestamp then this position is duplicate
|
|
173
|
-
const statePosition = position.origin_timestamp === context.lastPositionOriginTimestamp ||
|
|
174
|
-
tripPositions.positions.findIndex((positionItem) => positionItem.origin_timestamp === position.origin_timestamp &&
|
|
174
|
+
const statePosition = position.origin_timestamp.getTime() === context.lastPositionOriginTimestamp ||
|
|
175
|
+
tripPositions.positions.findIndex((positionItem) => positionItem.origin_timestamp.getTime() === position.origin_timestamp.getTime() &&
|
|
175
176
|
positionItem.tracking === const_1.PositionTrackingEnum.TRACKING) >= 0
|
|
176
177
|
? const_1.StatePositionEnum.DUPLICATE
|
|
177
178
|
: const_1.StatePositionEnum.AFTER_TRACK;
|
|
@@ -179,7 +180,7 @@ PositionsManager.updatePositions = (options, schedule) => __awaiter(void 0, void
|
|
|
179
180
|
const lastStopTime = tripPositions.gtfsData.stop_times[tripPositions.gtfsData.stop_times.length - 1];
|
|
180
181
|
// set as invisible if there are some AFTER_TRACK before
|
|
181
182
|
const setAsInvisible = DPPUtils_1.default.isInvisible(tripPositions.agency_name_scheduled, position.origin_timestamp, startTimestamp, [position.lng, position.lat], firstShapesAnchorPoint.coordinates, schedule, tripPositions.gtfs_trip_id, context.lastPositionTracking, position.tracking) && statePosition === const_1.StatePositionEnum.AFTER_TRACK;
|
|
182
|
-
positionToUpdate = Object.assign({ id: position.id, last_stop_arrival_time: startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000, last_stop_departure_time: startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000, last_stop_id: lastStopTime.stop_id, last_stop_sequence: lastShapesAnchorPoint.last_stop_sequence, shape_dist_traveled: lastShapesAnchorPoint.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : statePosition, state_process: const_1.StateProcessEnum.PROCESSED }, (lastStopTime.stop_headsign && {
|
|
183
|
+
positionToUpdate = Object.assign({ id: position.id, last_stop_arrival_time: new Date(startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000), last_stop_departure_time: new Date(startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000), last_stop_id: lastStopTime.stop_id, last_stop_sequence: lastShapesAnchorPoint.last_stop_sequence, shape_dist_traveled: lastShapesAnchorPoint.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : statePosition, state_process: const_1.StateProcessEnum.PROCESSED }, (lastStopTime.stop_headsign && {
|
|
183
184
|
last_stop_headsign: lastStopTime.stop_headsign,
|
|
184
185
|
}));
|
|
185
186
|
positionToUpdate = ComputeDelayHelper_1.default.updatePositionToUpdate(context, positionToUpdate, position, gtfsRouteType);
|
|
@@ -210,7 +211,7 @@ PositionsManager.updatePositions = (options, schedule) => __awaiter(void 0, void
|
|
|
210
211
|
if (position.state_position === const_1.StatePositionEnum.BEFORE_TRACK_DELAYED) {
|
|
211
212
|
context.lastPositionBeforeTrackDelayed = {
|
|
212
213
|
delay: position.delay,
|
|
213
|
-
origin_timestamp: position.origin_timestamp,
|
|
214
|
+
origin_timestamp: position.origin_timestamp.getTime(),
|
|
214
215
|
};
|
|
215
216
|
}
|
|
216
217
|
// set last position tracking (only for at_stop and on_track)
|
|
@@ -228,7 +229,7 @@ PositionsManager.updatePositions = (options, schedule) => __awaiter(void 0, void
|
|
|
228
229
|
context.atStopStreak.stop_sequence = positionToUpdate
|
|
229
230
|
? positionToUpdate.this_stop_sequence
|
|
230
231
|
: position.this_stop_sequence;
|
|
231
|
-
context.atStopStreak.firstPositionTimestamp = position.origin_timestamp;
|
|
232
|
+
context.atStopStreak.firstPositionTimestamp = position.origin_timestamp.getTime();
|
|
232
233
|
context.atStopStreak.firstPositionDelay = positionToUpdate ? positionToUpdate.delay : position.delay;
|
|
233
234
|
}
|
|
234
235
|
// IF currently updated position / position was processed before
|
|
@@ -242,7 +243,7 @@ PositionsManager.updatePositions = (options, schedule) => __awaiter(void 0, void
|
|
|
242
243
|
(positionToUpdate === null || positionToUpdate === void 0 ? void 0 : positionToUpdate.state_position) !== const_1.StatePositionEnum.INVISIBLE) {
|
|
243
244
|
context.lastPositionId = position.id;
|
|
244
245
|
context.lastPositionCanceled = position.is_canceled;
|
|
245
|
-
context.lastPositionOriginTimestamp = position.origin_timestamp;
|
|
246
|
+
context.lastPositionOriginTimestamp = position.origin_timestamp.getTime();
|
|
246
247
|
}
|
|
247
248
|
ComputeDelayHelper_1.default.updateContext(context, positionToUpdate, position, gtfsRouteType);
|
|
248
249
|
}
|
|
@@ -305,7 +306,7 @@ PositionsManager.setPositionUpdateHandler = (position) => {
|
|
|
305
306
|
* @returns {IPositionToUpdate} - Position object to update
|
|
306
307
|
*/
|
|
307
308
|
PositionsManager.getEstimatedPoint = (tripGtfsData, currentPosition, context, startDayTimestamp, tripEndTimestamp, gtfsRouteType) => __awaiter(void 0, void 0, void 0, function* () {
|
|
308
|
-
var
|
|
309
|
+
var _d, _e, _f, _g, _h, _j;
|
|
309
310
|
// init radius around GPS position ( 200 meters radius, 16 points polygon aka circle)
|
|
310
311
|
const radius = 0.2;
|
|
311
312
|
const defaultStatePosition = PositionsManager.isScheduledAfterTermination(currentPosition, tripEndTimestamp)
|
|
@@ -313,12 +314,12 @@ PositionsManager.getEstimatedPoint = (tripGtfsData, currentPosition, context, st
|
|
|
313
314
|
: const_1.StatePositionEnum.OFF_TRACK;
|
|
314
315
|
// Initial value
|
|
315
316
|
let estimatedPoint = Object.assign({ id: currentPosition.properties.id, state_position: defaultStatePosition, state_process: const_1.StateProcessEnum.PROCESSED, tcp_event: currentPosition.properties.tcp_event, valid_to: ValidToCalculator_1.default.getDefaultValidToAttribute(currentPosition.properties.origin_timestamp) }, (context &&
|
|
316
|
-
((
|
|
317
|
-
shape_dist_traveled: (
|
|
318
|
-
last_stop_arrival_time: (
|
|
319
|
-
last_stop_departure_time: (
|
|
320
|
-
last_stop_sequence: (
|
|
321
|
-
last_stop_id: (
|
|
317
|
+
((_d = context.lastPositionTracking) === null || _d === void 0 ? void 0 : _d.properties.last_stop_sequence) && {
|
|
318
|
+
shape_dist_traveled: (_e = context.lastPositionTracking) === null || _e === void 0 ? void 0 : _e.properties.shape_dist_traveled,
|
|
319
|
+
last_stop_arrival_time: (_f = context.lastPositionTracking) === null || _f === void 0 ? void 0 : _f.properties.last_stop_arrival_time,
|
|
320
|
+
last_stop_departure_time: (_g = context.lastPositionTracking) === null || _g === void 0 ? void 0 : _g.properties.last_stop_departure_time,
|
|
321
|
+
last_stop_sequence: (_h = context.lastPositionTracking) === null || _h === void 0 ? void 0 : _h.properties.last_stop_sequence,
|
|
322
|
+
last_stop_id: (_j = context.lastPositionTracking) === null || _j === void 0 ? void 0 : _j.properties.last_stop_id,
|
|
322
323
|
}));
|
|
323
324
|
// returns array of segments (row of points) of shape anchor points around gps
|
|
324
325
|
const ptsInRadius = yield PositionCalculator_1.default.getShapePointsAroundPosition(tripGtfsData.shapes_anchor_points, currentPosition, radius, tripGtfsData.trip_id);
|
|
@@ -355,7 +356,7 @@ PositionsManager.getClosestPoint = (currentPosition, context, startDayTimestamp,
|
|
|
355
356
|
return cb(estimatedPoint);
|
|
356
357
|
}
|
|
357
358
|
let thisClosestPoint = closestPts[i];
|
|
358
|
-
const timeScheduledTimestamp = _a.
|
|
359
|
+
const timeScheduledTimestamp = _a.getLocalTimeToDateObject(startDayTimestamp,
|
|
359
360
|
// take stop arrival time if is point at stop
|
|
360
361
|
thisClosestPoint.this_stop_sequence
|
|
361
362
|
? tripStopTimes[thisClosestPoint.this_stop_sequence - 1].arrival_time_seconds
|
|
@@ -414,10 +415,10 @@ PositionsManager.getClosestPoint = (currentPosition, context, startDayTimestamp,
|
|
|
414
415
|
last_stop_name: tripStopTimes[lastStopSequence - 1].stop.stop_name,
|
|
415
416
|
next_stop_sequence: nextStopSequence,
|
|
416
417
|
last_stop_sequence: lastStopSequence,
|
|
417
|
-
next_stop_arrival_time: _a.
|
|
418
|
-
last_stop_arrival_time: _a.
|
|
419
|
-
next_stop_departure_time: _a.
|
|
420
|
-
last_stop_departure_time: _a.
|
|
418
|
+
next_stop_arrival_time: _a.getLocalTimeToDateObject(startDayTimestamp, tripStopTimes[nextStopSequence - 1].arrival_time_seconds),
|
|
419
|
+
last_stop_arrival_time: _a.getLocalTimeToDateObject(startDayTimestamp, tripStopTimes[lastStopSequence - 1].arrival_time_seconds),
|
|
420
|
+
next_stop_departure_time: _a.getLocalTimeToDateObject(startDayTimestamp, tripStopTimes[nextStopSequence - 1].departure_time_seconds),
|
|
421
|
+
last_stop_departure_time: _a.getLocalTimeToDateObject(startDayTimestamp, tripStopTimes[lastStopSequence - 1].departure_time_seconds),
|
|
421
422
|
delay: timeDelay,
|
|
422
423
|
this_stop_id: (statePosition === const_1.StatePositionEnum.AT_STOP &&
|
|
423
424
|
thisStopSequence &&
|
|
@@ -445,22 +446,22 @@ PositionsManager.getClosestPoint = (currentPosition, context, startDayTimestamp,
|
|
|
445
446
|
});
|
|
446
447
|
});
|
|
447
448
|
/**
|
|
448
|
-
* Returns
|
|
449
|
+
* Returns date object for stop time
|
|
449
450
|
* + given by start of day when trip starts
|
|
450
451
|
* + and GTFS HH:mm:ss format of stop time in seconds
|
|
451
452
|
*
|
|
452
453
|
* @param {number} startDayTimestamp - Unix timestamp of local time midnight before trip starts
|
|
453
454
|
* @param {number} timeSeconds - Number of seconds given by HH:mm:ss format of GTFS stop time
|
|
454
|
-
* @returns {
|
|
455
|
+
* @returns {Date} - Returns date object
|
|
455
456
|
*/
|
|
456
|
-
PositionsManager.
|
|
457
|
+
PositionsManager.getLocalTimeToDateObject = (startDayTimestamp, timeSeconds) => {
|
|
457
458
|
return (0, moment_timezone_1.default)(startDayTimestamp)
|
|
458
459
|
.tz("Europe/Prague")
|
|
459
460
|
.startOf("day")
|
|
460
461
|
.hours(Math.floor(timeSeconds / 3600))
|
|
461
462
|
.minutes(Math.floor((timeSeconds % 3600) / 60))
|
|
462
463
|
.seconds(timeSeconds % 60)
|
|
463
|
-
.
|
|
464
|
+
.toDate();
|
|
464
465
|
};
|
|
465
466
|
/**
|
|
466
467
|
* Corrects time delay at stop with dwelling time
|
|
@@ -497,7 +498,7 @@ PositionsManager.getCorrectedTimeDelay = (timeDelay, context, currentPosition, t
|
|
|
497
498
|
}
|
|
498
499
|
// trip was AHEAD before
|
|
499
500
|
// real dwell time so far
|
|
500
|
-
const realDwellTimeSeconds = Math.round((currentPosition.properties.origin_timestamp - context.atStopStreak.firstPositionTimestamp) / 1000);
|
|
501
|
+
const realDwellTimeSeconds = Math.round((currentPosition.properties.origin_timestamp.getTime() - context.atStopStreak.firstPositionTimestamp) / 1000);
|
|
501
502
|
// if real dwell is longer than scheduled, then add to negative delay time
|
|
502
503
|
return context.atStopStreak.firstPositionDelay + Math.max(realDwellTimeSeconds - stopDwellTimeSeconds, 0);
|
|
503
504
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionsManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PositionsManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,10 @@ export default class ValidToCalculator {
|
|
|
7
7
|
* Calculates valid_to attribute value for updateDelay worker
|
|
8
8
|
*
|
|
9
9
|
*/
|
|
10
|
-
static getValidToAttribute: (positionToUpdate: IPositionToUpdate, tripPositionAttributes: IVPTripsPositionAttributes, gtfsRouteType: GTFSRouteTypeEnum, gtfsData: IComputationTrip, startTimestamp: number, startDayTimestamp: number) =>
|
|
10
|
+
static getValidToAttribute: (positionToUpdate: IPositionToUpdate, tripPositionAttributes: IVPTripsPositionAttributes, gtfsRouteType: GTFSRouteTypeEnum, gtfsData: IComputationTrip, startTimestamp: number, startDayTimestamp: number) => Date;
|
|
11
11
|
/**
|
|
12
12
|
* Calculate default valid_to attribute
|
|
13
13
|
* return 5min + `origin_timestamp`
|
|
14
14
|
*/
|
|
15
|
-
static getDefaultValidToAttribute: (origin_timestamp:
|
|
15
|
+
static getDefaultValidToAttribute: (origin_timestamp: Date) => Date;
|
|
16
16
|
}
|
|
@@ -18,7 +18,7 @@ ValidToCalculator.CANCELLED_ADDITION_TIME_IN_MS = 30 * 60 * 1000;
|
|
|
18
18
|
*/
|
|
19
19
|
ValidToCalculator.getValidToAttribute = (positionToUpdate, tripPositionAttributes, gtfsRouteType, gtfsData, startTimestamp, startDayTimestamp) => {
|
|
20
20
|
if (positionToUpdate.state_position === const_1.StatePositionEnum.CANCELED) {
|
|
21
|
-
return (startDayTimestamp +
|
|
21
|
+
return new Date(startDayTimestamp +
|
|
22
22
|
gtfsData.stop_times[gtfsData.stop_times.length - 1].departure_time_seconds * 1000 +
|
|
23
23
|
ValidToCalculator.CANCELLED_ADDITION_TIME_IN_MS);
|
|
24
24
|
}
|
|
@@ -30,15 +30,15 @@ ValidToCalculator.getValidToAttribute = (positionToUpdate, tripPositionAttribute
|
|
|
30
30
|
positionToUpdate.last_stop_arrival_time != positionToUpdate.last_stop_departure_time &&
|
|
31
31
|
positionToUpdate.last_stop_arrival_time &&
|
|
32
32
|
positionToUpdate.last_stop_departure_time) {
|
|
33
|
-
return (_a.getDefaultValidToAttribute(tripPositionAttributes.origin_timestamp) +
|
|
34
|
-
(positionToUpdate.last_stop_departure_time - positionToUpdate.last_stop_arrival_time));
|
|
33
|
+
return new Date(_a.getDefaultValidToAttribute(tripPositionAttributes.origin_timestamp).getTime() +
|
|
34
|
+
(positionToUpdate.last_stop_departure_time.getTime() - positionToUpdate.last_stop_arrival_time.getTime()));
|
|
35
35
|
}
|
|
36
36
|
// For final positions:
|
|
37
37
|
// return default valid to attribute + the time difference between (next trip departure) and arrival
|
|
38
38
|
if (positionToUpdate.state_position == const_1.StatePositionEnum.BEFORE_TRACK) {
|
|
39
39
|
const distance = PositionCalculator_1.default.getDistanceInKilometers([tripPositionAttributes.lng, tripPositionAttributes.lat], [gtfsData.stop_times[0].stop.stop_lon, gtfsData.stop_times[0].stop.stop_lat]);
|
|
40
40
|
if (distance <= 1) {
|
|
41
|
-
return _a.getDefaultValidToAttribute(Math.max(tripPositionAttributes.origin_timestamp, startTimestamp));
|
|
41
|
+
return _a.getDefaultValidToAttribute(new Date(Math.max(tripPositionAttributes.origin_timestamp.getTime(), startTimestamp)));
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -50,6 +50,6 @@ ValidToCalculator.getValidToAttribute = (positionToUpdate, tripPositionAttribute
|
|
|
50
50
|
* return 5min + `origin_timestamp`
|
|
51
51
|
*/
|
|
52
52
|
ValidToCalculator.getDefaultValidToAttribute = (origin_timestamp) => {
|
|
53
|
-
return origin_timestamp + 5 * 60 * 1000;
|
|
53
|
+
return new Date(origin_timestamp.getTime() + 5 * 60 * 1000);
|
|
54
54
|
};
|
|
55
55
|
//# sourceMappingURL=ValidToCalculator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidToCalculator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/ValidToCalculator.ts"],"names":[],"mappings":";;;;;;AACA,gDAA8C;AAC9C,0EAA+D;AAE/D,8EAAsD;AAEtD,MAAqB,iBAAiB;;AAAtC,
|
|
1
|
+
{"version":3,"file":"ValidToCalculator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/ValidToCalculator.ts"],"names":[],"mappings":";;;;;;AACA,gDAA8C;AAC9C,0EAA+D;AAE/D,8EAAsD;AAEtD,MAAqB,iBAAiB;;AAAtC,oCAiEC;;AAhEkB,+CAA6B,GAAG,EAAE,GAAG,EAAE,GAAG,IAAK,CAAA;AAC9D;;;GAGG;AACW,qCAAmB,GAAG,CAChC,gBAAmC,EACnC,sBAAkD,EAClD,aAAgC,EAChC,QAA0B,EAC1B,cAAsB,EACtB,iBAAyB,EACrB,EAAE;IACN,IAAI,gBAAgB,CAAC,cAAc,KAAK,yBAAiB,CAAC,QAAQ,EAAE;QAChE,OAAO,IAAI,IAAI,CACX,iBAAiB;YACb,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,sBAAsB,GAAG,IAAI;YACjF,iBAAiB,CAAC,6BAA6B,CACtD,CAAC;KACL;SAAM,IAAI,aAAa,KAAK,kCAAiB,CAAC,IAAI,EAAE;QACjD,iBAAiB;QACjB,sBAAsB;QACtB,wFAAwF;QAExF,IACI,gBAAgB,CAAC,cAAc,IAAI,yBAAiB,CAAC,OAAO;YAC5D,gBAAgB,CAAC,sBAAsB,IAAI,gBAAgB,CAAC,wBAAwB;YACpF,gBAAgB,CAAC,sBAAsB;YACvC,gBAAgB,CAAC,wBAAwB,EAC3C;YACE,OAAO,IAAI,IAAI,CACX,EAAI,CAAC,0BAA0B,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE;gBAC9E,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,OAAO,EAAE,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC,CAChH,CAAC;SACL;QAED,uBAAuB;QACvB,oGAAoG;QAEpG,IAAI,gBAAgB,CAAC,cAAc,IAAI,yBAAiB,CAAC,YAAY,EAAE;YACnE,MAAM,QAAQ,GAAG,4BAAkB,CAAC,uBAAuB,CACvD,CAAC,sBAAsB,CAAC,GAAG,EAAE,sBAAsB,CAAC,GAAG,CAAC,EACxD,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAC/E,CAAC;YAEF,IAAI,QAAQ,IAAI,CAAC,EAAE;gBACf,OAAO,EAAI,CAAC,0BAA0B,CAClC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC,CACxF,CAAC;aACL;SACJ;KACJ;IAED,2BAA2B;IAC3B,OAAO,EAAI,CAAC,0BAA0B,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;AACpF,CAAE,CAAA;AAEF;;;GAGG;AACW,4CAA0B,GAAG,CAAC,gBAAsB,EAAQ,EAAE;IACxE,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AAChE,CAAE,CAAA"}
|
|
@@ -4,7 +4,7 @@ import { IVPTripsLastPositionContext } from "../../../../../../../schema-definit
|
|
|
4
4
|
export default abstract class AbstractDelayAtStop {
|
|
5
5
|
abstract updateContext(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate | null, position: IVPTripsPositionAttributes): IVPTripsLastPositionContext;
|
|
6
6
|
abstract updatePosition(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate, position: IVPTripsPositionAttributes | undefined): IPositionToUpdate;
|
|
7
|
-
protected calcDelayAtStop(actualTimestamp: number, scheduledTimestamp:
|
|
7
|
+
protected calcDelayAtStop(actualTimestamp: number, scheduledTimestamp: Date | undefined): number | null;
|
|
8
8
|
protected resetContext(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate | null, position: IVPTripsPositionAttributes | undefined): IVPTripsLastPositionContext;
|
|
9
9
|
protected isContextChange(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate | null, position: IVPTripsPositionAttributes | undefined): boolean;
|
|
10
10
|
protected updatePositionBasedOnContext(context: IVPTripsLastPositionContext, positionToUpdate: IPositionToUpdate): IPositionToUpdate;
|
|
@@ -10,7 +10,7 @@ class AbstractDelayAtStop {
|
|
|
10
10
|
if (!scheduledTimestamp) {
|
|
11
11
|
return null;
|
|
12
12
|
}
|
|
13
|
-
return (
|
|
13
|
+
return (actualTimestamp - scheduledTimestamp.getTime()) / 1000;
|
|
14
14
|
}
|
|
15
15
|
resetContext(context, positionToUpdate, position) {
|
|
16
16
|
if (this.isContextChange(context, positionToUpdate, position)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.ts"],"names":[],"mappings":";;AAGA,sDAA8C;AAE9C;;;GAGG;AACH,MAA8B,mBAAmB;IAanC,eAAe,CAAC,eAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.ts"],"names":[],"mappings":";;AAGA,sDAA8C;AAE9C;;;GAGG;AACH,MAA8B,mBAAmB;IAanC,eAAe,CAAC,eAAuB,EAAE,kBAAoC;QACnF,IAAI,CAAC,kBAAkB,EAAE;YACrB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,CAAC,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;IACnE,CAAC;IAES,YAAY,CAClB,OAAoC,EACpC,gBAA0C,EAC1C,QAAgD;QAEhD,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE;YAC3D,OAAO,CAAC,oBAAoB,CAAC,YAAY,GAAG,IAAI,CAAC;YACjD,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,IAAI,CAAC;YAClD,OAAO,CAAC,oBAAoB,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC7C,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,IAAI,CAAC;YACnD,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,IAAI,CAAC;SACvD;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,eAAe,CACrB,OAAoC,EACpC,gBAA0C,EAC1C,QAAgD;;QAEhD,OAAO,OAAO,CAAC,oBAAoB,CAAC,QAAQ,KAAK,CAAC,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAC,CAAC;IAC5H,CAAC;IAES,4BAA4B,CAClC,OAAoC,EACpC,gBAAmC;QAEnC,IAAI,OAAO,CAAC,oBAAoB,CAAC,YAAY,IAAI,gBAAgB,CAAC,sBAAsB,EAAE;YACtF,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC,eAAe,CACtD,OAAO,CAAC,oBAAoB,CAAC,YAAY,EACzC,gBAAgB,CAAC,sBAAsB,CAC1C,CAAC;SACL;QACD,IACI,OAAO,CAAC,oBAAoB,CAAC,cAAc;YAC3C,gBAAgB,CAAC,wBAAwB;YACzC,gBAAgB,CAAC,cAAc,KAAK,yBAAiB,CAAC,OAAO;YAC7D,gBAAgB,CAAC,cAAc,KAAK,yBAAiB,CAAC,WAAW,EACnE;YACE,gBAAgB,CAAC,oBAAoB,GAAG,IAAI,CAAC,eAAe,CACxD,OAAO,CAAC,oBAAoB,CAAC,cAAc,EAC3C,gBAAgB,CAAC,wBAAwB,CAC5C,CAAC;SACL;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ;AArED,sCAqEC"}
|
|
@@ -39,7 +39,7 @@ class MetroDelayAtStop extends AbstractDelayAtStop_1.default {
|
|
|
39
39
|
// as the difference between the scheduled and the origin timestamp of the original message
|
|
40
40
|
let delayInSeconds = null;
|
|
41
41
|
if (position.origin_timestamp !== null && position.scheduled_timestamp !== null) {
|
|
42
|
-
delayInSeconds = (position.origin_timestamp - position.scheduled_timestamp) / 1000;
|
|
42
|
+
delayInSeconds = (position.origin_timestamp.getTime() - position.scheduled_timestamp.getTime()) / 1000;
|
|
43
43
|
}
|
|
44
44
|
if (positionToUpdate.state_position === const_1.StatePositionEnum.AT_STOP && context.atStopStreak.stop_sequence === null) {
|
|
45
45
|
positionToUpdate.delay_stop_arrival =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/MetroDelayAtStop.ts"],"names":[],"mappings":";;;;;AAGA,yEAAsE;AACtE,sDAAoE;AACpE,gFAAwD;AAExD,MAAqB,gBAAiB,SAAQ,6BAAmB;IAI7D;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,yBAAyB,GAAG,eAAM,CAAC,gBAAgB,CAAC,yBAAyB,CAAC;QACnF,IAAI,CAAC,2BAA2B,GAAG,eAAM,CAAC,gBAAgB,CAAC,2BAA2B,CAAC;IAC3F,CAAC;IAEM,aAAa,CAChB,OAAoC,EACpC,gBAA0C,EAC1C,QAAoC;;QAEpC,IAAI,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,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,IACI,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,MAAK,yBAAiB,CAAC,OAAO;YAC9D,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,MAAK,yBAAiB,CAAC,QAAQ,EACjE;YACE,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,MAAA,gBAAgB,CAAC,kBAAkB,mCAAI,IAAI,CAAC;YACzF,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,MAAA,gBAAgB,CAAC,oBAAoB,mCAAI,IAAI,CAAC;SAChG;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,cAAc,CACjB,OAAoC,EACpC,gBAAmC,EACnC,QAAgD;QAEhD,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,MAAK,4BAAoB,CAAC,QAAQ,EAAE;YACtD,OAAO,gBAAgB,CAAC;SAC3B;QAED,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,gBAAgB,CAAC,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC;QACjF,gBAAgB,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC;QAErF,8CAA8C;QAC9C,2FAA2F;QAC3F,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,IAAI,QAAQ,CAAC,gBAAgB,KAAK,IAAI,IAAI,QAAQ,CAAC,mBAAmB,KAAK,IAAI,EAAE;YAC7E,cAAc,GAAG,CAAC,QAAQ,CAAC,gBAAgB,GAAG,QAAQ,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"MetroDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/MetroDelayAtStop.ts"],"names":[],"mappings":";;;;;AAGA,yEAAsE;AACtE,sDAAoE;AACpE,gFAAwD;AAExD,MAAqB,gBAAiB,SAAQ,6BAAmB;IAI7D;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,yBAAyB,GAAG,eAAM,CAAC,gBAAgB,CAAC,yBAAyB,CAAC;QACnF,IAAI,CAAC,2BAA2B,GAAG,eAAM,CAAC,gBAAgB,CAAC,2BAA2B,CAAC;IAC3F,CAAC;IAEM,aAAa,CAChB,OAAoC,EACpC,gBAA0C,EAC1C,QAAoC;;QAEpC,IAAI,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,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,IACI,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,MAAK,yBAAiB,CAAC,OAAO;YAC9D,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,MAAK,yBAAiB,CAAC,QAAQ,EACjE;YACE,OAAO,CAAC,oBAAoB,CAAC,aAAa,GAAG,MAAA,gBAAgB,CAAC,kBAAkB,mCAAI,IAAI,CAAC;YACzF,OAAO,CAAC,oBAAoB,CAAC,eAAe,GAAG,MAAA,gBAAgB,CAAC,oBAAoB,mCAAI,IAAI,CAAC;SAChG;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,cAAc,CACjB,OAAoC,EACpC,gBAAmC,EACnC,QAAgD;QAEhD,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,MAAK,4BAAoB,CAAC,QAAQ,EAAE;YACtD,OAAO,gBAAgB,CAAC;SAC3B;QAED,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,gBAAgB,CAAC,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC;QACjF,gBAAgB,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC;QAErF,8CAA8C;QAC9C,2FAA2F;QAC3F,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,IAAI,QAAQ,CAAC,gBAAgB,KAAK,IAAI,IAAI,QAAQ,CAAC,mBAAmB,KAAK,IAAI,EAAE;YAC7E,cAAc,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;SAC1G;QAED,IAAI,gBAAgB,CAAC,cAAc,KAAK,yBAAiB,CAAC,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,KAAK,IAAI,EAAE;YAC9G,gBAAgB,CAAC,kBAAkB;gBAC/B,cAAc,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,yBAAyB,CAAC;SACxF;aAAM,IAAI,gBAAgB,CAAC,cAAc,KAAK,yBAAiB,CAAC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE;YAC7G,gBAAgB,CAAC,oBAAoB;gBACjC,cAAc,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,2BAA2B,CAAC;SAC1F;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ;AAlED,mCAkEC"}
|
|
@@ -10,12 +10,12 @@ class TramDelayAtStop extends AbstractDelayAtStop_1.default {
|
|
|
10
10
|
var _a, _b;
|
|
11
11
|
context = this.resetContext(context, positionToUpdate, position);
|
|
12
12
|
if (this.didTramArrive(position)) {
|
|
13
|
-
context.lastPositionLastStop.arrival_time = position.origin_timestamp;
|
|
13
|
+
context.lastPositionLastStop.arrival_time = position.origin_timestamp.getTime();
|
|
14
14
|
context.lastPositionLastStop.sequence = (_b = (_a = positionToUpdate === null || positionToUpdate === void 0 ? void 0 : positionToUpdate.this_stop_sequence) !== null && _a !== void 0 ? _a : position === null || position === void 0 ? void 0 : position.this_stop_sequence) !== null && _b !== void 0 ? _b : null;
|
|
15
15
|
context.lastPositionLastStop.departure_time = null;
|
|
16
16
|
}
|
|
17
17
|
else if (this.didTramDepart(position, positionToUpdate, context)) {
|
|
18
|
-
context.lastPositionLastStop.departure_time = position.origin_timestamp;
|
|
18
|
+
context.lastPositionLastStop.departure_time = position.origin_timestamp.getTime();
|
|
19
19
|
}
|
|
20
20
|
return context;
|
|
21
21
|
}
|
|
@@ -23,12 +23,12 @@ class TramDelayAtStop extends AbstractDelayAtStop_1.default {
|
|
|
23
23
|
context = this.resetContext(context, positionToUpdate, position);
|
|
24
24
|
positionToUpdate = this.updatePositionBasedOnContext(context, positionToUpdate);
|
|
25
25
|
if (position && this.didTramArrive(position)) {
|
|
26
|
-
positionToUpdate.delay_stop_arrival = this.calcDelayAtStop(position.origin_timestamp, positionToUpdate.last_stop_arrival_time);
|
|
26
|
+
positionToUpdate.delay_stop_arrival = this.calcDelayAtStop(position.origin_timestamp.getTime(), positionToUpdate.last_stop_arrival_time);
|
|
27
27
|
}
|
|
28
28
|
else if (position &&
|
|
29
29
|
this.didTramDepart(position, positionToUpdate, context) &&
|
|
30
30
|
!positionToUpdate.delay_stop_departure) {
|
|
31
|
-
positionToUpdate.delay_stop_departure = this.calcDelayAtStop(position.origin_timestamp, positionToUpdate.last_stop_departure_time);
|
|
31
|
+
positionToUpdate.delay_stop_departure = this.calcDelayAtStop(position.origin_timestamp.getTime(), positionToUpdate.last_stop_departure_time);
|
|
32
32
|
}
|
|
33
33
|
return positionToUpdate;
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TramDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.ts"],"names":[],"mappings":";;;;;AAGA,sDAA+D;AAC/D,gFAAwD;AAExD,MAAqB,eAAgB,SAAQ,6BAAmB;IACrD,aAAa,CAChB,OAAoC,EACpC,gBAA0C,EAC1C,QAAoC;;QAEpC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC9B,OAAO,CAAC,oBAAoB,CAAC,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"TramDelayAtStop.js","sourceRoot":"","sources":["../../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.ts"],"names":[],"mappings":";;;;;AAGA,sDAA+D;AAC/D,gFAAwD;AAExD,MAAqB,eAAgB,SAAQ,6BAAmB;IACrD,aAAa,CAChB,OAAoC,EACpC,gBAA0C,EAC1C,QAAoC;;QAEpC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC9B,OAAO,CAAC,oBAAoB,CAAC,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAChF,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;YACrH,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,IAAI,CAAC;SACtD;aAAM,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE;YAChE,OAAO,CAAC,oBAAoB,CAAC,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;SACrF;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,cAAc,CACjB,OAAoC,EACpC,gBAAmC,EACnC,QAAgD;QAEhD,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACjE,gBAAgB,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEhF,IAAI,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC1C,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC,eAAe,CACtD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,EACnC,gBAAgB,CAAC,sBAAsB,CAC1C,CAAC;SACL;aAAM,IACH,QAAQ;YACR,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,CAAC;YACvD,CAAC,gBAAgB,CAAC,oBAAoB,EACxC;YACE,gBAAgB,CAAC,oBAAoB,GAAG,IAAI,CAAC,eAAe,CACxD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,EACnC,gBAAgB,CAAC,wBAAwB,CAC5C,CAAC;SACL;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAEO,aAAa,CAAC,QAAgD;QAClE,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,MAAK,oBAAY,CAAC,iBAAiB,IAAI,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,CAAC;IACzH,CAAC;IAEO,aAAa,CACjB,QAAgD,EAChD,gBAA0C,EAC1C,OAAoC;;QAEpC,OAAO,CACH,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,MAAK,oBAAY,CAAC,UAAU;YAC/C,OAAO,CAAC,oBAAoB,CAAC,QAAQ,KAAK,CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,mCAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,kBAAkB,CAAC;YAChH,QAAQ,CAAC,QAAQ,KAAK,4BAAoB,CAAC,QAAQ,CACtD,CAAC;IACN,CAAC;CACJ;AA5DD,kCA4DC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { RunTripsRedisRepository } from "../../../../../ropid-gtfs/data-access/cache";
|
|
2
2
|
import { IGtfsRunTripCache } from "../../../../../ropid-gtfs/interfaces/IGtfsRunTripCache";
|
|
3
3
|
import { CommonRunsRepository } from "../../../runs/data-access/CommonRunsRepository";
|
|
4
|
-
import { ICommonRunWithMessage } from "../../../runs/interfaces/ICommonRunWithMessage";
|
|
5
4
|
import { IMetroRunInputForProcessing } from "../../../runs/interfaces/IMetroRunInputForProcessing";
|
|
6
5
|
import { PositionsRepository } from "../../data-access/PositionsRepository";
|
|
7
6
|
import { TripsRepository } from "../../data-access/TripsRepository";
|
|
8
7
|
import { IVehiclePositionsSchedule } from "../../interfaces/VPInterfaces";
|
|
9
8
|
import { Moment } from "@golemio/core/dist/shared/moment-timezone";
|
|
9
|
+
import { IUpdateRunsGtfsTripInput } from "../../interfaces/IUpdateRunsGtfsTripInput";
|
|
10
10
|
import { IDelayMessage } from "./interfaces/IDelayMessage";
|
|
11
11
|
export declare abstract class AbstractGTFSTripRunManager {
|
|
12
12
|
protected readonly positionsRepository: PositionsRepository;
|
|
@@ -16,7 +16,7 @@ export declare abstract class AbstractGTFSTripRunManager {
|
|
|
16
16
|
protected readonly testMode: boolean;
|
|
17
17
|
private turnaroundEstimateInSeconds;
|
|
18
18
|
constructor(positionsRepository: PositionsRepository, tripsRepository: TripsRepository, runsRepository: CommonRunsRepository, runTripsRedisRepository: RunTripsRedisRepository, testMode?: boolean);
|
|
19
|
-
abstract generateDelayMsg(schedule: IGtfsRunTripCache[], input:
|
|
19
|
+
abstract generateDelayMsg(schedule: IGtfsRunTripCache[], input: IUpdateRunsGtfsTripInput | IMetroRunInputForProcessing): Promise<IDelayMessage>;
|
|
20
20
|
setAndReturnScheduledTrips: (scheduleData: IVehiclePositionsSchedule) => Promise<IGtfsRunTripCache[]>;
|
|
21
21
|
protected getCurrentTripForRun(schedule: IGtfsRunTripCache[], timestampScheduled: Moment): IGtfsRunTripCache | undefined;
|
|
22
22
|
/**
|
|
@@ -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":";;;;;;;;;;;;;;;
|
|
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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"}
|