@golemio/public-transport 0.1.0-dev.2874321276 → 0.1.0-dev.2875375186
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts +7 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +48 -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/helpers/RawQueryProvider.d.ts +6 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.js +46 -0
- 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/data-access/interfaces/TripRepositoryInterfaces.d.ts +35 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-rt/GtfsRtPositionStateMapper.d.ts +39 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-rt/GtfsRtPositionStateMapper.js +110 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-rt/GtfsRtPositionStateMapper.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/GtfsRtPollTask.d.ts +9 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/GtfsRtPollTask.js +95 -36
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/GtfsRtPollTask.js.map +1 -1
- package/docs/follow-ups.md +21 -0
- package/package.json +1 -1
|
@@ -13,7 +13,7 @@ import Sequelize from "@golemio/core/dist/shared/sequelize";
|
|
|
13
13
|
import { IUpdateRunsGtfsTripInput } from "../interfaces/IUpdateRunsGtfsTripInput";
|
|
14
14
|
import { IPropagateDelay } from "../interfaces/VPInterfaces";
|
|
15
15
|
import { PositionsRepository } from "./PositionsRepository";
|
|
16
|
-
import { IEnrichedTripForPublicApi, IFoundGenericGtfsTripData, IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData, IUpdateGTFSTripIdData } from "./interfaces/TripRepositoryInterfaces";
|
|
16
|
+
import { IEnrichedTripForPublicApi, IFoundGenericGtfsTripData, IGtfsStopContext, IGtfsStopLookupInput, IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData, IUpdateGTFSTripIdData } from "./interfaces/TripRepositoryInterfaces";
|
|
17
17
|
export declare class TripsRepository extends PostgresModel implements IModel {
|
|
18
18
|
private logger;
|
|
19
19
|
private connector;
|
|
@@ -30,6 +30,12 @@ export declare class TripsRepository extends PostgresModel implements IModel {
|
|
|
30
30
|
* candidate when a trip_id recurs across the +/- 1 day window.
|
|
31
31
|
*/
|
|
32
32
|
findGTFSTripById: (tripId: string, feedId: number, dateYMD: string, positionTimestamp: Date) => Promise<IFoundGenericGtfsTripData | undefined>;
|
|
33
|
+
/**
|
|
34
|
+
* Batch counterpart to findGTFSTripById for the stops GTFS-RT vehicles report -- one query per poll.
|
|
35
|
+
* Inputs whose stop is not on their trip have no entry in the result.
|
|
36
|
+
*/
|
|
37
|
+
findGtfsStopContexts: (feedId: number, inputs: IGtfsStopLookupInput[]) => Promise<IGtfsStopContext[]>;
|
|
38
|
+
private mapGtfsTripStop;
|
|
33
39
|
deleteNHoursOldData: (hours: number) => Promise<number>;
|
|
34
40
|
private deduceTimestamps;
|
|
35
41
|
upsertCommonRunTrip: ({ run }: IUpdateRunsGtfsTripInput, gtfsTrip: IScheduleDto) => Promise<IUpdateDelayRunTripsData>;
|
|
@@ -186,6 +186,54 @@ let TripsRepository = class TripsRepository extends models_1.PostgresModel {
|
|
|
186
186
|
}));
|
|
187
187
|
return results[0];
|
|
188
188
|
};
|
|
189
|
+
/**
|
|
190
|
+
* Batch counterpart to findGTFSTripById for the stops GTFS-RT vehicles report -- one query per poll.
|
|
191
|
+
* Inputs whose stop is not on their trip have no entry in the result.
|
|
192
|
+
*/
|
|
193
|
+
this.findGtfsStopContexts = async (feedId, inputs) => {
|
|
194
|
+
if (!inputs.length) {
|
|
195
|
+
return [];
|
|
196
|
+
}
|
|
197
|
+
const connection = this.connector.getConnection();
|
|
198
|
+
const rows = (await connection.query(RawQueryProvider_1.RawQueryProvider.getFindGtfsStopContextsQuery(), {
|
|
199
|
+
type: sequelize_1.default.QueryTypes.SELECT,
|
|
200
|
+
replacements: {
|
|
201
|
+
feedId,
|
|
202
|
+
tripIds: inputs.map((input) => input.tripId),
|
|
203
|
+
serviceDates: inputs.map((input) => input.serviceDate),
|
|
204
|
+
stopIds: inputs.map((input) => input.stopId),
|
|
205
|
+
normalizedStopIds: inputs.map((input) => input.normalizedStopId),
|
|
206
|
+
},
|
|
207
|
+
}));
|
|
208
|
+
const contexts = [];
|
|
209
|
+
for (const row of rows) {
|
|
210
|
+
const currentStop = this.mapGtfsTripStop(row, "current");
|
|
211
|
+
if (currentStop) {
|
|
212
|
+
contexts.push({
|
|
213
|
+
// WITH ORDINALITY is 1-based and bigint (returned as a string)
|
|
214
|
+
inputIndex: Number(row.input_index) - 1,
|
|
215
|
+
currentStop,
|
|
216
|
+
previousStop: this.mapGtfsTripStop(row, "previous"),
|
|
217
|
+
nextStop: this.mapGtfsTripStop(row, "next"),
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
return contexts;
|
|
222
|
+
};
|
|
223
|
+
this.mapGtfsTripStop = (row, alias) => {
|
|
224
|
+
const stopId = row[`${alias}_stop_id`];
|
|
225
|
+
if (stopId === null || stopId === undefined) {
|
|
226
|
+
return null;
|
|
227
|
+
}
|
|
228
|
+
return {
|
|
229
|
+
stopId: String(stopId),
|
|
230
|
+
stopSequence: Number(row[`${alias}_stop_sequence`]),
|
|
231
|
+
stopName: row[`${alias}_stop_name`] || null,
|
|
232
|
+
stopHeadsign: row[`${alias}_stop_headsign`] || null,
|
|
233
|
+
arrivalTime: row[`${alias}_arrival_time`],
|
|
234
|
+
departureTime: row[`${alias}_departure_time`],
|
|
235
|
+
};
|
|
236
|
+
};
|
|
189
237
|
this.deleteNHoursOldData = async (hours) => {
|
|
190
238
|
try {
|
|
191
239
|
return await this.sequelizeModel.destroy({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,12 @@ export declare class RawQueryProvider {
|
|
|
8
8
|
* is needed by the caller.
|
|
9
9
|
*/
|
|
10
10
|
static getFindGtfsTripByIdQuery(): string;
|
|
11
|
+
/**
|
|
12
|
+
* Locates each reported (trip_id, stop_id) on the trip's stop times -- exact stop_id first, the
|
|
13
|
+
* normalized one as a fallback; a trip visiting the stop more than once resolves to its first visit.
|
|
14
|
+
* Neighbours are looked up by stop_sequence order, since GTFS only requires the sequence to increase.
|
|
15
|
+
*/
|
|
16
|
+
static getFindGtfsStopContextsQuery(): string;
|
|
11
17
|
static getFindGtfsTrainTripsQuery(): string;
|
|
12
18
|
static getUpdateGtfsTripDataQuery(): string;
|
|
13
19
|
static getFindTripsWithInvalidGtfsTripIdQuery(): string;
|
|
@@ -86,6 +86,52 @@ class RawQueryProvider {
|
|
|
86
86
|
LIMIT 1;
|
|
87
87
|
`;
|
|
88
88
|
}
|
|
89
|
+
/**
|
|
90
|
+
* Locates each reported (trip_id, stop_id) on the trip's stop times -- exact stop_id first, the
|
|
91
|
+
* normalized one as a fallback; a trip visiting the stop more than once resolves to its first visit.
|
|
92
|
+
* Neighbours are looked up by stop_sequence order, since GTFS only requires the sequence to increase.
|
|
93
|
+
*/
|
|
94
|
+
static getFindGtfsStopContextsQuery() {
|
|
95
|
+
const tripStopColumns = (alias) => `
|
|
96
|
+
${alias}.stop_id AS ${alias}_stop_id,
|
|
97
|
+
${alias}.stop_sequence AS ${alias}_stop_sequence,
|
|
98
|
+
${alias}.stop_headsign AS ${alias}_stop_headsign,
|
|
99
|
+
${alias}_stop.stop_name AS ${alias}_stop_name,
|
|
100
|
+
gtfs_timestamp(${alias}.arrival_time, input.service_date) AS ${alias}_arrival_time,
|
|
101
|
+
gtfs_timestamp(${alias}.departure_time, input.service_date) AS ${alias}_departure_time`;
|
|
102
|
+
const neighbourStopJoin = (alias, comparison, direction) => `
|
|
103
|
+
LEFT JOIN LATERAL (
|
|
104
|
+
SELECT * FROM gtfs_stop_times st
|
|
105
|
+
WHERE st.feed_id = :feedId AND st.trip_id = input.trip_id AND st.stop_sequence ${comparison} current.stop_sequence
|
|
106
|
+
ORDER BY st.stop_sequence ${direction}
|
|
107
|
+
LIMIT 1
|
|
108
|
+
) ${alias} ON true
|
|
109
|
+
LEFT JOIN gtfs_stops ${alias}_stop ON ${alias}_stop.feed_id = :feedId AND ${alias}_stop.stop_id = ${alias}.stop_id`;
|
|
110
|
+
return `
|
|
111
|
+
SET LOCAL search_path TO ${const_1.PG_SCHEMA};
|
|
112
|
+
SELECT
|
|
113
|
+
input.input_index,
|
|
114
|
+
${tripStopColumns("current")},
|
|
115
|
+
${tripStopColumns("previous")},
|
|
116
|
+
${tripStopColumns("next")}
|
|
117
|
+
FROM unnest(
|
|
118
|
+
ARRAY[:tripIds]::varchar[],
|
|
119
|
+
ARRAY[:serviceDates]::date[],
|
|
120
|
+
ARRAY[:stopIds]::varchar[],
|
|
121
|
+
ARRAY[:normalizedStopIds]::varchar[]
|
|
122
|
+
) WITH ORDINALITY AS input(trip_id, service_date, stop_id, normalized_stop_id, input_index)
|
|
123
|
+
INNER JOIN LATERAL (
|
|
124
|
+
SELECT * FROM gtfs_stop_times st
|
|
125
|
+
WHERE st.feed_id = :feedId AND st.trip_id = input.trip_id
|
|
126
|
+
AND st.stop_id IN (input.stop_id, input.normalized_stop_id)
|
|
127
|
+
ORDER BY st.stop_id = input.stop_id DESC, st.stop_sequence ASC
|
|
128
|
+
LIMIT 1
|
|
129
|
+
) current ON true
|
|
130
|
+
LEFT JOIN gtfs_stops current_stop ON current_stop.feed_id = :feedId AND current_stop.stop_id = current.stop_id
|
|
131
|
+
${neighbourStopJoin("previous", "<", "DESC")}
|
|
132
|
+
${neighbourStopJoin("next", ">", "ASC")};
|
|
133
|
+
`;
|
|
134
|
+
}
|
|
89
135
|
static getFindGtfsTrainTripsQuery() {
|
|
90
136
|
/* eslint-disable max-len */
|
|
91
137
|
return `
|
|
@@ -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,2EAAuD;AACvD,sEAAuC;AACvC,+FAA4D;AAC5D,yFAAsD;AACtD,6GAA0E;AAC1E,6IAA0G;AAC1G,mDAA8C;AAE9C,MAAa,gBAAgB;IAClB,MAAM,CAAC,2BAA2B;QACrC,OAAO;;;;;;;oBAOK,iBAAS,KAAK,2BAAY,CAAC,UAAU;;SAEhD,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,2BAA2B;QACrC,OAAO;uCACwB,iBAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA+BvC,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,wBAAwB;QAClC,OAAO;uCACwB,iBAAS;;;;;;;;;;;;;;;;;;;;SAoBvC,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,4BAA4B;QAC5B,OAAO;uCACwB,iBAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAyEvC,CAAC;QACF,2BAA2B;IAC/B,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,OAAO;sBACO,iBAAS,KAAK,2BAAY,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;oEAyBS,6BAAa,CAAC,QAAQ;;;;;wBAKlE,iBAAS,KAAK,qDAAyB,CAAC,SAAS;8BAC3C,iBAAS,KAAK,iCAAe,CAAC,YAAY,CAAC,WAAW;;;;;+DAKrB,yBAAiB,CAAC,WAAW;mEACzB,yBAAiB,CAAC,mBAAmB;;;SAG/F,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,sCAAsC;QAChD,OAAO;;;;;;;;;;;;;;;;;;;;mBAoBI,iBAAS,KAAK,2BAAY,CAAC,UAAU;;;;;;;;2BAQ7B,iBAAS,KAAK,2BAAY,CAAC,KAAK,CAAC,WAAW;;;;;SAK9D,CAAC;IACN,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AAAA,2EAAuD;AACvD,sEAAuC;AACvC,+FAA4D;AAC5D,yFAAsD;AACtD,6GAA0E;AAC1E,6IAA0G;AAC1G,mDAA8C;AAE9C,MAAa,gBAAgB;IAClB,MAAM,CAAC,2BAA2B;QACrC,OAAO;;;;;;;oBAOK,iBAAS,KAAK,2BAAY,CAAC,UAAU;;SAEhD,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,2BAA2B;QACrC,OAAO;uCACwB,iBAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA+BvC,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,wBAAwB;QAClC,OAAO;uCACwB,iBAAS;;;;;;;;;;;;;;;;;;;;SAoBvC,CAAC;IACN,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,4BAA4B;QACtC,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC;cACrC,KAAK,eAAe,KAAK;cACzB,KAAK,qBAAqB,KAAK;cAC/B,KAAK,qBAAqB,KAAK;cAC/B,KAAK,sBAAsB,KAAK;6BACjB,KAAK,yCAAyC,KAAK;6BACnD,KAAK,2CAA2C,KAAK,iBAAiB,CAAC;QAC5F,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,UAAkB,EAAE,SAAiB,EAAE,EAAE,CAAC;;;iGAGK,UAAU;4CAC/D,SAAS;;gBAErC,KAAK;mCACc,KAAK,YAAY,KAAK,+BAA+B,KAAK,mBAAmB,KAAK,UAAU,CAAC;QAExH,OAAO;uCACwB,iBAAS;;;kBAG9B,eAAe,CAAC,SAAS,CAAC;kBAC1B,eAAe,CAAC,UAAU,CAAC;kBAC3B,eAAe,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;cAe3B,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC;cAC1C,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC;SAC1C,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,4BAA4B;QAC5B,OAAO;uCACwB,iBAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAyEvC,CAAC;QACF,2BAA2B;IAC/B,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,OAAO;sBACO,iBAAS,KAAK,2BAAY,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;oEAyBS,6BAAa,CAAC,QAAQ;;;;;wBAKlE,iBAAS,KAAK,qDAAyB,CAAC,SAAS;8BAC3C,iBAAS,KAAK,iCAAe,CAAC,YAAY,CAAC,WAAW;;;;;+DAKrB,yBAAiB,CAAC,WAAW;mEACzB,yBAAiB,CAAC,mBAAmB;;;SAG/F,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,sCAAsC;QAChD,OAAO;;;;;;;;;;;;;;;;;;;;mBAoBI,iBAAS,KAAK,2BAAY,CAAC,UAAU;;;;;;;;2BAQ7B,iBAAS,KAAK,2BAAY,CAAC,KAAK,CAAC,WAAW;;;;;SAK9D,CAAC;IACN,CAAC;CACJ;AAlSD,4CAkSC"}
|
|
@@ -67,6 +67,37 @@ export interface IFoundGenericGtfsTripData {
|
|
|
67
67
|
start_timestamp: Date;
|
|
68
68
|
end_timestamp: Date;
|
|
69
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
* One stop a GTFS-RT vehicle reports (VehiclePosition.stop_id) to be located on its GTFS trip.
|
|
72
|
+
* normalizedStopId is the fallback tried when stopId itself is not on the trip.
|
|
73
|
+
*/
|
|
74
|
+
export interface IGtfsStopLookupInput {
|
|
75
|
+
tripId: string;
|
|
76
|
+
serviceDate: string;
|
|
77
|
+
stopId: string;
|
|
78
|
+
normalizedStopId: string;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* A stop of a GTFS trip with scheduled times resolved to timestamps of the trip's service date.
|
|
82
|
+
*/
|
|
83
|
+
export interface IGtfsTripStop {
|
|
84
|
+
stopId: string;
|
|
85
|
+
stopSequence: number;
|
|
86
|
+
stopName: string | null;
|
|
87
|
+
stopHeadsign: string | null;
|
|
88
|
+
arrivalTime: Date;
|
|
89
|
+
departureTime: Date;
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* The reported stop located on its trip, together with its neighbours in stop_sequence order.
|
|
93
|
+
* inputIndex points to the IGtfsStopLookupInput item it answers.
|
|
94
|
+
*/
|
|
95
|
+
export interface IGtfsStopContext {
|
|
96
|
+
inputIndex: number;
|
|
97
|
+
currentStop: IGtfsTripStop;
|
|
98
|
+
previousStop: IGtfsTripStop | null;
|
|
99
|
+
nextStop: IGtfsTripStop | null;
|
|
100
|
+
}
|
|
70
101
|
export interface IBulkUpsertOutput {
|
|
71
102
|
inserted: IUpdateGTFSTripIdData[];
|
|
72
103
|
updated: Array<{
|
|
@@ -115,3 +146,7 @@ export interface IEnrichedTripForPublicApi {
|
|
|
115
146
|
last_stop_sequence: number | null;
|
|
116
147
|
origin_timestamp: Date;
|
|
117
148
|
}
|
|
149
|
+
/**
|
|
150
|
+
* Raw row of RawQueryProvider.getFindGtfsStopContextsQuery -- stop columns prefixed by current_/previous_/next_.
|
|
151
|
+
*/
|
|
152
|
+
export type IGtfsStopContextRow = Record<string, string | number | Date | null>;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { IPositionDto } from "../../../../../../schema-definitions/vehicle-positions/models/interfaces/IPositionDto";
|
|
2
|
+
import { transit_realtime } from "@golemio/ovapi-gtfs-realtime-bindings";
|
|
3
|
+
import { IGtfsStopContext } from "../../data-access/interfaces/TripRepositoryInterfaces";
|
|
4
|
+
type IGtfsRtPositionState = Pick<IPositionDto, "state_position" | "state_process" | "delay" | "this_stop_id" | "this_stop_sequence" | "last_stop_id" | "last_stop_sequence" | "last_stop_name" | "last_stop_headsign" | "last_stop_arrival_time" | "last_stop_departure_time" | "next_stop_id" | "next_stop_sequence" | "next_stop_arrival_time" | "next_stop_departure_time">;
|
|
5
|
+
interface IGtfsRtPositionStateInput {
|
|
6
|
+
positionTimestamp: Date;
|
|
7
|
+
tripStartTimestamp: Date;
|
|
8
|
+
tripEndTimestamp: Date;
|
|
9
|
+
currentStatus: transit_realtime.VehiclePosition.VehicleStopStatus | null | undefined;
|
|
10
|
+
stopContext: IGtfsStopContext | null;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Derives a position's state and stop fields from what a GTFS-RT VehiclePosition reports itself
|
|
14
|
+
* (current_status + stop_id) instead of projecting it onto the trip shape -- the generic counterpart to
|
|
15
|
+
* the CIS pipelines' shape-based processing. Stop field conventions follow RegionalBusPositionsManager:
|
|
16
|
+
* at a stop, last_stop is that stop; between stops, last_stop is the one before next_stop.
|
|
17
|
+
*/
|
|
18
|
+
export declare class GtfsRtPositionStateMapper {
|
|
19
|
+
/**
|
|
20
|
+
* Strips leading zeros of every numeric segment ("U01521Z01" -> "U1521Z1") -- some feeds zero-pad
|
|
21
|
+
* stop ids in GTFS-RT but not in static GTFS. Only used as a fallback when the exact id does not match.
|
|
22
|
+
*/
|
|
23
|
+
static normalizeStopId(stopId: string): string;
|
|
24
|
+
static mapPositionState(input: IGtfsRtPositionStateInput): IGtfsRtPositionState;
|
|
25
|
+
/**
|
|
26
|
+
* Heading to (or waiting at) the first stop before its departure is before the track; stopped at the
|
|
27
|
+
* last stop is after it. The scheduled trip end is deliberately not used, so a late vehicle still
|
|
28
|
+
* running its trip stays on track.
|
|
29
|
+
*/
|
|
30
|
+
private static determineStateByStop;
|
|
31
|
+
private static determineStateByTripBounds;
|
|
32
|
+
/**
|
|
33
|
+
* Rough delay of a vehicle standing at a stop: early before the scheduled arrival, zero while within
|
|
34
|
+
* the scheduled dwell, late after the scheduled departure. Between stops there is no reliable delay
|
|
35
|
+
* without shape projection, so none is computed there.
|
|
36
|
+
*/
|
|
37
|
+
private static computeAtStopDelay;
|
|
38
|
+
}
|
|
39
|
+
export {};
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GtfsRtPositionStateMapper = void 0;
|
|
4
|
+
const ovapi_gtfs_realtime_bindings_1 = require("@golemio/ovapi-gtfs-realtime-bindings");
|
|
5
|
+
const const_1 = require("../../../../../../const");
|
|
6
|
+
const STOP_FIELDS_EMPTY = {
|
|
7
|
+
this_stop_id: null,
|
|
8
|
+
this_stop_sequence: null,
|
|
9
|
+
last_stop_id: null,
|
|
10
|
+
last_stop_sequence: null,
|
|
11
|
+
last_stop_name: null,
|
|
12
|
+
last_stop_headsign: null,
|
|
13
|
+
last_stop_arrival_time: null,
|
|
14
|
+
last_stop_departure_time: null,
|
|
15
|
+
next_stop_id: null,
|
|
16
|
+
next_stop_sequence: null,
|
|
17
|
+
next_stop_arrival_time: null,
|
|
18
|
+
next_stop_departure_time: null,
|
|
19
|
+
};
|
|
20
|
+
/**
|
|
21
|
+
* Derives a position's state and stop fields from what a GTFS-RT VehiclePosition reports itself
|
|
22
|
+
* (current_status + stop_id) instead of projecting it onto the trip shape -- the generic counterpart to
|
|
23
|
+
* the CIS pipelines' shape-based processing. Stop field conventions follow RegionalBusPositionsManager:
|
|
24
|
+
* at a stop, last_stop is that stop; between stops, last_stop is the one before next_stop.
|
|
25
|
+
*/
|
|
26
|
+
class GtfsRtPositionStateMapper {
|
|
27
|
+
/**
|
|
28
|
+
* Strips leading zeros of every numeric segment ("U01521Z01" -> "U1521Z1") -- some feeds zero-pad
|
|
29
|
+
* stop ids in GTFS-RT but not in static GTFS. Only used as a fallback when the exact id does not match.
|
|
30
|
+
*/
|
|
31
|
+
static normalizeStopId(stopId) {
|
|
32
|
+
return stopId.replace(/(^|\D)0+(?=\d)/g, "$1");
|
|
33
|
+
}
|
|
34
|
+
static mapPositionState(input) {
|
|
35
|
+
const { stopContext } = input;
|
|
36
|
+
if (!stopContext) {
|
|
37
|
+
return {
|
|
38
|
+
...STOP_FIELDS_EMPTY,
|
|
39
|
+
state_position: GtfsRtPositionStateMapper.determineStateByTripBounds(input),
|
|
40
|
+
state_process: const_1.StateProcessEnum.PROCESSED,
|
|
41
|
+
delay: null,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
const isStoppedAt = input.currentStatus === ovapi_gtfs_realtime_bindings_1.transit_realtime.VehiclePosition.VehicleStopStatus.STOPPED_AT;
|
|
45
|
+
const { currentStop, previousStop, nextStop } = stopContext;
|
|
46
|
+
const statePosition = GtfsRtPositionStateMapper.determineStateByStop(input.positionTimestamp, isStoppedAt, stopContext);
|
|
47
|
+
const lastStop = isStoppedAt ? currentStop : previousStop;
|
|
48
|
+
const upcomingStop = isStoppedAt ? nextStop : currentStop;
|
|
49
|
+
return {
|
|
50
|
+
state_position: statePosition,
|
|
51
|
+
state_process: const_1.StateProcessEnum.PROCESSED,
|
|
52
|
+
delay: statePosition === const_1.StatePositionEnum.AT_STOP
|
|
53
|
+
? GtfsRtPositionStateMapper.computeAtStopDelay(input.positionTimestamp, currentStop)
|
|
54
|
+
: null,
|
|
55
|
+
this_stop_id: isStoppedAt ? currentStop.stopId : null,
|
|
56
|
+
this_stop_sequence: isStoppedAt ? currentStop.stopSequence : null,
|
|
57
|
+
last_stop_id: lastStop?.stopId ?? null,
|
|
58
|
+
last_stop_sequence: lastStop?.stopSequence ?? null,
|
|
59
|
+
last_stop_name: lastStop?.stopName ?? null,
|
|
60
|
+
last_stop_headsign: lastStop?.stopHeadsign ?? null,
|
|
61
|
+
last_stop_arrival_time: lastStop?.arrivalTime ?? null,
|
|
62
|
+
last_stop_departure_time: lastStop?.departureTime ?? null,
|
|
63
|
+
next_stop_id: upcomingStop?.stopId ?? null,
|
|
64
|
+
next_stop_sequence: upcomingStop?.stopSequence ?? null,
|
|
65
|
+
next_stop_arrival_time: upcomingStop?.arrivalTime ?? null,
|
|
66
|
+
next_stop_departure_time: upcomingStop?.departureTime ?? null,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Heading to (or waiting at) the first stop before its departure is before the track; stopped at the
|
|
71
|
+
* last stop is after it. The scheduled trip end is deliberately not used, so a late vehicle still
|
|
72
|
+
* running its trip stays on track.
|
|
73
|
+
*/
|
|
74
|
+
static determineStateByStop(positionTimestamp, isStoppedAt, { currentStop, previousStop, nextStop }) {
|
|
75
|
+
const isAtFirstStop = !previousStop;
|
|
76
|
+
if (isAtFirstStop && (!isStoppedAt || positionTimestamp < currentStop.departureTime)) {
|
|
77
|
+
return const_1.StatePositionEnum.BEFORE_TRACK;
|
|
78
|
+
}
|
|
79
|
+
if (isStoppedAt) {
|
|
80
|
+
return nextStop ? const_1.StatePositionEnum.AT_STOP : const_1.StatePositionEnum.AFTER_TRACK;
|
|
81
|
+
}
|
|
82
|
+
return const_1.StatePositionEnum.ON_TRACK;
|
|
83
|
+
}
|
|
84
|
+
static determineStateByTripBounds(input) {
|
|
85
|
+
if (input.positionTimestamp < input.tripStartTimestamp) {
|
|
86
|
+
return const_1.StatePositionEnum.BEFORE_TRACK;
|
|
87
|
+
}
|
|
88
|
+
if (input.positionTimestamp > input.tripEndTimestamp) {
|
|
89
|
+
return const_1.StatePositionEnum.AFTER_TRACK;
|
|
90
|
+
}
|
|
91
|
+
return const_1.StatePositionEnum.ON_TRACK;
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Rough delay of a vehicle standing at a stop: early before the scheduled arrival, zero while within
|
|
95
|
+
* the scheduled dwell, late after the scheduled departure. Between stops there is no reliable delay
|
|
96
|
+
* without shape projection, so none is computed there.
|
|
97
|
+
*/
|
|
98
|
+
static computeAtStopDelay(positionTimestamp, stop) {
|
|
99
|
+
const timestampMs = positionTimestamp.getTime();
|
|
100
|
+
if (timestampMs < stop.arrivalTime.getTime()) {
|
|
101
|
+
return Math.round((timestampMs - stop.arrivalTime.getTime()) / 1000);
|
|
102
|
+
}
|
|
103
|
+
if (timestampMs > stop.departureTime.getTime()) {
|
|
104
|
+
return Math.round((timestampMs - stop.departureTime.getTime()) / 1000);
|
|
105
|
+
}
|
|
106
|
+
return 0;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
exports.GtfsRtPositionStateMapper = GtfsRtPositionStateMapper;
|
|
110
|
+
//# sourceMappingURL=GtfsRtPositionStateMapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GtfsRtPositionStateMapper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-rt/GtfsRtPositionStateMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { GtfsFeedRepository } from "../../../../gtfs/data-access/GtfsFeedRepository";
|
|
2
2
|
import { ILogger } from "@golemio/core/dist/helpers";
|
|
3
|
+
import { IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/postgres/IDatabaseConnector";
|
|
3
4
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
4
5
|
import { GtfsRtDataSourceFactory } from "../datasources/gtfs-rt/GtfsRtProtobufDataTypeStrategy";
|
|
5
6
|
import { TripsRepository } from "../data-access/TripsRepository";
|
|
@@ -18,13 +19,20 @@ export declare class GtfsRtPollTask extends AbstractTask<IGtfsRtPollInput> {
|
|
|
18
19
|
private readonly tripsRepository;
|
|
19
20
|
private readonly positionsRepository;
|
|
20
21
|
private readonly dataSourceFactory;
|
|
22
|
+
private readonly postgresConnector;
|
|
21
23
|
private readonly logger;
|
|
22
24
|
readonly queueName = "pollGtfsRtPositions";
|
|
23
25
|
readonly queueTtl: number;
|
|
24
26
|
readonly schema: typeof GtfsRtPollValidation;
|
|
25
|
-
constructor(feedRepository: GtfsFeedRepository, tripsRepository: TripsRepository, positionsRepository: PositionsRepository, dataSourceFactory: GtfsRtDataSourceFactory, logger: ILogger);
|
|
27
|
+
constructor(feedRepository: GtfsFeedRepository, tripsRepository: TripsRepository, positionsRepository: PositionsRepository, dataSourceFactory: GtfsRtDataSourceFactory, postgresConnector: IDatabaseConnector, logger: ILogger);
|
|
26
28
|
protected execute(data: IGtfsRtPollInput): Promise<void>;
|
|
27
29
|
private pollFeed;
|
|
28
30
|
private matchVehiclePosition;
|
|
31
|
+
/**
|
|
32
|
+
* A trip can be served by more than one vehicle (coupled train units, a relief bus), but it has a single
|
|
33
|
+
* row and a single last position -- and one upsert batch cannot touch the same row twice.
|
|
34
|
+
*/
|
|
35
|
+
private keepNewestPerTrip;
|
|
36
|
+
private withStopState;
|
|
29
37
|
private savePositionsAndTrips;
|
|
30
38
|
}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/GtfsRtPollTask.js
CHANGED
|
@@ -24,13 +24,14 @@ const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
|
24
24
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
25
25
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
26
26
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
27
|
-
const const_1 = require("../../../../../const");
|
|
28
27
|
const constants_1 = require("../constants");
|
|
29
28
|
const GtfsRtProtobufDataTypeStrategy_1 = require("../datasources/gtfs-rt/GtfsRtProtobufDataTypeStrategy");
|
|
30
29
|
const TripsRepository_1 = require("../data-access/TripsRepository");
|
|
31
30
|
const PositionsRepository_1 = require("../data-access/PositionsRepository");
|
|
31
|
+
const GtfsRtPositionStateMapper_1 = require("../helpers/gtfs-rt/GtfsRtPositionStateMapper");
|
|
32
32
|
const GtfsRtPollSchema_1 = require("../schema/GtfsRtPollSchema");
|
|
33
33
|
const DEFAULT_TIMEZONE = "Europe/Prague";
|
|
34
|
+
const UNMATCHED_TRIP_ID_SAMPLE_SIZE = 5;
|
|
34
35
|
/**
|
|
35
36
|
* Polls each feed's own GTFS-RT VehiclePositions URL (gtfs_feeds.gtfs_rt_url) and matches
|
|
36
37
|
* incoming vehicle positions to our already-imported static GTFS by trip_id -- the generic
|
|
@@ -39,12 +40,13 @@ const DEFAULT_TIMEZONE = "Europe/Prague";
|
|
|
39
40
|
* unavailable for trips matched here (see docs/follow-ups.md).
|
|
40
41
|
*/
|
|
41
42
|
let GtfsRtPollTask = class GtfsRtPollTask extends workers_1.AbstractTask {
|
|
42
|
-
constructor(feedRepository, tripsRepository, positionsRepository, dataSourceFactory, logger) {
|
|
43
|
+
constructor(feedRepository, tripsRepository, positionsRepository, dataSourceFactory, postgresConnector, logger) {
|
|
43
44
|
super(constants_1.WORKER_NAME);
|
|
44
45
|
this.feedRepository = feedRepository;
|
|
45
46
|
this.tripsRepository = tripsRepository;
|
|
46
47
|
this.positionsRepository = positionsRepository;
|
|
47
48
|
this.dataSourceFactory = dataSourceFactory;
|
|
49
|
+
this.postgresConnector = postgresConnector;
|
|
48
50
|
this.logger = logger;
|
|
49
51
|
this.queueName = "pollGtfsRtPositions";
|
|
50
52
|
this.queueTtl = 5 * 60 * 1000; // 5 minutes
|
|
@@ -67,44 +69,52 @@ let GtfsRtPollTask = class GtfsRtPollTask extends workers_1.AbstractTask {
|
|
|
67
69
|
return;
|
|
68
70
|
}
|
|
69
71
|
const matched = [];
|
|
72
|
+
const unmatchedTripIds = [];
|
|
70
73
|
for (const entity of entities) {
|
|
71
|
-
const
|
|
74
|
+
const vehicle = entity.vehicle;
|
|
75
|
+
const tripId = vehicle?.trip?.tripId;
|
|
76
|
+
if (!vehicle?.position || !tripId) {
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
const matchedPosition = await this.matchVehiclePosition(feed, vehicle, vehicle.position, tripId);
|
|
72
80
|
if (matchedPosition) {
|
|
73
81
|
matched.push(matchedPosition);
|
|
74
82
|
}
|
|
83
|
+
else {
|
|
84
|
+
unmatchedTripIds.push(tripId);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
if (unmatchedTripIds.length) {
|
|
88
|
+
this.logger.warn(`GtfsRtPollTask: ${unmatchedTripIds.length} of ${matched.length + unmatchedTripIds.length} vehicle ` +
|
|
89
|
+
`positions of feed "${feed.code}" have no GTFS trip (e.g. trip_id ` +
|
|
90
|
+
`${unmatchedTripIds.slice(0, UNMATCHED_TRIP_ID_SAMPLE_SIZE).join(", ")}).`);
|
|
75
91
|
}
|
|
76
92
|
if (!matched.length) {
|
|
77
93
|
return;
|
|
78
94
|
}
|
|
79
95
|
try {
|
|
80
|
-
await this.
|
|
96
|
+
const positions = await this.withStopState(feed.feedId, this.keepNewestPerTrip(matched));
|
|
97
|
+
await this.savePositionsAndTrips(positions);
|
|
81
98
|
}
|
|
82
99
|
catch (err) {
|
|
83
|
-
|
|
84
|
-
this.logger.error(err);
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
this.logger.error(new golemio_errors_1.GeneralError(`Failed to save GTFS-RT positions for "${feed.code}"`, this.constructor.name, err));
|
|
88
|
-
}
|
|
100
|
+
this.logger.error(new golemio_errors_1.GeneralError(`Failed to save GTFS-RT positions for "${feed.code}".`, this.constructor.name, err));
|
|
89
101
|
}
|
|
90
102
|
}
|
|
91
|
-
async matchVehiclePosition(feed,
|
|
92
|
-
const vehicle = entity.vehicle;
|
|
93
|
-
const tripId = vehicle?.trip?.tripId;
|
|
94
|
-
if (!vehicle || !tripId || !vehicle.position) {
|
|
95
|
-
return null;
|
|
96
|
-
}
|
|
103
|
+
async matchVehiclePosition(feed, vehicle, position, tripId) {
|
|
97
104
|
const timezone = feed.timezone ?? DEFAULT_TIMEZONE;
|
|
98
105
|
const timestampSeconds = Number(vehicle.timestamp ?? Math.floor(Date.now() / 1000));
|
|
99
106
|
const positionTimestamp = new Date(timestampSeconds * 1000);
|
|
100
107
|
const dateYMD = (0, moment_timezone_1.default)(positionTimestamp).tz(timezone).format("YYYY-MM-DD");
|
|
101
108
|
const found = await this.tripsRepository.findGTFSTripById(tripId, feed.feedId, dateYMD, positionTimestamp);
|
|
102
109
|
if (!found) {
|
|
103
|
-
this.logger.warn(`GtfsRtPollTask: no GTFS trip found for feed "${feed.code}", trip_id "${tripId}"`);
|
|
104
110
|
return null;
|
|
105
111
|
}
|
|
106
112
|
const vpTripId = `${feed.code}:${tripId}`;
|
|
107
113
|
return {
|
|
114
|
+
vpTripId,
|
|
115
|
+
positionTimestamp,
|
|
116
|
+
tripStartTimestamp: found.start_timestamp,
|
|
117
|
+
tripEndTimestamp: found.end_timestamp,
|
|
108
118
|
tripDto: {
|
|
109
119
|
id: vpTripId,
|
|
110
120
|
feed_id: feed.feedId,
|
|
@@ -124,31 +134,79 @@ let GtfsRtPollTask = class GtfsRtPollTask extends workers_1.AbstractTask {
|
|
|
124
134
|
positionDto: {
|
|
125
135
|
trips_id: vpTripId,
|
|
126
136
|
feed_id: feed.feedId,
|
|
127
|
-
lat:
|
|
128
|
-
lng:
|
|
129
|
-
bearing:
|
|
130
|
-
speed:
|
|
137
|
+
lat: position.latitude,
|
|
138
|
+
lng: position.longitude,
|
|
139
|
+
bearing: position.bearing ?? null,
|
|
140
|
+
speed: position.speed ?? null,
|
|
131
141
|
origin_time: (0, moment_timezone_1.default)(positionTimestamp).tz(timezone).format("HH:mm:ss"),
|
|
132
142
|
origin_timestamp: positionTimestamp,
|
|
133
|
-
state_position: const_1.StatePositionEnum.UNKNOWN,
|
|
134
|
-
state_process: const_1.StateProcessEnum.INPUT,
|
|
135
143
|
is_tracked: true,
|
|
136
144
|
valid_to: null,
|
|
137
145
|
},
|
|
146
|
+
currentStatus: vehicle.currentStatus,
|
|
147
|
+
stopLookup: vehicle.stopId
|
|
148
|
+
? {
|
|
149
|
+
tripId,
|
|
150
|
+
serviceDate: (0, moment_timezone_1.default)(found.gtfs_date).format("YYYY-MM-DD"),
|
|
151
|
+
stopId: vehicle.stopId,
|
|
152
|
+
normalizedStopId: GtfsRtPositionStateMapper_1.GtfsRtPositionStateMapper.normalizeStopId(vehicle.stopId),
|
|
153
|
+
}
|
|
154
|
+
: null,
|
|
138
155
|
};
|
|
139
156
|
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
const
|
|
146
|
-
|
|
147
|
-
|
|
157
|
+
/**
|
|
158
|
+
* A trip can be served by more than one vehicle (coupled train units, a relief bus), but it has a single
|
|
159
|
+
* row and a single last position -- and one upsert batch cannot touch the same row twice.
|
|
160
|
+
*/
|
|
161
|
+
keepNewestPerTrip(matched) {
|
|
162
|
+
const newestByTripId = new Map();
|
|
163
|
+
for (const item of matched) {
|
|
164
|
+
const current = newestByTripId.get(item.vpTripId);
|
|
165
|
+
if (!current || item.positionTimestamp > current.positionTimestamp) {
|
|
166
|
+
newestByTripId.set(item.vpTripId, item);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
return [...newestByTripId.values()];
|
|
170
|
+
}
|
|
171
|
+
async withStopState(feedId, matched) {
|
|
172
|
+
const lookups = matched.flatMap((item) => (item.stopLookup ? [item.stopLookup] : []));
|
|
173
|
+
const stopContexts = await this.tripsRepository.findGtfsStopContexts(feedId, lookups);
|
|
174
|
+
const stopContextByLookup = new Map(stopContexts.map((context) => [lookups[context.inputIndex], context]));
|
|
175
|
+
return matched.map((item) => ({
|
|
176
|
+
...item,
|
|
177
|
+
positionDto: {
|
|
178
|
+
...item.positionDto,
|
|
179
|
+
...GtfsRtPositionStateMapper_1.GtfsRtPositionStateMapper.mapPositionState({
|
|
180
|
+
positionTimestamp: item.positionTimestamp,
|
|
181
|
+
tripStartTimestamp: item.tripStartTimestamp,
|
|
182
|
+
tripEndTimestamp: item.tripEndTimestamp,
|
|
183
|
+
currentStatus: item.currentStatus,
|
|
184
|
+
stopContext: (item.stopLookup && stopContextByLookup.get(item.stopLookup)) ?? null,
|
|
185
|
+
}),
|
|
186
|
+
},
|
|
148
187
|
}));
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
188
|
+
}
|
|
189
|
+
async savePositionsAndTrips(matched) {
|
|
190
|
+
// Positions are inserted first (id is DB-assigned) so each trip's last_position_id can be set in the
|
|
191
|
+
// same bulkSave as the rest of its GTFS fields -- the trips-with-last-position view (the v1 endpoint)
|
|
192
|
+
// and findAllForPublicCache both join through it. One transaction, so a failed trips upsert leaves
|
|
193
|
+
// no orphaned positions behind.
|
|
194
|
+
const transaction = await this.postgresConnector.getConnection().transaction();
|
|
195
|
+
try {
|
|
196
|
+
const savedPositions = await this.positionsRepository.bulkSave(matched.map((m) => m.positionDto), undefined, true, false, transaction);
|
|
197
|
+
const trips = matched.map((m, index) => ({
|
|
198
|
+
...m.tripDto,
|
|
199
|
+
last_position_id: savedPositions[index]?.id,
|
|
200
|
+
}));
|
|
201
|
+
await this.tripsRepository.bulkSave(trips, Object.keys(trips[0] ?? {})
|
|
202
|
+
.filter((key) => key !== "feed_id")
|
|
203
|
+
.concat("updated_at"), true, false, transaction);
|
|
204
|
+
await transaction.commit();
|
|
205
|
+
}
|
|
206
|
+
catch (err) {
|
|
207
|
+
await transaction.rollback();
|
|
208
|
+
throw err;
|
|
209
|
+
}
|
|
152
210
|
}
|
|
153
211
|
};
|
|
154
212
|
exports.GtfsRtPollTask = GtfsRtPollTask;
|
|
@@ -158,9 +216,10 @@ exports.GtfsRtPollTask = GtfsRtPollTask = __decorate([
|
|
|
158
216
|
__param(1, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TripRepository)),
|
|
159
217
|
__param(2, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.PositionsRepository)),
|
|
160
218
|
__param(3, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.GtfsRtDataSourceFactory)),
|
|
161
|
-
__param(4, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.
|
|
219
|
+
__param(4, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
|
|
220
|
+
__param(5, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
162
221
|
__metadata("design:paramtypes", [Function, TripsRepository_1.TripsRepository,
|
|
163
222
|
PositionsRepository_1.PositionsRepository,
|
|
164
|
-
GtfsRtProtobufDataTypeStrategy_1.GtfsRtDataSourceFactory, Object])
|
|
223
|
+
GtfsRtProtobufDataTypeStrategy_1.GtfsRtDataSourceFactory, Object, Object])
|
|
165
224
|
], GtfsRtPollTask);
|
|
166
225
|
//# sourceMappingURL=GtfsRtPollTask.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GtfsRtPollTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/GtfsRtPollTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,+EAAoE;AACpE,oEAA8E;AAG9E,oIAAoG;
|
|
1
|
+
{"version":3,"file":"GtfsRtPollTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/GtfsRtPollTask.ts"],"names":[],"mappings":"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"}
|
package/docs/follow-ups.md
CHANGED
|
@@ -167,3 +167,24 @@ GTFS-derived identifiers per feed). What remains:
|
|
|
167
167
|
- **Confirm the MPV `lin` values with a real producer sample**: everything indicates kodis MPV messages
|
|
168
168
|
carry `lin` = the 6-digit route_id (the GTFS is built around CIS identifiers), but the final link needs
|
|
169
169
|
one real message to verify before go-live.
|
|
170
|
+
|
|
171
|
+
## 12. GTFS-RT polled positions: state from the feed, not from shape projection
|
|
172
|
+
|
|
173
|
+
**Trigger: when a GTFS-RT-polled feed needs accurate delays between stops, or its `current_status`/`stop_id`
|
|
174
|
+
turn out unreliable.**
|
|
175
|
+
|
|
176
|
+
`GtfsRtPollTask` derives `state_position` and last/this/next stops from what each VehiclePosition reports
|
|
177
|
+
(`current_status` + `stop_id`, see `GtfsRtPositionStateMapper`) instead of projecting the position onto the
|
|
178
|
+
trip shape the way the CIS pipelines (`updateDelay`) do. Known limits:
|
|
179
|
+
|
|
180
|
+
- **`delay` only while standing at a stop** (timestamp vs the stop's scheduled arrival/departure); it is
|
|
181
|
+
NULL between stops, so the v1 endpoint shows no delay for moving vehicles. `delay_stop_arrival` /
|
|
182
|
+
`delay_stop_departure` stay NULL (the combined stop-times view ignores these positions).
|
|
183
|
+
- **The reported state is trusted as-is**: no check that lat/lng actually lie near the reported stop/shape.
|
|
184
|
+
- **A trip visiting the same stop twice resolves to its first visit.**
|
|
185
|
+
- **A trip served by several vehicles keeps only the newest position** (one trip row, one last position).
|
|
186
|
+
- **Stop-id normalization fallback is generic** (leading zeros of numeric segments stripped when the exact
|
|
187
|
+
id is not on the trip) — IDS JMK zero-pads RT stop ids (`U01521Z01` vs static `U1521Z1`).
|
|
188
|
+
|
|
189
|
+
Upgrade path: route matched positions through the shape-based processing instead, which also needs the
|
|
190
|
+
CIS/run context gaps in #11 solved.
|