corequery-gtfs 0.8.0 → 0.9.0
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/conversion/corequery-intrasource-id.js.map +1 -0
- package/dist/{corequeryify → conversion}/service-conversion-iterator.d.ts +1 -1
- package/dist/conversion/service-conversion-iterator.js.map +1 -0
- package/dist/{corequeryify → conversion}/service-converter.d.ts +9 -9
- package/dist/conversion/service-converter.js.map +1 -0
- package/dist/data/gtfs-feed.d.ts +2 -2
- package/dist/data/gtfs-feed.js +3 -3
- package/dist/data/gtfs-feed.js.map +1 -1
- package/dist/data/gtfs-transfer.d.ts +2 -2
- package/dist/departures/{departures-block-iterator.d.ts → iterator/departures-block-iterator.d.ts} +2 -2
- package/dist/departures/{departures-block-iterator.js → iterator/departures-block-iterator.js} +0 -1
- package/dist/departures/iterator/departures-block-iterator.js.map +1 -0
- package/dist/departures/{departures-iterator.d.ts → iterator/departures-iterator.d.ts} +4 -4
- package/dist/departures/iterator/departures-iterator.js.map +1 -0
- package/dist/departures/{filter-iterator.d.ts → iterator/filtering-departures-iterator.d.ts} +2 -2
- package/dist/departures/{filter-iterator.js → iterator/filtering-departures-iterator.js} +2 -2
- package/dist/departures/iterator/filtering-departures-iterator.js.map +1 -0
- package/dist/departures/{realtime-departures-block-iterator.d.ts → iterator/realtime-departures-block-iterator.d.ts} +2 -2
- package/dist/departures/{realtime-departures-block-iterator.js → iterator/realtime-departures-block-iterator.js} +1 -1
- package/dist/departures/iterator/realtime-departures-block-iterator.js.map +1 -0
- package/dist/departures/{scheduled-departures-block-iterator.d.ts → iterator/scheduled-departures-block-iterator.d.ts} +3 -3
- package/dist/departures/iterator/scheduled-departures-block-iterator.js.map +1 -0
- package/dist/departures/{scheduled-departures-iterator.d.ts → iterator/scheduled-departures-iterator.d.ts} +5 -5
- package/dist/departures/{scheduled-departures-iterator.js → iterator/scheduled-departures-iterator.js} +2 -2
- package/dist/departures/iterator/scheduled-departures-iterator.js.map +1 -0
- package/dist/departures/{zipper-departures-iterator.d.ts → iterator/zipper-departures-iterator.d.ts} +4 -4
- package/dist/departures/iterator/zipper-departures-iterator.js.map +1 -0
- package/dist/gtfs-service-source.d.ts +8 -8
- package/dist/gtfs-service-source.js +3 -3
- package/dist/gtfs-service-source.js.map +1 -1
- package/dist/gtfs-system.js +11 -23
- package/dist/gtfs-system.js.map +1 -1
- package/dist/parser/gtfs-feed-parser.d.ts +12 -3
- package/dist/parser/gtfs-feed-parser.js +19 -9
- package/dist/parser/gtfs-feed-parser.js.map +1 -1
- package/dist/parser/realtime/gtfs-realtime-data-parser.d.ts +7 -2
- package/dist/parser/realtime/gtfs-realtime-data-parser.js +10 -6
- package/dist/parser/realtime/gtfs-realtime-data-parser.js.map +1 -1
- package/dist/parser/realtime/gtfs-trip-update-parser.d.ts +8 -2
- package/dist/parser/realtime/gtfs-trip-update-parser.js +12 -11
- package/dist/parser/realtime/gtfs-trip-update-parser.js.map +1 -1
- package/dist/parser/realtime/gtfs-trip-update-trip-identifier.d.ts +4 -1
- package/dist/parser/realtime/gtfs-trip-update-trip-identifier.js +2 -2
- package/dist/parser/realtime/gtfs-trip-update-trip-identifier.js.map +1 -1
- package/dist/parser/schedule/gtfs-calendar-parser.d.ts +4 -1
- package/dist/parser/schedule/gtfs-calendar-parser.js +2 -2
- package/dist/parser/schedule/gtfs-calendar-parser.js.map +1 -1
- package/dist/parser/schedule/gtfs-route-matcher.d.ts +7 -2
- package/dist/parser/schedule/gtfs-route-matcher.js +8 -6
- package/dist/parser/schedule/gtfs-route-matcher.js.map +1 -1
- package/dist/parser/schedule/gtfs-schedule-data-parser.d.ts +9 -2
- package/dist/parser/schedule/gtfs-schedule-data-parser.js +13 -5
- package/dist/parser/schedule/gtfs-schedule-data-parser.js.map +1 -1
- package/dist/parser/schedule/gtfs-stop-time-normaliser.d.ts +4 -1
- package/dist/parser/schedule/gtfs-stop-time-normaliser.js +2 -2
- package/dist/parser/schedule/gtfs-stop-time-normaliser.js.map +1 -1
- package/dist/parser/schedule/gtfs-transfer-parser.d.ts +4 -1
- package/dist/parser/schedule/gtfs-transfer-parser.js +2 -2
- package/dist/parser/schedule/gtfs-transfer-parser.js.map +1 -1
- package/dist/parser/schedule/gtfs-trip-parser.d.ts +10 -2
- package/dist/parser/schedule/gtfs-trip-parser.js +26 -17
- package/dist/parser/schedule/gtfs-trip-parser.js.map +1 -1
- package/package.json +1 -1
- package/dist/corequeryify/corequery-intrasource-id.js.map +0 -1
- package/dist/corequeryify/service-conversion-iterator.js.map +0 -1
- package/dist/corequeryify/service-converter.js.map +0 -1
- package/dist/departures/departures-block-iterator.js.map +0 -1
- package/dist/departures/departures-iterator.js.map +0 -1
- package/dist/departures/filter-iterator.js.map +0 -1
- package/dist/departures/realtime-departures-block-iterator.js.map +0 -1
- package/dist/departures/scheduled-departures-block-iterator.js.map +0 -1
- package/dist/departures/scheduled-departures-iterator.js.map +0 -1
- package/dist/departures/zipper-departures-iterator.js.map +0 -1
- /package/dist/{corequeryify → conversion}/corequery-intrasource-id.d.ts +0 -0
- /package/dist/{corequeryify → conversion}/corequery-intrasource-id.js +0 -0
- /package/dist/{corequeryify → conversion}/service-conversion-iterator.js +0 -0
- /package/dist/{corequeryify → conversion}/service-converter.js +0 -0
- /package/dist/departures/{departures-iterator.js → iterator/departures-iterator.js} +0 -0
- /package/dist/departures/{scheduled-departures-block-iterator.js → iterator/scheduled-departures-block-iterator.js} +0 -0
- /package/dist/departures/{zipper-departures-iterator.js → iterator/zipper-departures-iterator.js} +0 -0
|
@@ -4,12 +4,18 @@ import { GtfsUpdatedTrip } from "../../data/gtfs-updated-trip.js";
|
|
|
4
4
|
import type { StopTimeUpdateJson, TripUpdateJson, UpdatedTimeJson } from "../../data/raw/realtime-data-json.js";
|
|
5
5
|
import { type GtfsTripUpdateTripIdentificationError } from "./gtfs-trip-update-trip-identifier.js";
|
|
6
6
|
import type { StopGtfsIdMapping } from "../../data/ids/stop-gtfs-id-mapping.js";
|
|
7
|
+
export type GtfsTripUpdateParserFields = {
|
|
8
|
+
readonly timezone: string;
|
|
9
|
+
readonly stopGtfsIdMapping: StopGtfsIdMapping;
|
|
10
|
+
readonly onError: (error: GtfsTripUpdateParsingError) => void;
|
|
11
|
+
};
|
|
7
12
|
export declare class GtfsTripUpdateParser {
|
|
8
13
|
private readonly _timezone;
|
|
14
|
+
private readonly _stopGtfsIdMapping;
|
|
9
15
|
private readonly _onError;
|
|
10
16
|
private readonly _tripIdentifier;
|
|
11
|
-
constructor(
|
|
12
|
-
parse(tripUpdate: TripUpdateJson, scheduleData: GtfsScheduleData
|
|
17
|
+
constructor(fields: GtfsTripUpdateParserFields);
|
|
18
|
+
parse(tripUpdate: TripUpdateJson, scheduleData: GtfsScheduleData): GtfsUpdatedTrip | null;
|
|
13
19
|
private _parseForScheduledTrip;
|
|
14
20
|
private _parseForCancelledTrip;
|
|
15
21
|
private _parseUpdatedTime;
|
|
@@ -6,20 +6,21 @@ const TRIP_UPDATE_SCHEDULE_RELATIONSHIP_CANCELLED = "CANCELED";
|
|
|
6
6
|
const STOP_TIME_UPDATE_ENTRY_SCHEDULE_RELATIONSHIP_SCHEDULED = "SCHEDULED";
|
|
7
7
|
export class GtfsTripUpdateParser {
|
|
8
8
|
_timezone;
|
|
9
|
+
_stopGtfsIdMapping;
|
|
9
10
|
_onError;
|
|
10
11
|
_tripIdentifier;
|
|
11
|
-
constructor(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
this.
|
|
16
|
-
|
|
17
|
-
|
|
12
|
+
constructor(fields) {
|
|
13
|
+
this._timezone = fields.timezone;
|
|
14
|
+
this._stopGtfsIdMapping = fields.stopGtfsIdMapping;
|
|
15
|
+
this._onError = fields.onError;
|
|
16
|
+
this._tripIdentifier = new GtfsTripUpdateTripIdentifier({
|
|
17
|
+
onError: this._onError,
|
|
18
|
+
});
|
|
18
19
|
}
|
|
19
|
-
parse(tripUpdate, scheduleData
|
|
20
|
+
parse(tripUpdate, scheduleData) {
|
|
20
21
|
const sr = tripUpdate.trip.scheduleRelationship;
|
|
21
22
|
if (sr === TRIP_UPDATE_SCHEDULE_RELATIONSHIP_SCHEDULED) {
|
|
22
|
-
return this._parseForScheduledTrip(tripUpdate, scheduleData
|
|
23
|
+
return this._parseForScheduledTrip(tripUpdate, scheduleData);
|
|
23
24
|
}
|
|
24
25
|
else if (sr === TRIP_UPDATE_SCHEDULE_RELATIONSHIP_CANCELLED) {
|
|
25
26
|
return this._parseForCancelledTrip(tripUpdate, scheduleData);
|
|
@@ -29,7 +30,7 @@ export class GtfsTripUpdateParser {
|
|
|
29
30
|
return null;
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
|
-
_parseForScheduledTrip(tripUpdate, scheduleData
|
|
33
|
+
_parseForScheduledTrip(tripUpdate, scheduleData) {
|
|
33
34
|
const result = this._tripIdentifier.identify(tripUpdate.trip, scheduleData);
|
|
34
35
|
if (result == null)
|
|
35
36
|
return null;
|
|
@@ -87,7 +88,7 @@ export class GtfsTripUpdateParser {
|
|
|
87
88
|
// Look up the stop GTFS ID given in the stop time update entry, and check
|
|
88
89
|
// whether it still maps to the same (CoreQuery) stop. In this way, we
|
|
89
90
|
// allow the platform/position ID to change, not the overall stop/station.
|
|
90
|
-
const gtfsIdMetadata =
|
|
91
|
+
const gtfsIdMetadata = this._stopGtfsIdMapping.tryResolve(entry.stopId);
|
|
91
92
|
if (gtfsIdMetadata == null) {
|
|
92
93
|
const Err = StopTimeUpdateEntryReferencesUnmappedStopIdError;
|
|
93
94
|
this._onError(new Err(tripUpdate, entry));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-trip-update-parser.js","sourceRoot":"","sources":["../../../src/parser/realtime/gtfs-trip-update-parser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAMlE,OAAO,EACL,4BAA4B,GAE7B,MAAM,uCAAuC,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAG5C,MAAM,2CAA2C,GAAG,WAAW,CAAC;AAChE,MAAM,2CAA2C,GAAG,UAAU,CAAC;AAC/D,MAAM,sDAAsD,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"gtfs-trip-update-parser.js","sourceRoot":"","sources":["../../../src/parser/realtime/gtfs-trip-update-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import type { GtfsScheduleData } from "../../data/gtfs-schedule-data.js";
|
|
2
2
|
import type { GtfsScheduledTrip } from "../../data/gtfs-scheduled-trip.js";
|
|
3
3
|
import type { TripDescriptorJson } from "../../data/raw/realtime-data-json.js";
|
|
4
|
+
export type GtfsTripUpdateTripIdentifierFields = {
|
|
5
|
+
readonly onError: (error: GtfsTripUpdateTripIdentificationError) => void;
|
|
6
|
+
};
|
|
4
7
|
export declare class GtfsTripUpdateTripIdentifier {
|
|
5
8
|
private readonly _onError;
|
|
6
|
-
constructor(
|
|
9
|
+
constructor(fields: GtfsTripUpdateTripIdentifierFields);
|
|
7
10
|
identify(tripDescriptor: TripDescriptorJson, scheduleData: GtfsScheduleData): {
|
|
8
11
|
trip: GtfsScheduledTrip;
|
|
9
12
|
serviceDay: Temporal.PlainDate;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export class GtfsTripUpdateTripIdentifier {
|
|
2
2
|
_onError;
|
|
3
|
-
constructor(
|
|
4
|
-
this._onError =
|
|
3
|
+
constructor(fields) {
|
|
4
|
+
this._onError = fields.onError;
|
|
5
5
|
}
|
|
6
6
|
identify(tripDescriptor, scheduleData) {
|
|
7
7
|
// Currently it seems like PTV always gives `tripId` and `startDate` in the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-trip-update-trip-identifier.js","sourceRoot":"","sources":["../../../src/parser/realtime/gtfs-trip-update-trip-identifier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gtfs-trip-update-trip-identifier.js","sourceRoot":"","sources":["../../../src/parser/realtime/gtfs-trip-update-trip-identifier.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,4BAA4B;IACtB,QAAQ,CAEf;IAEV,YAAY,MAA0C;QACpD,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,QAAQ,CAAC,cAAkC,EAAE,YAA8B;QACzE,2EAA2E;QAC3E,wEAAwE;QACxE,yEAAyE;QACzE,sBAAsB;QACtB,IAAI,cAAc,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,sCAAsC,CAAC;YACnD,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,cAAc,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,sCAAsC,CAAC;YACnD,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,kEAAkE;YAClE,sEAAsE;YACtE,gEAAgE;YAChE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvD,MAAM,GAAG,GAAG,8CAA8C,CAAC;gBAC3D,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;YACzC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,yEAAyE;QACzE,0EAA0E;QAC1E,yEAAyE;QACzE,2EAA2E;QAC3E,oCAAoC;QACpC,EAAE;QACF,4EAA4E;QAC5E,wCAAwC;QACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,gCAAgC,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,4EAA4E;QAC5E,2EAA2E;QAC3E,wEAAwE;QACxE,kEAAkE;QAClE,IACE,cAAc,CAAC,SAAS,IAAI,IAAI;YAChC,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,EAChE,CAAC;YACD,MAAM,GAAG,GAAG,0DAA0D,CAAC;YACvE,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC;IACxD,CAAC;CACF;AAQD,6EAA6E;AAC7E,gFAAgF;AAChF,uCAAuC;AACvC,MAAM,OAAO,sCAAsC;IAGtC;IACA;IAHF,IAAI,GAAG,wCAAwC,CAAC;IACzD,YACW,cAAkC,EAClC,KAA6B;QAD7B,mBAAc,GAAd,cAAc,CAAoB;QAClC,UAAK,GAAL,KAAK,CAAwB;IACrC,CAAC;CACL;AAED,MAAM,OAAO,8CAA8C;IAEpC;IADZ,IAAI,GAAG,iDAAiD,CAAC;IAClE,YAAqB,cAAkC;QAAlC,mBAAc,GAAd,cAAc,CAAoB;IAAG,CAAC;CAC5D;AAED,MAAM,OAAO,gCAAgC;IAGhC;IACA;IAHF,IAAI,GAAG,mCAAmC,CAAC;IACpD,YACW,cAAkC,EAClC,IAAuB;QADvB,mBAAc,GAAd,cAAc,CAAoB;QAClC,SAAI,GAAJ,IAAI,CAAmB;IAC/B,CAAC;CACL;AAED,MAAM,OAAO,0DAA0D;IAI1D;IACA;IAJF,IAAI,GACX,iEAAiE,CAAC;IACpE,YACW,cAAkC,EAClC,IAAuB;QADvB,mBAAc,GAAd,cAAc,CAAoB;QAClC,SAAI,GAAJ,IAAI,CAAmB;IAC/B,CAAC;CACL"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import type { CalendarCsv, CalendarCsvRow, CalendarDatesCsv, CalendarDatesCsvRow } from "../../data/raw/schedule-csvs.js";
|
|
2
2
|
import { GtfsCalendar } from "../../data/gtfs-calendar.js";
|
|
3
|
+
export type GtfsCalendarParserFields = {
|
|
4
|
+
readonly onError: (error: GtfsCalendarParsingError) => void;
|
|
5
|
+
};
|
|
3
6
|
export declare class GtfsCalendarParser {
|
|
4
7
|
private readonly _onError;
|
|
5
|
-
constructor(
|
|
8
|
+
constructor(fields: GtfsCalendarParserFields);
|
|
6
9
|
parse(calendarCsv: CalendarCsv, calendarDatesCsv: CalendarDatesCsv): readonly GtfsCalendar[];
|
|
7
10
|
}
|
|
8
11
|
export type GtfsCalendarParsingError = DuplicateCalendarIdError | UnexpectedCalendarDateExceptionTypeError | InvalidCalendarDateRangeError | MultipleExceptionsForSameDateError;
|
|
@@ -4,8 +4,8 @@ const CALENDAR_DATE_EXCEPTION_TYPE_ADDED = 1;
|
|
|
4
4
|
const CALENDAR_DATE_EXCEPTION_TYPE_REMOVED = 2;
|
|
5
5
|
export class GtfsCalendarParser {
|
|
6
6
|
_onError;
|
|
7
|
-
constructor(
|
|
8
|
-
this._onError =
|
|
7
|
+
constructor(fields) {
|
|
8
|
+
this._onError = fields.onError;
|
|
9
9
|
}
|
|
10
10
|
parse(calendarCsv, calendarDatesCsv) {
|
|
11
11
|
const calendarData = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-calendar-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-calendar-parser.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,kCAAkC,GAAG,CAAC,CAAC;AAC7C,MAAM,oCAAoC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"gtfs-calendar-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-calendar-parser.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,kCAAkC,GAAG,CAAC,CAAC;AAC7C,MAAM,oCAAoC,GAAG,CAAC,CAAC;AAM/C,MAAM,OAAO,kBAAkB;IACZ,QAAQ,CAA4C;IAErE,YAAY,MAAgC;QAC1C,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,KAAK,CACH,WAAwB,EACxB,gBAAkC;QASlC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAqC,CAAC;QAClE,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAE5C,wCAAwC;QACxC,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrC,oEAAoE;gBACpE,IAAI,CAAC,QAAQ,CAAC,IAAI,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;gBACjD,SAAS;YACX,CAAC;YAED,IAAI,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjE,IAAI,CAAC,QAAQ,CAAC,IAAI,6BAA6B,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtD,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACtC,SAAS;YACX,CAAC;YAED,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE;gBAC/B,EAAE,EAAE,GAAG,CAAC,UAAU;gBAClB,OAAO,EAAE,GAAG;gBACZ,UAAU,EAAE,EAAE;gBACd,YAAY,EAAE,EAAE;aACjB,CAAC,CAAC;QACL,CAAC;QAED,sEAAsE;QACtE,0BAA0B;QAC1B,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACnC,wEAAwE;YACxE,wEAAwE;YACxE,IAAI,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC;gBAAE,SAAS;YAEpD,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI;gBACnD,EAAE,EAAE,GAAG,CAAC,UAAU;gBAClB,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,EAAE;gBACd,YAAY,EAAE,EAAE;aACjB,CAAC;YAEF,IACE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;gBACtC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EACxC,CAAC;gBACD,wEAAwE;gBACxE,6CAA6C;gBAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,kCAAkC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7D,CAAC;YAED,IAAI,GAAG,CAAC,cAAc,KAAK,kCAAkC,EAAE,CAAC;gBAC9D,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,GAAG,CAAC,cAAc,KAAK,oCAAoC,EAAE,CAAC;gBACvE,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,IAAI,wCAAwC,CAAC,GAAG,CAAC,CAAC,CAAC;gBACjE,SAAS;YACX,CAAC;YAED,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAED,6CAA6C;QAC7C,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI;gBAC9B,UAAU,EAAE,IAAI,CAAC,EAAE;gBACnB,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;aACf,CAAC;YAEF,OAAO,IAAI,YAAY,CACrB,IAAI,CAAC,EAAE,EACP,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,MAAM,EACd,IAAI,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,EACxD,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAQD,MAAM,OAAO,wBAAwB;IAEd;IADZ,IAAI,GAAG,oBAAoB,CAAC;IACrC,YAAqB,4BAA4C;QAA5C,iCAA4B,GAA5B,4BAA4B,CAAgB;IAAG,CAAC;CACtE;AAED,MAAM,OAAO,6BAA6B;IAEnB;IADZ,IAAI,GAAG,6BAA6B,CAAC;IAC9C,YAAqB,GAAmB;QAAnB,QAAG,GAAH,GAAG,CAAgB;IAAG,CAAC;CAC7C;AAED,MAAM,OAAO,wCAAwC;IAE9B;IADZ,IAAI,GAAG,yCAAyC,CAAC;IAC1D,YAAqB,GAAwB;QAAxB,QAAG,GAAH,GAAG,CAAqB;IAAG,CAAC;CAClD;AAED,MAAM,OAAO,kCAAkC;IAExB;IADZ,IAAI,GAAG,mCAAmC,CAAC;IACpD,YAAqB,wBAA6C;QAA7C,6BAAwB,GAAxB,wBAAwB,CAAqB;IAAG,CAAC;CACvE"}
|
|
@@ -8,10 +8,15 @@ export type MatchedRoute = {
|
|
|
8
8
|
color: Color | null;
|
|
9
9
|
serviceTags: readonly number[];
|
|
10
10
|
};
|
|
11
|
+
export type GtfsRouteMatcherFields = {
|
|
12
|
+
readonly onError: (error: GtfsRouteMatchingError) => void;
|
|
13
|
+
readonly stopGtfsIdMapping: StopGtfsIdMapping;
|
|
14
|
+
};
|
|
11
15
|
export declare class GtfsRouteMatcher {
|
|
12
16
|
private readonly _onError;
|
|
13
|
-
|
|
14
|
-
|
|
17
|
+
private readonly _stopGtfsIdMapping;
|
|
18
|
+
constructor(fields: GtfsRouteMatcherFields);
|
|
19
|
+
match(stopTimes: StopTimesCsv, routesForLine: readonly Route[]): MatchedRoute | null;
|
|
15
20
|
private _matchToRoute;
|
|
16
21
|
private _addPassingMovementsFromRoute;
|
|
17
22
|
/**
|
|
@@ -6,11 +6,13 @@ const STOP_TIME_DROP_OFF_TYPE_REGULAR = 0;
|
|
|
6
6
|
const STOP_TIME_DROP_OFF_TYPE_NO_DROP_OFF = 1;
|
|
7
7
|
export class GtfsRouteMatcher {
|
|
8
8
|
_onError;
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
_stopGtfsIdMapping;
|
|
10
|
+
constructor(fields) {
|
|
11
|
+
this._onError = fields.onError;
|
|
12
|
+
this._stopGtfsIdMapping = fields.stopGtfsIdMapping;
|
|
11
13
|
}
|
|
12
|
-
match(stopTimes, routesForLine
|
|
13
|
-
const servicingMovements = this._convertToServicingMovements(stopTimes
|
|
14
|
+
match(stopTimes, routesForLine) {
|
|
15
|
+
const servicingMovements = this._convertToServicingMovements(stopTimes);
|
|
14
16
|
if (servicingMovements == null)
|
|
15
17
|
return null;
|
|
16
18
|
const match = this._matchToRoute(servicingMovements, routesForLine);
|
|
@@ -86,11 +88,11 @@ export class GtfsRouteMatcher {
|
|
|
86
88
|
* are not added at this stage. They're sprinkled in later once we've matched
|
|
87
89
|
* the trip to a route.
|
|
88
90
|
*/
|
|
89
|
-
_convertToServicingMovements(stopTimes
|
|
91
|
+
_convertToServicingMovements(stopTimes) {
|
|
90
92
|
const result = [];
|
|
91
93
|
for (let i = 0; i < stopTimes.length; i++) {
|
|
92
94
|
const stopTime = itsOk(stopTimes[i]);
|
|
93
|
-
const gtfsIdMetadata =
|
|
95
|
+
const gtfsIdMetadata = this._stopGtfsIdMapping.tryResolve(stopTime.stop_id);
|
|
94
96
|
if (gtfsIdMetadata == null) {
|
|
95
97
|
this._onError(new StopTimeReferencesUnmappedStopIdError(stopTime));
|
|
96
98
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-route-matcher.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-route-matcher.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,oCAAoC,EACpC,gCAAgC,EAChC,gCAAgC,EAChC,oCAAoC,GAGrC,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,MAAM,6BAA6B,GAAG,CAAC,CAAC;AACxC,MAAM,+BAA+B,GAAG,CAAC,CAAC;AAC1C,MAAM,+BAA+B,GAAG,CAAC,CAAC;AAC1C,MAAM,mCAAmC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"gtfs-route-matcher.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-route-matcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,17 @@ import type { StopGtfsIdMapping } from "../../data/ids/stop-gtfs-id-mapping.js";
|
|
|
6
6
|
import type { LineRoutesMapping } from "../../data/route/line-routes-mapping.js";
|
|
7
7
|
import type { BonusLinesMapping } from "../../data/route/bonus-lines-mapping.js";
|
|
8
8
|
import type { GtfsFeedCsv } from "../../data/raw/schedule-csvs.js";
|
|
9
|
+
export type GtfsScheduleDataParserFields = {
|
|
10
|
+
readonly lineRoutesMapping: LineRoutesMapping;
|
|
11
|
+
readonly bonusLinesMapping: BonusLinesMapping;
|
|
12
|
+
readonly lineGtfsIdMapping: LineGtfsIdMapping;
|
|
13
|
+
readonly stopGtfsIdMapping: StopGtfsIdMapping;
|
|
14
|
+
readonly onError: (error: GtfsScheduleParsingError) => void;
|
|
15
|
+
};
|
|
9
16
|
export declare class GtfsScheduleDataParser {
|
|
10
17
|
private readonly _calendarParser;
|
|
11
18
|
private readonly _tripParser;
|
|
12
|
-
constructor(
|
|
13
|
-
parse(csvs: GtfsFeedCsv
|
|
19
|
+
constructor(fields: GtfsScheduleDataParserFields);
|
|
20
|
+
parse(csvs: GtfsFeedCsv): GtfsScheduleData;
|
|
14
21
|
}
|
|
15
22
|
export type GtfsScheduleParsingError = GtfsCalendarParsingError | GtfsTripParsingError;
|
|
@@ -4,14 +4,22 @@ import { GtfsTripParser, } from "./gtfs-trip-parser.js";
|
|
|
4
4
|
export class GtfsScheduleDataParser {
|
|
5
5
|
_calendarParser;
|
|
6
6
|
_tripParser;
|
|
7
|
-
constructor(
|
|
8
|
-
this._calendarParser = new GtfsCalendarParser(
|
|
9
|
-
|
|
7
|
+
constructor(fields) {
|
|
8
|
+
this._calendarParser = new GtfsCalendarParser({
|
|
9
|
+
onError: fields.onError,
|
|
10
|
+
});
|
|
11
|
+
this._tripParser = new GtfsTripParser({
|
|
12
|
+
lineRoutesMapping: fields.lineRoutesMapping,
|
|
13
|
+
bonusLinesMapping: fields.bonusLinesMapping,
|
|
14
|
+
lineGtfsIdMapping: fields.lineGtfsIdMapping,
|
|
15
|
+
stopGtfsIdMapping: fields.stopGtfsIdMapping,
|
|
16
|
+
onError: fields.onError,
|
|
17
|
+
});
|
|
10
18
|
}
|
|
11
|
-
parse(csvs
|
|
19
|
+
parse(csvs) {
|
|
12
20
|
const { calendar, calendarDates, trips, stopTimes, transfers } = csvs;
|
|
13
21
|
const parsedCalendars = this._calendarParser.parse(calendar, calendarDates);
|
|
14
|
-
const { parsedTrips, parsedTransfers, ignoredTripIds } = this._tripParser.parse(trips, stopTimes, transfers, parsedCalendars
|
|
22
|
+
const { parsedTrips, parsedTransfers, ignoredTripIds } = this._tripParser.parse(trips, stopTimes, transfers, parsedCalendars);
|
|
15
23
|
return new GtfsScheduleData(parsedTrips, parsedCalendars, parsedTransfers, ignoredTripIds);
|
|
16
24
|
}
|
|
17
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-schedule-data-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-schedule-data-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EACL,kBAAkB,GAEnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,cAAc,GAEf,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"gtfs-schedule-data-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-schedule-data-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EACL,kBAAkB,GAEnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,cAAc,GAEf,MAAM,uBAAuB,CAAC;AAe/B,MAAM,OAAO,sBAAsB;IAChB,eAAe,CAAqB;IACpC,WAAW,CAAiB;IAE7C,YAAY,MAAoC;QAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,kBAAkB,CAAC;YAC5C,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,IAAI,cAAc,CAAC;YACpC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAiB;QACrB,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAEtE,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAE5E,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,GACpD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAEvE,OAAO,IAAI,gBAAgB,CACzB,WAAW,EACX,eAAe,EACf,eAAe,EACf,cAAc,CACf,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import type { StopTimesCsv } from "../../data/raw/schedule-csvs.js";
|
|
2
|
+
export type GtfsStopTimeNormaliserFields = {
|
|
3
|
+
readonly onError: (error: GtfsStopTimeNormalisationError) => void;
|
|
4
|
+
};
|
|
2
5
|
/**
|
|
3
6
|
* Responsible for checking that in a list of stop times, the stop_sequence
|
|
4
7
|
* values start from 1 and increment by 1 each time. Where stop_sequence values
|
|
@@ -8,7 +11,7 @@ import type { StopTimesCsv } from "../../data/raw/schedule-csvs.js";
|
|
|
8
11
|
*/
|
|
9
12
|
export declare class GtfsStopTimeNormaliser {
|
|
10
13
|
private readonly _onError;
|
|
11
|
-
constructor(
|
|
14
|
+
constructor(fields: GtfsStopTimeNormaliserFields);
|
|
12
15
|
normalise(unsortedStopTimes: StopTimesCsv): StopTimesCsv | null;
|
|
13
16
|
/**
|
|
14
17
|
* Returns true if the stop times make a perfect sequence starting from 1, and
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
export class GtfsStopTimeNormaliser {
|
|
9
9
|
_onError;
|
|
10
|
-
constructor(
|
|
11
|
-
this._onError =
|
|
10
|
+
constructor(fields) {
|
|
11
|
+
this._onError = fields.onError;
|
|
12
12
|
}
|
|
13
13
|
normalise(unsortedStopTimes) {
|
|
14
14
|
const sortedStopTimes = [...unsortedStopTimes].sort((a, b) => a.stop_sequence - b.stop_sequence);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-stop-time-normaliser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-stop-time-normaliser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gtfs-stop-time-normaliser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-stop-time-normaliser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import type { TransfersCsv, TransfersCsvRow } from "../../data/raw/schedule-csvs.js";
|
|
2
2
|
import { GtfsScheduledTrip } from "../../data/gtfs-scheduled-trip.js";
|
|
3
3
|
import { type GtfsTransfer } from "../../data/gtfs-transfer.js";
|
|
4
|
+
export type GtfsTransferParserFields = {
|
|
5
|
+
readonly onError: (error: GtfsTransferParsingError) => void;
|
|
6
|
+
};
|
|
4
7
|
export declare class GtfsTransferParser {
|
|
5
8
|
private readonly _onError;
|
|
6
|
-
constructor(
|
|
9
|
+
constructor(fields: GtfsTransferParserFields);
|
|
7
10
|
parse(trips: readonly GtfsScheduledTrip[], transfers: TransfersCsv): readonly GtfsTransfer[];
|
|
8
11
|
private _isEntireVehicleAlreadyFormingNextService;
|
|
9
12
|
private _isEntireVehicleAlreadyFormedByPreviousService;
|
|
@@ -4,8 +4,8 @@ import { MutableGtfsTransferMapping } from "../../data/gtfs-transfer-mapping.js"
|
|
|
4
4
|
const TRANSFER_TYPE_IN_SEAT_TRANSFER = 4;
|
|
5
5
|
export class GtfsTransferParser {
|
|
6
6
|
_onError;
|
|
7
|
-
constructor(
|
|
8
|
-
this._onError =
|
|
7
|
+
constructor(fields) {
|
|
8
|
+
this._onError = fields.onError;
|
|
9
9
|
}
|
|
10
10
|
parse(trips, transfers) {
|
|
11
11
|
const tripMap = new Map(trips.map((trip) => [trip.gtfsTripId, trip]));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-transfer-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-transfer-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EACL,qCAAqC,GAEtC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,MAAM,8BAA8B,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"gtfs-transfer-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-transfer-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EACL,qCAAqC,GAEtC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,MAAM,8BAA8B,GAAG,CAAC,CAAC;AAMzC,MAAM,OAAO,kBAAkB;IACZ,QAAQ,CAA4C;IAErE,YAAY,MAAgC;QAC1C,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,KAAK,CACH,KAAmC,EACnC,SAAuB;QAEvB,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAC7C,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,0BAA0B,CAAe,CAAC,CAAC,EAAE,EAAE,CAChE,CAAC,CAAC,kBAAkB,EAAE,CACvB,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAEhD,wEAAwE;YACxE,qEAAqE;YACrE,yEAAyE;YACzE,sEAAsE;YACtE,kEAAkE;YAClE,uEAAuE;YACvE,uEAAuE;YACvE,aAAa;YACb,IAAI,QAAQ,CAAC,aAAa,KAAK,8BAA8B,EAAE,CAAC;gBAC9D,IAAI,CAAC,QAAQ,CAAC,IAAI,gCAAgC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9D,SAAS;YACX,CAAC;YAED,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,MAAM,GAAG,GAAG,iCAAiC,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;gBACjD,SAAS;YACX,CAAC;YACD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,MAAM,GAAG,GAAG,iCAAiC,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;gBAC/C,SAAS;YACX,CAAC;YAED,IAAI,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,IAAI,qCAAqC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,wEAAwE;YACxE,uEAAuE;YACvE,wEAAwE;YACxE,oEAAoE;YACpE,uEAAuE;YACvE,gEAAgE;YAChE,sBAAsB;YACtB,IAAI,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,KAAK,QAAQ,CAAC,YAAY,EAAE,CAAC;gBACrE,IAAI,CAAC,QAAQ,CAAC,IAAI,8BAA8B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACtE,SAAS;YACX,CAAC;YACD,IAAI,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACjE,IAAI,CAAC,QAAQ,CAAC,IAAI,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;gBAChE,SAAS;YACX,CAAC;YACD,IAAI,IAAI,CAAC,yCAAyC,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;gBACrE,MAAM,GAAG,GAAG,2CAA2C,CAAC;gBACxD,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAC3C,SAAS;YACX,CAAC;YACD,IAAI,IAAI,CAAC,8CAA8C,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;gBACxE,MAAM,GAAG,GAAG,2CAA2C,CAAC;gBACxD,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;gBACzC,SAAS;YACX,CAAC;YAED,iEAAiE;YACjE,0EAA0E;YAC1E,4DAA4D;YAC5D,iEAAiE;YACjE,0EAA0E;YAC1E,wCAAwC;YACxC,IAAI,QAAQ,CAAC,QAAQ,CAAC,cAAc,KAAK,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;gBACxE,IAAI,CAAC,QAAQ,CAAC,IAAI,6BAA6B,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7D,CAAC;YAED,yEAAyE;YACzE,yEAAyE;YACzE,yEAAyE;YACzE,wBAAwB;YACxB,EAAE;YACF,sEAAsE;YACtE,kEAAkE;YAClE,sEAAsE;YACtE,0EAA0E;YAC1E,yEAAyE;YACzE,0EAA0E;YAC1E,yBAAyB;YACzB,MAAM,eAAe,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC;YACzD,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC;YACzD,IAAI,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,+BAA+B,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC7D,SAAS;YACX,CAAC;YAED,MAAM,CAAC,IAAI,CACT,IAAI,qCAAqC,CAAC;gBACxC,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,QAAQ,EAAE,MAAM,CAAC,UAAU;aAC5B,CAAC,CACH,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAEO,yCAAyC,CAC/C,QAA2B,EAC3B,SAAmD;QAEnD,OAAO,SAAS;aACb,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;aAC9B,IAAI,CACH,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,8BAA8B;YACzC,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU,CACvC,CAAC;IACN,CAAC;IAEO,8CAA8C,CACpD,MAAyB,EACzB,SAAmD;QAEnD,OAAO,SAAS;aACb,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC;aAC5B,IAAI,CACH,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,8BAA8B;YACzC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,UAAU,CACnC,CAAC;IACN,CAAC;CACF;AAYD,MAAM,OAAO,iCAAiC;IAGjC;IACA;IAHF,IAAI,GAAG,uCAAuC,CAAC;IACxD,YACW,QAAyB,EACzB,KAAoC;QADpC,aAAQ,GAAR,QAAQ,CAAiB;QACzB,UAAK,GAAL,KAAK,CAA+B;IAC5C,CAAC;CACL;AAED,MAAM,OAAO,8BAA8B;IAG9B;IACA;IAHF,IAAI,GAAG,+BAA+B,CAAC;IAChD,YACW,QAAyB,EACzB,QAA2B;QAD3B,aAAQ,GAAR,QAAQ,CAAiB;QACzB,aAAQ,GAAR,QAAQ,CAAmB;IACnC,CAAC;CACL;AAED,MAAM,OAAO,0BAA0B;IAG1B;IACA;IAHF,IAAI,GAAG,2BAA2B,CAAC;IAC5C,YACW,QAAyB,EACzB,MAAyB;QADzB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,WAAM,GAAN,MAAM,CAAmB;IACjC,CAAC;CACL;AAED,MAAM,OAAO,2CAA2C;IAG3C;IACA;IAHF,IAAI,GAAG,4CAA4C,CAAC;IAC7D,YACW,QAAyB,EACzB,0BAA6C;QAD7C,aAAQ,GAAR,QAAQ,CAAiB;QACzB,+BAA0B,GAA1B,0BAA0B,CAAmB;IACrD,CAAC;CACL;AAED,MAAM,OAAO,gCAAgC;IAEtB;IADZ,IAAI,GAAG,kCAAkC,CAAC;IACnD,YAAqB,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;CACnD;AAED,MAAM,OAAO,qCAAqC;IAE3B;IADZ,IAAI,GAAG,wCAAwC,CAAC;IACzD,YAAqB,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;CACnD;AAED,MAAM,OAAO,6BAA6B;IAEnB;IADZ,IAAI,GAAG,4BAA4B,CAAC;IAC7C,YAAqB,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;CACnD;AAED,MAAM,OAAO,+BAA+B;IAErB;IADZ,IAAI,GAAG,+BAA+B,CAAC;IAChD,YAAqB,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;CACnD"}
|
|
@@ -8,16 +8,24 @@ import { type GtfsRouteMatchingError } from "./gtfs-route-matcher.js";
|
|
|
8
8
|
import { type GtfsTransferParsingError } from "./gtfs-transfer-parser.js";
|
|
9
9
|
import type { LineRoutesMapping } from "../../data/route/line-routes-mapping.js";
|
|
10
10
|
import type { BonusLinesMapping } from "../../data/route/bonus-lines-mapping.js";
|
|
11
|
+
export type GtfsTripParserFields = {
|
|
12
|
+
readonly lineRoutesMapping: LineRoutesMapping;
|
|
13
|
+
readonly bonusLinesMapping: BonusLinesMapping;
|
|
14
|
+
readonly lineGtfsIdMapping: LineGtfsIdMapping;
|
|
15
|
+
readonly stopGtfsIdMapping: StopGtfsIdMapping;
|
|
16
|
+
readonly onError: (error: GtfsTripParsingError) => void;
|
|
17
|
+
};
|
|
11
18
|
export declare class GtfsTripParser {
|
|
12
19
|
private readonly _lineRoutesMapping;
|
|
13
20
|
private readonly _bonusLinesMapping;
|
|
21
|
+
private readonly _lineGtfsIdMapping;
|
|
14
22
|
private readonly _onError;
|
|
15
23
|
private readonly _stopTimeNormaliser;
|
|
16
24
|
private readonly _primaryRouteMatcher;
|
|
17
25
|
private readonly _bonusRouteMatcher;
|
|
18
26
|
private readonly _transferParser;
|
|
19
|
-
constructor(
|
|
20
|
-
parse(trips: TripsCsv, stopTimes: StopTimesCsv, transfers: TransfersCsv, calendars: readonly GtfsCalendar[]
|
|
27
|
+
constructor(fields: GtfsTripParserFields);
|
|
28
|
+
parse(trips: TripsCsv, stopTimes: StopTimesCsv, transfers: TransfersCsv, calendars: readonly GtfsCalendar[]): {
|
|
21
29
|
parsedTrips: GtfsScheduledTrip[];
|
|
22
30
|
parsedTransfers: readonly import("../../data/gtfs-transfer.js").GtfsEntireVehicleFormsServiceTransfer[];
|
|
23
31
|
ignoredTripIds: string[];
|
|
@@ -5,25 +5,34 @@ import { GtfsTransferParser, } from "./gtfs-transfer-parser.js";
|
|
|
5
5
|
export class GtfsTripParser {
|
|
6
6
|
_lineRoutesMapping;
|
|
7
7
|
_bonusLinesMapping;
|
|
8
|
+
_lineGtfsIdMapping;
|
|
8
9
|
_onError;
|
|
9
10
|
_stopTimeNormaliser;
|
|
10
11
|
_primaryRouteMatcher;
|
|
11
12
|
_bonusRouteMatcher;
|
|
12
13
|
_transferParser;
|
|
13
|
-
constructor(
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
this.
|
|
18
|
-
this.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
this._primaryRouteMatcher = new GtfsRouteMatcher(
|
|
22
|
-
|
|
14
|
+
constructor(fields) {
|
|
15
|
+
this._lineRoutesMapping = fields.lineRoutesMapping;
|
|
16
|
+
this._bonusLinesMapping = fields.bonusLinesMapping;
|
|
17
|
+
this._lineGtfsIdMapping = fields.lineGtfsIdMapping;
|
|
18
|
+
this._onError = fields.onError;
|
|
19
|
+
this._stopTimeNormaliser = new GtfsStopTimeNormaliser({
|
|
20
|
+
onError: this._onError,
|
|
21
|
+
});
|
|
22
|
+
this._primaryRouteMatcher = new GtfsRouteMatcher({
|
|
23
|
+
onError: this._onError,
|
|
24
|
+
stopGtfsIdMapping: fields.stopGtfsIdMapping,
|
|
25
|
+
});
|
|
26
|
+
this._transferParser = new GtfsTransferParser({
|
|
27
|
+
onError: this._onError,
|
|
28
|
+
});
|
|
23
29
|
// We don't care if a bonus route doesn't match. Most of the time, it won't!
|
|
24
|
-
this._bonusRouteMatcher = new GtfsRouteMatcher(
|
|
30
|
+
this._bonusRouteMatcher = new GtfsRouteMatcher({
|
|
31
|
+
onError: () => { },
|
|
32
|
+
stopGtfsIdMapping: fields.stopGtfsIdMapping,
|
|
33
|
+
});
|
|
25
34
|
}
|
|
26
|
-
parse(trips, stopTimes, transfers, calendars
|
|
35
|
+
parse(trips, stopTimes, transfers, calendars) {
|
|
27
36
|
const calendarMap = this._buildCalendarMap(calendars);
|
|
28
37
|
const rowsByTrip = this._organiseStopTimesIntoTrips(trips, stopTimes);
|
|
29
38
|
const parsedTrips = [];
|
|
@@ -34,7 +43,7 @@ export class GtfsTripParser {
|
|
|
34
43
|
this._onError(new TripReferencesNonExistentCalendarError(trip));
|
|
35
44
|
continue;
|
|
36
45
|
}
|
|
37
|
-
const lineIdMatch =
|
|
46
|
+
const lineIdMatch = this._lineGtfsIdMapping.tryResolve(trip.route_id);
|
|
38
47
|
if (lineIdMatch == null) {
|
|
39
48
|
this._onError(new TripReferencesUnmappedRouteIdError(trip));
|
|
40
49
|
continue;
|
|
@@ -48,11 +57,11 @@ export class GtfsTripParser {
|
|
|
48
57
|
if (normalizedStopTimes == null)
|
|
49
58
|
continue;
|
|
50
59
|
const routesForLine = this._lineRoutesMapping.forLine(lineIdMatch.lineId);
|
|
51
|
-
const routeMatchResult = this._primaryRouteMatcher.match(normalizedStopTimes, routesForLine
|
|
60
|
+
const routeMatchResult = this._primaryRouteMatcher.match(normalizedStopTimes, routesForLine);
|
|
52
61
|
// Route matcher reports its own errors.
|
|
53
62
|
if (routeMatchResult == null)
|
|
54
63
|
continue;
|
|
55
|
-
const { lineIds, serviceTags } = this._applyBonusLines(lineIdMatch.lineId, routeMatchResult.serviceTags, normalizedStopTimes
|
|
64
|
+
const { lineIds, serviceTags } = this._applyBonusLines(lineIdMatch.lineId, routeMatchResult.serviceTags, normalizedStopTimes);
|
|
56
65
|
parsedTrips.push(new GtfsScheduledTrip({
|
|
57
66
|
gtfsTripId: trip.trip_id,
|
|
58
67
|
gtfsRouteId: trip.route_id,
|
|
@@ -100,7 +109,7 @@ export class GtfsTripParser {
|
|
|
100
109
|
stopTimes: group.stopTimes,
|
|
101
110
|
}));
|
|
102
111
|
}
|
|
103
|
-
_applyBonusLines(mainRouteLineId, mainRouteServiceTags, normalizedStopTimes
|
|
112
|
+
_applyBonusLines(mainRouteLineId, mainRouteServiceTags, normalizedStopTimes) {
|
|
104
113
|
const bonusLines = this._bonusLinesMapping.forLine(mainRouteLineId);
|
|
105
114
|
if (bonusLines == null) {
|
|
106
115
|
return { lineIds: [mainRouteLineId], serviceTags: mainRouteServiceTags };
|
|
@@ -110,7 +119,7 @@ export class GtfsTripParser {
|
|
|
110
119
|
const lineIds = new Set();
|
|
111
120
|
const serviceTags = new Set();
|
|
112
121
|
for (const bonusLine of bonusLines.lines) {
|
|
113
|
-
const matchResult = this._bonusRouteMatcher.match(normalizedStopTimes, this._lineRoutesMapping.forLine(bonusLine)
|
|
122
|
+
const matchResult = this._bonusRouteMatcher.match(normalizedStopTimes, this._lineRoutesMapping.forLine(bonusLine));
|
|
114
123
|
if (matchResult != null) {
|
|
115
124
|
lineIds.add(bonusLine);
|
|
116
125
|
for (const serviceTag of matchResult.serviceTags) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gtfs-trip-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-trip-parser.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EACL,sBAAsB,GAEvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,gBAAgB,GAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEL,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"gtfs-trip-parser.js","sourceRoot":"","sources":["../../../src/parser/schedule/gtfs-trip-parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"corequery-intrasource-id.js","sourceRoot":"","sources":["../../src/corequeryify/corequery-intrasource-id.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,sBAAsB;IAEtB;IACA;IAFX,YACW,UAAkB,EAClB,UAA8B;QAD9B,eAAU,GAAV,UAAU,CAAQ;QAClB,eAAU,GAAV,UAAU,CAAoB;IACtC,CAAC;IAEJ,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IAC5D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAa;QACxB,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,gBAAgB,IAAI,IAAI,IAAI,UAAU,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAEhE,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC7D,OAAO,IAAI,sBAAsB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC5D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"service-conversion-iterator.js","sourceRoot":"","sources":["../../src/corequeryify/service-conversion-iterator.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,yBAAyB;IAiBjB;IAEA;IAaA;IAtBX,uBAAuB,CAAiC;IAEhE;IACE,yEAAyE;IACzE,yEAAyE;IACzE,wEAAwE;IACxE,oCAAoC;IACnB,SAA6B,EAE7B,UAShB;IAED,wEAAwE;IACxE,yEAAyE;IACxD,SAAiB;QAfjB,cAAS,GAAT,SAAS,CAAoB;QAE7B,eAAU,GAAV,UAAU,CAS1B;QAIgB,cAAS,GAAT,SAAS,CAAQ;QAElC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;IACtC,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,uBAAuB,IAAI,IAAI,EAAE,CAAC;YACzC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACvE,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,IAAI;QACF,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAEpC,yEAAyE;QACzE,iDAAiD;QACjD,MAAM,cAAc,GAClB,IAAI,CAAC,uBAAuB,IAAI,IAAI;YAClC,CAAC,CAAC,IAAI,CAAC,uBAAuB;YAC9B,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9D,2EAA2E;QAC3E,0DAA0D;QAC1D,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAEpC,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC;CACF"}
|