@golemio/pid 4.0.3 → 4.0.4-dev.2001605097
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/README.md +1 -1
- package/db/example/redis/gtfsStopsCacheMock.json +8 -0
- package/db/example/redis/jisCacheMock.json +31 -0
- package/db/migrations/postgresql/20250716143052-add-stop-name-to-combined-stop-times.js +53 -0
- package/db/migrations/postgresql/sqls/20250716143052-add-stop-name-to-combined-stop-times-down.sql +47 -0
- package/db/migrations/postgresql/sqls/20250716143052-add-stop-name-to-combined-stop-times-up.sql +47 -0
- package/dist/helpers/GtfsStopParser.d.ts +2 -0
- package/dist/helpers/GtfsStopParser.js +11 -8
- package/dist/helpers/GtfsStopParser.js.map +1 -1
- package/dist/helpers/jis/JISInfotextSeverityLevelPriority.d.ts +6 -0
- package/dist/helpers/jis/JISInfotextSeverityLevelPriority.js +11 -0
- package/dist/helpers/jis/JISInfotextSeverityLevelPriority.js.map +1 -0
- package/dist/input-gateway/vehicle-positions/VehiclePositionsController.js +0 -1
- package/dist/input-gateway/vehicle-positions/VehiclePositionsController.js.map +1 -1
- package/dist/integration-engine/jis/ioc/Di.js +10 -0
- package/dist/integration-engine/jis/ioc/Di.js.map +1 -1
- package/dist/integration-engine/jis/ioc/JISContainerToken.d.ts +4 -0
- package/dist/integration-engine/jis/ioc/JISContainerToken.js +5 -0
- package/dist/integration-engine/jis/ioc/JISContainerToken.js.map +1 -1
- package/dist/integration-engine/jis/repositories/JISInfotextsRedisRepository.d.ts +9 -0
- package/dist/integration-engine/jis/repositories/JISInfotextsRedisRepository.js +86 -0
- package/dist/integration-engine/jis/repositories/JISInfotextsRedisRepository.js.map +1 -0
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.d.ts +6 -1
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.js +50 -2
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.js.map +1 -1
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.d.ts +7 -0
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.js +37 -0
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.js.map +1 -0
- package/dist/integration-engine/jis/workers/JISWorker.js +1 -0
- package/dist/integration-engine/jis/workers/JISWorker.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.d.ts +13 -0
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.js +47 -0
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.js.map +1 -0
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.d.ts +1 -2
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.js +5 -4
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSCisStopsModel.d.ts +18 -0
- package/dist/integration-engine/ropid-gtfs/RopidGTFSCisStopsModel.js +44 -0
- package/dist/integration-engine/ropid-gtfs/RopidGTFSCisStopsModel.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopsModel.d.ts +5 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopsModel.js +24 -0
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopsModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/index.d.ts +1 -0
- package/dist/integration-engine/ropid-gtfs/index.js +1 -0
- package/dist/integration-engine/ropid-gtfs/index.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js +8 -0
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.d.ts +3 -0
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js +3 -0
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/transformations/RopidDeparturesPresetsTransformation.js +1 -1
- package/dist/integration-engine/ropid-gtfs/transformations/RopidDeparturesPresetsTransformation.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js +1 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js +8 -5
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsStopsCacheTask.d.ts +12 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsStopsCacheTask.js +44 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsStopsCacheTask.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/data-access/cache/GtfsStopsRedisRepository.d.ts +12 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/data-access/cache/GtfsStopsRedisRepository.js +87 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/data-access/cache/GtfsStopsRedisRepository.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.d.ts +1 -0
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js +1 -0
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +1 -0
- 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/interfaces/TripRepositoryInterfaces.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.d.ts +3 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js +124 -109
- 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/regional-bus/RegionalBusPositionsManager.d.ts +3 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/RegionalBusPositionsManager.js +100 -85
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/RegionalBusPositionsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.js +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js +2 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js.map +1 -1
- package/dist/output-gateway/index.js +1 -0
- package/dist/output-gateway/index.js.map +1 -1
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.d.ts +17 -0
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.js +113 -0
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.js.map +1 -0
- package/dist/output-gateway/jis/ioc/Di.js +2 -2
- package/dist/output-gateway/jis/ioc/Di.js.map +1 -1
- package/dist/output-gateway/jis/ioc/OgJisToken.d.ts +2 -0
- package/dist/output-gateway/jis/ioc/OgJisToken.js +2 -0
- package/dist/output-gateway/jis/ioc/OgJisToken.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v3/V3TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.d.ts +17 -0
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js +155 -0
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js.map +1 -0
- package/dist/output-gateway/pid/controllers/v4/interfaces/ITransferBoardsParams.d.ts +14 -0
- package/dist/output-gateway/pid/controllers/v4/interfaces/ITransferBoardsParams.js +3 -0
- package/dist/output-gateway/pid/controllers/v4/interfaces/ITransferBoardsParams.js.map +1 -0
- package/dist/output-gateway/pid/domain/InfotextInterfaces.d.ts +5 -0
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.d.ts +4 -1
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.js +7 -1
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.js.map +1 -1
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.d.ts +5 -0
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js +33 -0
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js.map +1 -0
- package/dist/output-gateway/pid/helpers/TransferBoardSorter.d.ts +6 -0
- package/dist/output-gateway/pid/helpers/TransferBoardSorter.js +61 -0
- package/dist/output-gateway/pid/helpers/TransferBoardSorter.js.map +1 -0
- package/dist/output-gateway/pid/index.d.ts +50 -0
- package/dist/output-gateway/pid/index.js.map +1 -1
- package/dist/output-gateway/pid/ioc/Di.js +64 -6
- package/dist/output-gateway/pid/ioc/Di.js.map +1 -1
- package/dist/output-gateway/pid/ioc/OgPidToken.d.ts +12 -0
- package/dist/output-gateway/pid/ioc/OgPidToken.js +12 -0
- package/dist/output-gateway/pid/ioc/OgPidToken.js.map +1 -1
- package/dist/output-gateway/pid/routers/index.d.ts +1 -0
- package/dist/output-gateway/pid/routers/index.js +3 -1
- package/dist/output-gateway/pid/routers/index.js.map +1 -1
- package/dist/output-gateway/pid/routers/v4/V4PIDRouter.d.ts +16 -0
- package/dist/output-gateway/pid/routers/v4/V4PIDRouter.js +67 -0
- package/dist/output-gateway/pid/routers/v4/V4PIDRouter.js.map +1 -0
- package/dist/output-gateway/pid/service/facade/InfotextFacade.d.ts +7 -2
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js +29 -4
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/StopFacade.d.ts +12 -3
- package/dist/output-gateway/pid/service/facade/StopFacade.js +43 -7
- package/dist/output-gateway/pid/service/facade/StopFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/TransferFacade.d.ts +17 -10
- package/dist/output-gateway/pid/service/facade/TransferFacade.js +161 -16
- package/dist/output-gateway/pid/service/facade/TransferFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.d.ts +7 -1
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.js +9 -0
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.js.map +1 -1
- package/dist/output-gateway/pid/service/transformations/JISInfotextCacheTransferTransformation.d.ts +13 -0
- package/dist/output-gateway/pid/service/transformations/JISInfotextCacheTransferTransformation.js +31 -0
- package/dist/output-gateway/pid/service/transformations/JISInfotextCacheTransferTransformation.js.map +1 -0
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.d.ts +27 -0
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js +77 -0
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js.map +1 -0
- package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.d.ts +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.js +7 -4
- package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.js.map +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicStopTimeRepository.d.ts +1 -0
- package/dist/output-gateway/public/data-access/redis/PublicStopTimeRepository.js +21 -0
- package/dist/output-gateway/public/data-access/redis/PublicStopTimeRepository.js.map +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicVehiclePositionsRepository.d.ts +2 -1
- package/dist/output-gateway/public/data-access/redis/PublicVehiclePositionsRepository.js +14 -15
- package/dist/output-gateway/public/data-access/redis/PublicVehiclePositionsRepository.js.map +1 -1
- package/dist/output-gateway/public/domain/repository/IGtfsDepartureRepository.d.ts +1 -1
- package/dist/output-gateway/public/ioc/Di.js +1 -1
- package/dist/output-gateway/public/ioc/Di.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsStopsRedisRepository.d.ts +13 -0
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsStopsRedisRepository.js +83 -0
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsStopsRedisRepository.js.map +1 -0
- package/dist/output-gateway/shared/constants/route-version.d.ts +2 -1
- package/dist/output-gateway/shared/constants/route-version.js +1 -0
- package/dist/output-gateway/shared/constants/route-version.js.map +1 -1
- package/dist/output-gateway/{public → shared}/service/VPSubscriber.d.ts +4 -2
- package/dist/output-gateway/{public → shared}/service/VPSubscriber.js +1 -1
- package/dist/output-gateway/shared/service/VPSubscriber.js.map +1 -0
- package/dist/schema-definitions/jis/redis/const.d.ts +1 -0
- package/dist/schema-definitions/jis/redis/const.js +2 -1
- package/dist/schema-definitions/jis/redis/const.js.map +1 -1
- package/dist/schema-definitions/jis/redis/interfaces/IJISInfotextDto.d.ts +17 -0
- package/dist/schema-definitions/jis/redis/interfaces/IJISInfotextDto.js +3 -0
- package/dist/schema-definitions/jis/redis/interfaces/IJISInfotextDto.js.map +1 -0
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.d.ts +3 -0
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.js +59 -0
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.js.map +1 -0
- package/dist/schema-definitions/ropid-departures-presets/index.d.ts +1 -0
- package/dist/schema-definitions/ropid-departures-presets/index.js +3 -0
- package/dist/schema-definitions/ropid-departures-presets/index.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopCisDto.d.ts +16 -0
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopCisDto.js +3 -0
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopCisDto.js.map +1 -0
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopDto.d.ts +1 -0
- package/dist/schema-definitions/ropid-gtfs/models/StopCisDto.d.ts +58 -0
- package/dist/schema-definitions/ropid-gtfs/models/StopCisDto.js +69 -0
- package/dist/schema-definitions/ropid-gtfs/models/StopCisDto.js.map +1 -0
- package/dist/schema-definitions/ropid-gtfs/redis/const.d.ts +1 -0
- package/dist/schema-definitions/ropid-gtfs/redis/const.js +2 -1
- package/dist/schema-definitions/ropid-gtfs/redis/const.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.d.ts +3 -2
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.js +4 -0
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/interfaces/IPublicStopTimeDto.d.ts +1 -0
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IPublicApiCacheDto.d.ts +2 -0
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IPublicStopTimeCacheDto.d.ts +1 -0
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js +8 -0
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js +4 -1
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js.map +1 -1
- package/docs/asyncapi.yaml +45 -0
- package/docs/cache/types/redis.md +82 -2
- package/docs/jis/index.md +15 -5
- package/docs/openapi-input.yaml +13 -2
- package/docs/openapi-output.yaml +326 -4
- package/package.json +2 -2
- package/dist/output-gateway/public/service/VPSubscriber.js.map +0 -1
|
@@ -52,9 +52,11 @@ const PositionHandlerEnum_1 = require("./PositionHandlerEnum");
|
|
|
52
52
|
const ValidToCalculator_1 = require("./ValidToCalculator");
|
|
53
53
|
const ComputeDelayHelper_1 = __importDefault(require("./compute-positions/ComputeDelayHelper"));
|
|
54
54
|
const PositionStateDelayManager = __importStar(require("./state-position/PositionStateDelayManager"));
|
|
55
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
55
56
|
let PositionsManager = exports.PositionsManager = PositionsManager_1 = class PositionsManager extends BasePositionsManager_1.BasePositionsManager {
|
|
56
|
-
constructor(validToCalculator) {
|
|
57
|
+
constructor(logger, validToCalculator) {
|
|
57
58
|
super({ useEndTimestamp: true, allowCancelState: true });
|
|
59
|
+
this.logger = logger;
|
|
58
60
|
this.validToCalculator = validToCalculator;
|
|
59
61
|
/**
|
|
60
62
|
* Takes position one by one, set proper handler for type of position, and do the process of position
|
|
@@ -72,123 +74,135 @@ let PositionsManager = exports.PositionsManager = PositionsManager_1 = class Pos
|
|
|
72
74
|
for (const position of positionsSource) {
|
|
73
75
|
let positionToUpdate = null;
|
|
74
76
|
// situations
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
positionToUpdate
|
|
77
|
+
try {
|
|
78
|
+
switch (this.setPositionUpdateHandler(position)) {
|
|
79
|
+
case PositionHandlerEnum_1.PositionHandlerEnum.TRACKING: {
|
|
80
|
+
const currentPosition = turf.point([position.lng, position.lat], {
|
|
81
|
+
id: position.id,
|
|
82
|
+
origin_time: position.origin_time,
|
|
83
|
+
origin_timestamp: position.origin_timestamp,
|
|
84
|
+
scheduled_timestamp: position.scheduled_timestamp,
|
|
85
|
+
this_stop_id: position.this_stop_id,
|
|
86
|
+
tcp_event: position.tcp_event,
|
|
87
|
+
});
|
|
88
|
+
positionToUpdate = this.getEstimatedPoint(tripPositions.gtfsData, currentPosition, context, startDayTimestamp, tripPositions.gtfs_route_type);
|
|
89
|
+
if (positionToUpdate.state_position !== const_1.StatePositionEnum.MISMATCHED) {
|
|
90
|
+
positionToUpdate = ComputeDelayHelper_1.default.updatePositionToUpdate(context, positionToUpdate, position, gtfsRouteType);
|
|
91
|
+
}
|
|
92
|
+
positionToUpdate.bearing = position.bearing ?? positionToUpdate.bearing;
|
|
93
|
+
break;
|
|
88
94
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
95
|
+
case PositionHandlerEnum_1.PositionHandlerEnum.NOT_TRACKING: {
|
|
96
|
+
// if there is no previous positions with tracking status, set position as before_track
|
|
97
|
+
const firstShapesAnchorPoint = tripPositions.gtfsData.shapes_anchor_points[0];
|
|
98
|
+
const invisibleByDpp = 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.is_tracked);
|
|
99
|
+
if (this.isFreshNewVehicleInSystem(context, position, endTimestamp)) {
|
|
100
|
+
const firstStopTime = tripPositions.gtfsData.stop_times[0];
|
|
101
|
+
// if there is propagated delay we can use it for new position
|
|
102
|
+
const lastPositionDelayed = context.lastPositionBeforeTrackDelayed;
|
|
103
|
+
// if there is no delay to duplicate and DPP trip is far from start then invisible
|
|
104
|
+
const setAsInvisible = !lastPositionDelayed && invisibleByDpp;
|
|
105
|
+
positionToUpdate = this.defaultNonTrackingPositionToUpdate(position, firstStopTime, startDayTimestamp, setAsInvisible, lastPositionDelayed);
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
// if there is tracking 2 position with same origin_timestamp then this position is duplicate
|
|
109
|
+
const statePosition = this.detectDuplicatePosition(position, context.lastPositionOriginTimestamp, positionsSource);
|
|
110
|
+
const lastShapesAnchorPoint = tripPositions.gtfsData.shapes_anchor_points[tripPositions.gtfsData.shapes_anchor_points.length - 1];
|
|
111
|
+
const lastStopTime = tripPositions.gtfsData.stop_times[tripPositions.gtfsData.stop_times.length - 1];
|
|
112
|
+
// set as invisible if there are some AFTER_TRACK before
|
|
113
|
+
const setAsInvisible = invisibleByDpp && statePosition === const_1.StatePositionEnum.AFTER_TRACK;
|
|
114
|
+
const lastShapesAnchorPointTimeScheduled = DateTimeUtils_1.DateTimeUtils.getStopDateTimeForDayStart(lastShapesAnchorPoint.time_scheduled_seconds, startDayTimestamp);
|
|
115
|
+
positionToUpdate = {
|
|
116
|
+
id: position.id,
|
|
117
|
+
last_stop_arrival_time: lastShapesAnchorPointTimeScheduled,
|
|
118
|
+
last_stop_departure_time: lastShapesAnchorPointTimeScheduled,
|
|
119
|
+
last_stop_id: lastStopTime.stop_id,
|
|
120
|
+
last_stop_sequence: lastShapesAnchorPoint.last_stop_sequence,
|
|
121
|
+
shape_dist_traveled: lastShapesAnchorPoint.shape_dist_traveled,
|
|
122
|
+
state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : statePosition,
|
|
123
|
+
state_process: const_1.StateProcessEnum.PROCESSED,
|
|
124
|
+
delay: position.delay ?? null,
|
|
125
|
+
...(lastStopTime.stop_headsign && {
|
|
126
|
+
last_stop_headsign: lastStopTime.stop_headsign,
|
|
127
|
+
}),
|
|
128
|
+
};
|
|
129
|
+
// if state was changed in last 30 seconds, then it is AFTER_TRACK_DELAYED
|
|
130
|
+
// with delay computation (copied from delay at stop)
|
|
131
|
+
if (positionToUpdate.state_position === const_1.StatePositionEnum.AFTER_TRACK &&
|
|
132
|
+
PositionStateDelayManager.PositionStateDelayManager.shouldPropagateAfterTrackDelay(context)) {
|
|
133
|
+
positionToUpdate.state_position = const_1.StatePositionEnum.AFTER_TRACK_DELAYED;
|
|
134
|
+
}
|
|
135
|
+
positionToUpdate = ComputeDelayHelper_1.default.updatePositionToUpdate(context, positionToUpdate, position, gtfsRouteType);
|
|
136
|
+
if (positionToUpdate.state_position === const_1.StatePositionEnum.AFTER_TRACK_DELAYED) {
|
|
137
|
+
positionToUpdate.delay = positionToUpdate.delay_stop_arrival ?? null;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
break;
|
|
103
141
|
}
|
|
104
|
-
|
|
105
|
-
// if there is tracking 2 position with same origin_timestamp then this position is duplicate
|
|
106
|
-
const statePosition = this.detectDuplicatePosition(position, context.lastPositionOriginTimestamp, positionsSource);
|
|
107
|
-
const lastShapesAnchorPoint = tripPositions.gtfsData.shapes_anchor_points[tripPositions.gtfsData.shapes_anchor_points.length - 1];
|
|
108
|
-
const lastStopTime = tripPositions.gtfsData.stop_times[tripPositions.gtfsData.stop_times.length - 1];
|
|
109
|
-
// set as invisible if there are some AFTER_TRACK before
|
|
110
|
-
const setAsInvisible = invisibleByDpp && statePosition === const_1.StatePositionEnum.AFTER_TRACK;
|
|
111
|
-
const lastShapesAnchorPointTimeScheduled = DateTimeUtils_1.DateTimeUtils.getStopDateTimeForDayStart(lastShapesAnchorPoint.time_scheduled_seconds, startDayTimestamp);
|
|
142
|
+
case PositionHandlerEnum_1.PositionHandlerEnum.CANCELED: {
|
|
112
143
|
positionToUpdate = {
|
|
113
144
|
id: position.id,
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
last_stop_sequence: lastShapesAnchorPoint.last_stop_sequence,
|
|
118
|
-
shape_dist_traveled: lastShapesAnchorPoint.shape_dist_traveled,
|
|
119
|
-
state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : statePosition,
|
|
145
|
+
lat: position.lat ?? context.lastPositionLat ?? null,
|
|
146
|
+
lng: position.lng ?? context.lastPositionLng ?? null,
|
|
147
|
+
state_position: const_1.StatePositionEnum.CANCELED,
|
|
120
148
|
state_process: const_1.StateProcessEnum.PROCESSED,
|
|
121
|
-
delay: position.delay ?? null,
|
|
122
|
-
...(lastStopTime.stop_headsign && {
|
|
123
|
-
last_stop_headsign: lastStopTime.stop_headsign,
|
|
124
|
-
}),
|
|
125
149
|
};
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
}
|
|
150
|
+
positionToUpdate.lat = positionToUpdate.lat || 0;
|
|
151
|
+
positionToUpdate.lng = positionToUpdate.lng || 0;
|
|
152
|
+
break;
|
|
153
|
+
}
|
|
154
|
+
case PositionHandlerEnum_1.PositionHandlerEnum.DO_NOTHING: {
|
|
155
|
+
break;
|
|
156
|
+
}
|
|
157
|
+
default: {
|
|
158
|
+
break;
|
|
136
159
|
}
|
|
137
|
-
break;
|
|
138
|
-
}
|
|
139
|
-
case PositionHandlerEnum_1.PositionHandlerEnum.CANCELED: {
|
|
140
|
-
positionToUpdate = {
|
|
141
|
-
id: position.id,
|
|
142
|
-
lat: position.lat ?? context.lastPositionLat ?? null,
|
|
143
|
-
lng: position.lng ?? context.lastPositionLng ?? null,
|
|
144
|
-
state_position: const_1.StatePositionEnum.CANCELED,
|
|
145
|
-
state_process: const_1.StateProcessEnum.PROCESSED,
|
|
146
|
-
};
|
|
147
|
-
positionToUpdate.lat = positionToUpdate.lat || 0;
|
|
148
|
-
positionToUpdate.lng = positionToUpdate.lng || 0;
|
|
149
|
-
break;
|
|
150
160
|
}
|
|
151
|
-
|
|
152
|
-
|
|
161
|
+
const detection = this.detectBacktracking(position, context, positionToUpdate, gtfsRouteType, tripPositions, startTimestamp, isBacktrackingDetected);
|
|
162
|
+
positionToUpdate = detection.positionToUpdate;
|
|
163
|
+
isBacktrackingDetected = detection.isBacktrackingDetected;
|
|
164
|
+
computedPositions.push(positionToUpdate);
|
|
165
|
+
// sets last known BEFORE_TRACK_DELAYED position
|
|
166
|
+
// sets last position tracking (only for at_stop and on_track)
|
|
167
|
+
this.setLastPositionTracking(position, context, positionToUpdate);
|
|
168
|
+
// set new first position at stop streak if this stop seqence is set and it is not same as before
|
|
169
|
+
this.setFirstUniqueStopSequence(positionToUpdate, context, position);
|
|
170
|
+
// IF currently valid updated position / position was processed before
|
|
171
|
+
// and it is NOT AT_STOP
|
|
172
|
+
// then disrupt atStopStreak
|
|
173
|
+
if (this.disruptAtStopStreak(position, positionToUpdate)) {
|
|
174
|
+
context.atStopStreak.stop_sequence = null;
|
|
153
175
|
}
|
|
154
|
-
|
|
155
|
-
|
|
176
|
+
// based on the fact that current position has some tcp_event
|
|
177
|
+
// allows the canceled boolean to be changed, otherwise use the prev.value
|
|
178
|
+
lastPositionStaysCanceled = this.hasTcpEventOrCancel(position) ?? lastPositionStaysCanceled;
|
|
179
|
+
// duplicated or mismatched position should not be considered at all
|
|
180
|
+
if (positionToUpdate &&
|
|
181
|
+
positionToUpdate.state_position !== const_1.StatePositionEnum.DUPLICATE &&
|
|
182
|
+
positionToUpdate.state_position !== const_1.StatePositionEnum.INVISIBLE &&
|
|
183
|
+
positionToUpdate.state_position !== const_1.StatePositionEnum.MISMATCHED) {
|
|
184
|
+
context.lastPositionId = position.id;
|
|
185
|
+
context.lastPositionLat = position.lat;
|
|
186
|
+
context.lastPositionLng = position.lng;
|
|
187
|
+
context.lastPositionCanceled = lastPositionStaysCanceled || position.is_canceled;
|
|
188
|
+
context.lastPositionOriginTimestamp = position.origin_timestamp.getTime();
|
|
189
|
+
context.lastStopSequence = positionToUpdate.last_stop_sequence ?? context.lastStopSequence ?? null;
|
|
190
|
+
if (context.lastPositionState !== positionToUpdate.state_position) {
|
|
191
|
+
context.lastPositionState = positionToUpdate.state_position;
|
|
192
|
+
context.lastPositionStateChange = new Date().toISOString();
|
|
193
|
+
}
|
|
194
|
+
ComputeDelayHelper_1.default.updateContext(context, positionToUpdate, position, gtfsRouteType);
|
|
156
195
|
}
|
|
157
196
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
// IF currently valid updated position / position was processed before
|
|
168
|
-
// and it is NOT AT_STOP
|
|
169
|
-
// then disrupt atStopStreak
|
|
170
|
-
if (this.disruptAtStopStreak(position, positionToUpdate)) {
|
|
171
|
-
context.atStopStreak.stop_sequence = null;
|
|
172
|
-
}
|
|
173
|
-
// based on the fact that current position has some tcp_event
|
|
174
|
-
// allows the canceled boolean to be changed, otherwise use the prev.value
|
|
175
|
-
lastPositionStaysCanceled = this.hasTcpEventOrCancel(position) ?? lastPositionStaysCanceled;
|
|
176
|
-
// duplicated or mismatched position should not be considered at all
|
|
177
|
-
if (positionToUpdate &&
|
|
178
|
-
positionToUpdate.state_position !== const_1.StatePositionEnum.DUPLICATE &&
|
|
179
|
-
positionToUpdate.state_position !== const_1.StatePositionEnum.INVISIBLE &&
|
|
180
|
-
positionToUpdate.state_position !== const_1.StatePositionEnum.MISMATCHED) {
|
|
181
|
-
context.lastPositionId = position.id;
|
|
182
|
-
context.lastPositionLat = position.lat;
|
|
183
|
-
context.lastPositionLng = position.lng;
|
|
184
|
-
context.lastPositionCanceled = lastPositionStaysCanceled || position.is_canceled;
|
|
185
|
-
context.lastPositionOriginTimestamp = position.origin_timestamp.getTime();
|
|
186
|
-
context.lastStopSequence = positionToUpdate.last_stop_sequence ?? context.lastStopSequence ?? null;
|
|
187
|
-
if (context.lastPositionState !== positionToUpdate.state_position) {
|
|
188
|
-
context.lastPositionState = positionToUpdate.state_position;
|
|
189
|
-
context.lastPositionStateChange = new Date().toISOString();
|
|
190
|
-
}
|
|
191
|
-
ComputeDelayHelper_1.default.updateContext(context, positionToUpdate, position, gtfsRouteType);
|
|
197
|
+
catch (error) {
|
|
198
|
+
this.logger.error({
|
|
199
|
+
error,
|
|
200
|
+
context,
|
|
201
|
+
positionId: position.id,
|
|
202
|
+
lat: position.lat,
|
|
203
|
+
lng: position.lng,
|
|
204
|
+
}, `${this.constructor.name}: Error while processing position`);
|
|
205
|
+
continue;
|
|
192
206
|
}
|
|
193
207
|
}
|
|
194
208
|
return {
|
|
@@ -385,7 +399,8 @@ let PositionsManager = exports.PositionsManager = PositionsManager_1 = class Pos
|
|
|
385
399
|
};
|
|
386
400
|
exports.PositionsManager = PositionsManager = PositionsManager_1 = __decorate([
|
|
387
401
|
(0, tsyringe_1.injectable)(),
|
|
388
|
-
__param(0, (0, tsyringe_1.inject)(
|
|
389
|
-
|
|
402
|
+
__param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
403
|
+
__param(1, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.ValidToCalculator)),
|
|
404
|
+
__metadata("design:paramtypes", [Object, ValidToCalculator_1.ValidToCalculator])
|
|
390
405
|
], PositionsManager);
|
|
391
406
|
//# sourceMappingURL=PositionsManager.js.map
|
|
@@ -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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"}
|
|
@@ -5,9 +5,11 @@ import { ValidToCalculator } from "../ValidToCalculator";
|
|
|
5
5
|
import { BasePositionsManager } from "../BasePositionsManager";
|
|
6
6
|
import { IScheduleDto } from "../../../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
|
|
7
7
|
import { GTFSRouteTypeEnum } from "../../../../../../helpers/RouteTypeEnums";
|
|
8
|
+
import { ILogger } from "@golemio/core/dist/helpers";
|
|
8
9
|
export declare class RegionalBusPositionsManager extends BasePositionsManager {
|
|
9
10
|
protected validToCalculator: ValidToCalculator;
|
|
10
|
-
|
|
11
|
+
private logger;
|
|
12
|
+
constructor(validToCalculator: ValidToCalculator, logger: ILogger);
|
|
11
13
|
/**
|
|
12
14
|
* Takes position one by one, set proper handler for type of position, and do the process of position
|
|
13
15
|
*/
|
|
@@ -47,10 +47,12 @@ const ValidToCalculator_1 = require("../ValidToCalculator");
|
|
|
47
47
|
const PositionStateDelayManager_1 = require("../state-position/PositionStateDelayManager");
|
|
48
48
|
const RegionalBusComputeDelayHelper_1 = require("./compute-positions/RegionalBusComputeDelayHelper");
|
|
49
49
|
const BasePositionsManager_1 = require("../BasePositionsManager");
|
|
50
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
50
51
|
let RegionalBusPositionsManager = exports.RegionalBusPositionsManager = RegionalBusPositionsManager_1 = class RegionalBusPositionsManager extends BasePositionsManager_1.BasePositionsManager {
|
|
51
|
-
constructor(validToCalculator) {
|
|
52
|
+
constructor(validToCalculator, logger) {
|
|
52
53
|
super({ useEndTimestamp: false, allowCancelState: false });
|
|
53
54
|
this.validToCalculator = validToCalculator;
|
|
55
|
+
this.logger = logger;
|
|
54
56
|
/**
|
|
55
57
|
* Takes position one by one, set proper handler for type of position, and do the process of position
|
|
56
58
|
*/
|
|
@@ -62,95 +64,107 @@ let RegionalBusPositionsManager = exports.RegionalBusPositionsManager = Regional
|
|
|
62
64
|
for (const position of positionsSource) {
|
|
63
65
|
let positionToUpdate = null;
|
|
64
66
|
// situations
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
origin_time: position.origin_time,
|
|
70
|
-
origin_timestamp: position.origin_timestamp,
|
|
71
|
-
scheduled_timestamp: position.scheduled_timestamp,
|
|
72
|
-
this_stop_id: position.this_stop_id,
|
|
73
|
-
tcp_event: position.tcp_event,
|
|
74
|
-
});
|
|
75
|
-
positionToUpdate = this.getEstimatedPoint(tripPositions.gtfsData, currentPosition, context, startDayTimestamp);
|
|
76
|
-
positionToUpdate = RegionalBusComputeDelayHelper_1.RegionalBusComputeDelayHelper.updatePositionToUpdate(context, positionToUpdate, position, gtfsRouteType);
|
|
77
|
-
positionToUpdate.bearing = position.bearing ?? positionToUpdate.bearing;
|
|
78
|
-
break;
|
|
79
|
-
case PositionHandlerEnum_1.PositionHandlerEnum.NOT_TRACKING:
|
|
80
|
-
// if there is no previous positions with tracking status, set position as before_track
|
|
81
|
-
if (this.isFreshNewVehicleInSystem(context, position, null)) {
|
|
82
|
-
const firstStopTime = tripPositions.gtfsData.stop_times[0];
|
|
83
|
-
positionToUpdate = this.defaultNonTrackingPositionToUpdate(position, firstStopTime, startDayTimestamp, false, 0);
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
// if there is tracking 2 position with same origin_timestamp then this position is duplicate
|
|
87
|
-
const statePosition = this.detectDuplicatePosition(position, context.lastPositionOriginTimestamp, positionsSource);
|
|
88
|
-
const lastShapesAnchorPoint = tripPositions.gtfsData.shapes_anchor_points[tripPositions.gtfsData.shapes_anchor_points.length - 1];
|
|
89
|
-
const lastStopTime = tripPositions.gtfsData.stop_times[tripPositions.gtfsData.stop_times.length - 1];
|
|
90
|
-
const lastShapesAnchorPointTimeScheduled = DateTimeUtils_1.DateTimeUtils.getStopDateTimeForDayStart(lastShapesAnchorPoint.time_scheduled_seconds, startDayTimestamp);
|
|
91
|
-
positionToUpdate = {
|
|
67
|
+
try {
|
|
68
|
+
switch (this.setPositionUpdateHandler(position)) {
|
|
69
|
+
case PositionHandlerEnum_1.PositionHandlerEnum.TRACKING:
|
|
70
|
+
const currentPosition = turf.point([position.lng, position.lat], {
|
|
92
71
|
id: position.id,
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
...(lastStopTime.stop_headsign && {
|
|
101
|
-
last_stop_headsign: lastStopTime.stop_headsign,
|
|
102
|
-
}),
|
|
103
|
-
};
|
|
104
|
-
// if state was changed in last 30 seconds, then it is AFTER_TRACK_DELAYED
|
|
105
|
-
// with delay computation (copied from delay at stop)
|
|
106
|
-
if (positionToUpdate.state_position === const_1.StatePositionEnum.AFTER_TRACK &&
|
|
107
|
-
PositionStateDelayManager_1.PositionStateDelayManager.shouldPropagateAfterTrackDelay(context)) {
|
|
108
|
-
positionToUpdate.state_position = const_1.StatePositionEnum.AFTER_TRACK_DELAYED;
|
|
109
|
-
}
|
|
72
|
+
origin_time: position.origin_time,
|
|
73
|
+
origin_timestamp: position.origin_timestamp,
|
|
74
|
+
scheduled_timestamp: position.scheduled_timestamp,
|
|
75
|
+
this_stop_id: position.this_stop_id,
|
|
76
|
+
tcp_event: position.tcp_event,
|
|
77
|
+
});
|
|
78
|
+
positionToUpdate = this.getEstimatedPoint(tripPositions.gtfsData, currentPosition, context, startDayTimestamp);
|
|
110
79
|
positionToUpdate = RegionalBusComputeDelayHelper_1.RegionalBusComputeDelayHelper.updatePositionToUpdate(context, positionToUpdate, position, gtfsRouteType);
|
|
111
|
-
|
|
112
|
-
|
|
80
|
+
positionToUpdate.bearing = position.bearing ?? positionToUpdate.bearing;
|
|
81
|
+
break;
|
|
82
|
+
case PositionHandlerEnum_1.PositionHandlerEnum.NOT_TRACKING:
|
|
83
|
+
// if there is no previous positions with tracking status, set position as before_track
|
|
84
|
+
if (this.isFreshNewVehicleInSystem(context, position, null)) {
|
|
85
|
+
const firstStopTime = tripPositions.gtfsData.stop_times[0];
|
|
86
|
+
positionToUpdate = this.defaultNonTrackingPositionToUpdate(position, firstStopTime, startDayTimestamp, false, 0);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
// if there is tracking 2 position with same origin_timestamp then this position is duplicate
|
|
90
|
+
const statePosition = this.detectDuplicatePosition(position, context.lastPositionOriginTimestamp, positionsSource);
|
|
91
|
+
const lastShapesAnchorPoint = tripPositions.gtfsData.shapes_anchor_points[tripPositions.gtfsData.shapes_anchor_points.length - 1];
|
|
92
|
+
const lastStopTime = tripPositions.gtfsData.stop_times[tripPositions.gtfsData.stop_times.length - 1];
|
|
93
|
+
const lastShapesAnchorPointTimeScheduled = DateTimeUtils_1.DateTimeUtils.getStopDateTimeForDayStart(lastShapesAnchorPoint.time_scheduled_seconds, startDayTimestamp);
|
|
94
|
+
positionToUpdate = {
|
|
95
|
+
id: position.id,
|
|
96
|
+
last_stop_arrival_time: lastShapesAnchorPointTimeScheduled,
|
|
97
|
+
last_stop_departure_time: lastShapesAnchorPointTimeScheduled,
|
|
98
|
+
last_stop_id: lastStopTime.stop_id,
|
|
99
|
+
last_stop_sequence: lastShapesAnchorPoint.last_stop_sequence,
|
|
100
|
+
shape_dist_traveled: lastShapesAnchorPoint.shape_dist_traveled,
|
|
101
|
+
state_position: statePosition,
|
|
102
|
+
state_process: const_1.StateProcessEnum.PROCESSED,
|
|
103
|
+
...(lastStopTime.stop_headsign && {
|
|
104
|
+
last_stop_headsign: lastStopTime.stop_headsign,
|
|
105
|
+
}),
|
|
106
|
+
};
|
|
107
|
+
// if state was changed in last 30 seconds, then it is AFTER_TRACK_DELAYED
|
|
108
|
+
// with delay computation (copied from delay at stop)
|
|
109
|
+
if (positionToUpdate.state_position === const_1.StatePositionEnum.AFTER_TRACK &&
|
|
110
|
+
PositionStateDelayManager_1.PositionStateDelayManager.shouldPropagateAfterTrackDelay(context)) {
|
|
111
|
+
positionToUpdate.state_position = const_1.StatePositionEnum.AFTER_TRACK_DELAYED;
|
|
112
|
+
}
|
|
113
|
+
positionToUpdate = RegionalBusComputeDelayHelper_1.RegionalBusComputeDelayHelper.updatePositionToUpdate(context, positionToUpdate, position, gtfsRouteType);
|
|
114
|
+
if (positionToUpdate.state_position === const_1.StatePositionEnum.AFTER_TRACK_DELAYED) {
|
|
115
|
+
positionToUpdate.delay = positionToUpdate.delay_stop_arrival ?? null;
|
|
116
|
+
}
|
|
113
117
|
}
|
|
118
|
+
break;
|
|
119
|
+
case PositionHandlerEnum_1.PositionHandlerEnum.DO_NOTHING:
|
|
120
|
+
default:
|
|
121
|
+
break;
|
|
122
|
+
}
|
|
123
|
+
// if not null push to update
|
|
124
|
+
if (positionToUpdate) {
|
|
125
|
+
positionToUpdate.is_tracked ??= position.is_tracked;
|
|
126
|
+
positionToUpdate.valid_to = this.validToCalculator.getValidToAttribute(positionToUpdate, position, gtfsRouteType, tripPositions.gtfsData, startTimestamp);
|
|
127
|
+
// backtracking detection so we can later invalidate old positions
|
|
128
|
+
if (!isBacktrackingDetected && positionToUpdate.last_stop_sequence && context.lastStopSequence) {
|
|
129
|
+
isBacktrackingDetected = positionToUpdate.last_stop_sequence < context.lastStopSequence;
|
|
114
130
|
}
|
|
115
|
-
|
|
116
|
-
case PositionHandlerEnum_1.PositionHandlerEnum.DO_NOTHING:
|
|
117
|
-
default:
|
|
118
|
-
break;
|
|
119
|
-
}
|
|
120
|
-
// if not null push to update
|
|
121
|
-
if (positionToUpdate) {
|
|
122
|
-
positionToUpdate.is_tracked ??= position.is_tracked;
|
|
123
|
-
positionToUpdate.valid_to = this.validToCalculator.getValidToAttribute(positionToUpdate, position, gtfsRouteType, tripPositions.gtfsData, startTimestamp);
|
|
124
|
-
// backtracking detection so we can later invalidate old positions
|
|
125
|
-
if (!isBacktrackingDetected && positionToUpdate.last_stop_sequence && context.lastStopSequence) {
|
|
126
|
-
isBacktrackingDetected = positionToUpdate.last_stop_sequence < context.lastStopSequence;
|
|
131
|
+
computedPositions.push(positionToUpdate);
|
|
127
132
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
if (this.disruptAtStopStreak(position, positionToUpdate)) {
|
|
139
|
-
context.atStopStreak.stop_sequence = null;
|
|
140
|
-
}
|
|
141
|
-
// duplicated position should not be considered at all
|
|
142
|
-
if (positionToUpdate && positionToUpdate.state_position !== const_1.StatePositionEnum.DUPLICATE) {
|
|
143
|
-
context.lastPositionId = position.id;
|
|
144
|
-
context.lastPositionLat = position.lat;
|
|
145
|
-
context.lastPositionLng = position.lng;
|
|
146
|
-
context.lastPositionCanceled = position.is_canceled;
|
|
147
|
-
context.lastPositionOriginTimestamp = position.origin_timestamp.getTime();
|
|
148
|
-
context.lastStopSequence = positionToUpdate.last_stop_sequence ?? context.lastStopSequence ?? null;
|
|
149
|
-
if (context.lastPositionState !== positionToUpdate.state_position) {
|
|
150
|
-
context.lastPositionState = positionToUpdate.state_position;
|
|
151
|
-
context.lastPositionStateChange = new Date().toISOString();
|
|
133
|
+
// set last known BEFORE_TRACK_DELAYED position
|
|
134
|
+
// set last position tracking (only for at_stop and on_track)
|
|
135
|
+
this.setLastPositionTracking(position, context, positionToUpdate);
|
|
136
|
+
// set new first position at stop streak if this stop seqence is set and it is not same as before
|
|
137
|
+
this.setFirstUniqueStopSequence(positionToUpdate, context, position);
|
|
138
|
+
// IF currently valid updated position / position was processed before
|
|
139
|
+
// and it is NOT AT_STOP
|
|
140
|
+
// then disrupt atStopStreak
|
|
141
|
+
if (this.disruptAtStopStreak(position, positionToUpdate)) {
|
|
142
|
+
context.atStopStreak.stop_sequence = null;
|
|
152
143
|
}
|
|
153
|
-
|
|
144
|
+
// duplicated position should not be considered at all
|
|
145
|
+
if (positionToUpdate && positionToUpdate.state_position !== const_1.StatePositionEnum.DUPLICATE) {
|
|
146
|
+
context.lastPositionId = position.id;
|
|
147
|
+
context.lastPositionLat = position.lat;
|
|
148
|
+
context.lastPositionLng = position.lng;
|
|
149
|
+
context.lastPositionCanceled = position.is_canceled;
|
|
150
|
+
context.lastPositionOriginTimestamp = position.origin_timestamp.getTime();
|
|
151
|
+
context.lastStopSequence = positionToUpdate.last_stop_sequence ?? context.lastStopSequence ?? null;
|
|
152
|
+
if (context.lastPositionState !== positionToUpdate.state_position) {
|
|
153
|
+
context.lastPositionState = positionToUpdate.state_position;
|
|
154
|
+
context.lastPositionStateChange = new Date().toISOString();
|
|
155
|
+
}
|
|
156
|
+
RegionalBusComputeDelayHelper_1.RegionalBusComputeDelayHelper.updateContext(context, positionToUpdate, position, gtfsRouteType);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
this.logger.error({
|
|
161
|
+
error,
|
|
162
|
+
context,
|
|
163
|
+
positionId: position.id,
|
|
164
|
+
lat: position.lat,
|
|
165
|
+
lng: position.lng,
|
|
166
|
+
}, `${this.constructor.name}: Error while processing position`);
|
|
167
|
+
continue;
|
|
154
168
|
}
|
|
155
169
|
}
|
|
156
170
|
return {
|
|
@@ -261,6 +275,7 @@ let RegionalBusPositionsManager = exports.RegionalBusPositionsManager = Regional
|
|
|
261
275
|
exports.RegionalBusPositionsManager = RegionalBusPositionsManager = RegionalBusPositionsManager_1 = __decorate([
|
|
262
276
|
(0, tsyringe_1.injectable)(),
|
|
263
277
|
__param(0, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.ValidToCalculator)),
|
|
264
|
-
|
|
278
|
+
__param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
279
|
+
__metadata("design:paramtypes", [ValidToCalculator_1.ValidToCalculator, Object])
|
|
265
280
|
], RegionalBusPositionsManager);
|
|
266
281
|
//# sourceMappingURL=RegionalBusPositionsManager.js.map
|