corequery-gtfs 0.1.4 → 0.2.1

package/dist/corequery-types.d.ts

@@ -1,2 +1,72 @@
+export type ServiceSource<CorequeryDepartureClass, CorequeryServiceClass> = {
+    readonly sourceId: string;
+    getService: (intrasourceId: string) => Promise<CorequeryServiceClass | null>;
+    getDeparturesIterator: (stopId: number, instant: Temporal.Instant, direction: DeparturesIterationDirection) => DeparturesIterator<CorequeryDepartureClass>;
+};
+export type DeparturesIterator<CorequeryDepartureClass> = {
+    peek: () => Promise<CorequeryDepartureClass | null>;
+    take: () => Promise<CorequeryDepartureClass>;
+};
+export type DepartureFields<CorequeryServiceClass> = {
+    readonly service: CorequeryServiceClass;
+    readonly movementIndex: number;
+};
+export type ServiceFields<CorequeryTagsClass, CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass, CorequeryServiceConnectionClass> = {
+    readonly sourceId: string;
+    readonly intrasourceId: string;
+    readonly lineIds: readonly number[];
+    readonly tags: CorequeryTagsClass;
+    readonly color: Color | null;
+    readonly liveDataType: ServiceLiveDataType;
+    readonly movements: readonly CorequeryServiceMovementClasses<CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass>[];
+    readonly isCancelled: boolean;
+    readonly connections: readonly CorequeryServiceConnectionClass[];
+};
+type CorequeryServiceMovementClasses<CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass> = CorequeryServiceOriginatingMovementClass | CorequeryServiceRegularMovementClass | CorequeryServiceTerminatingMovementClass | CorequeryServicePassingMovementClass;
+export type ServiceOriginatingMovementFields = {
+    readonly stopId: number;
+    readonly originalPositionId: number | null;
+    readonly updatedPositionId: number | null;
+    readonly departureTimeType: ServiceTimeType;
+    readonly departureTime: Temporal.Instant;
+    readonly formerDepartureTime: Temporal.Instant | null;
+};
+export type ServiceRegularMovementFields = {
+    readonly stopId: number;
+    readonly originalPositionId: number | null;
+    readonly updatedPositionId: number | null;
+    readonly arrivalTimeType: ServiceTimeType;
+    readonly arrivalTime: Temporal.Instant;
+    readonly formerArrivalTime: Temporal.Instant | null;
+    readonly departureTimeType: ServiceTimeType;
+    readonly departureTime: Temporal.Instant;
+    readonly formerDepartureTime: Temporal.Instant | null;
+    readonly picksUp: boolean;
+    readonly dropsOff: boolean;
+};
+export type ServiceTerminatingMovementFields = {
+    readonly stopId: number;
+    readonly originalPositionId: number | null;
+    readonly updatedPositionId: number | null;
+    readonly arrivalTimeType: ServiceTimeType;
+    readonly arrivalTime: Temporal.Instant;
+    readonly formerArrivalTime: Temporal.Instant | null;
+};
+export type ServicePassingMovementFields = {
+    readonly stopId: number;
+};
+export type ServiceConnectionFields = {
+    readonly type: ServiceConnectionType;
+    readonly direction: ServiceConnectionDirection;
+    readonly otherServiceSourceId: string;
+    readonly otherServiceIntrasourceId: string;
+    readonly movementIndex: number;
+    readonly otherServiceMovementIndex: number;
+};
+export type DeparturesIterationDirection = "forwards" | "backwards";
 export type Color = "red" | "yellow" | "green" | "cyan" | "blue" | "pink" | "purple" | "gray";
-export type DeparturesSearchDirection = "forwards" | "backwards";
+type ServiceLiveDataType = "scheduled" | "updated" | "added";
+type ServiceTimeType = "scheduled-time" | "provided-live-time" | "interpolated-live-time";
+type ServiceConnectionType = "entire-vehicle-forms-service" | "other";
+type ServiceConnectionDirection = "from-other" | "to-other" | "bidirectional";
+export {};

package/dist/corequery-types.js

@@ -1,3 +1,4 @@
-// Because we don't want to depend on CoreQuery.
+// Because we don't want to depend on CoreQuery. (Just because I'm scared of
+// npm's peer dependency system and don't understand how it works!)
 export {};
 //# sourceMappingURL=corequery-types.js.map

package/dist/corequery-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"corequery-types.js","sourceRoot":"","sources":["../src/corequery-types.ts"],"names":[],"mappings":"AAAA,gDAAgD"}
+{"version":3,"file":"corequery-types.js","sourceRoot":"","sources":["../src/corequery-types.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,mEAAmE"}

package/dist/corequeryify/corequery-intrasource-id.d.ts

@@ -0,0 +1,7 @@
+export declare class CorequeryIntrasourceId {
+    readonly gtfsTripId: string;
+    readonly serviceDay: Temporal.PlainDate;
+    constructor(gtfsTripId: string, serviceDay: Temporal.PlainDate);
+    toString(): string;
+    static parse(input: string): CorequeryIntrasourceId | null;
+}

package/dist/corequeryify/corequery-intrasource-id.js

@@ -0,0 +1,24 @@
+export class CorequeryIntrasourceId {
+    gtfsTripId;
+    serviceDay;
+    constructor(gtfsTripId, serviceDay) {
+        this.gtfsTripId = gtfsTripId;
+        this.serviceDay = serviceDay;
+    }
+    toString() {
+        return `${this.serviceDay.toString()}|${this.gtfsTripId}`;
+    }
+    static parse(input) {
+        const [serviceDayString, gtfsTripId] = input.split("|");
+        if (serviceDayString == null || gtfsTripId == null)
+            return null;
+        try {
+            const serviceDay = Temporal.PlainDate.from(serviceDayString);
+            return new CorequeryIntrasourceId(gtfsTripId, serviceDay);
+        }
+        catch {
+            return null;
+        }
+    }
+}
+//# sourceMappingURL=corequery-intrasource-id.js.map

package/dist/corequeryify/corequery-intrasource-id.js.map

@@ -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"}

package/dist/corequeryify/service-conversion-iterator.d.ts

@@ -0,0 +1,11 @@
+import type { DeparturesIterator } from "../departures/departures-iterator.js";
+import type { ServiceConverter } from "./service-converter.js";
+export declare class ServiceConversionIterator<CorequeryDepartureClass, CorequeryServiceClass, CorequeryTagsClass, CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass, CorequeryServiceConnectionClass> {
+    private readonly _iterator;
+    private readonly _converter;
+    private readonly _timezone;
+    private _convertedNextDeparture;
+    constructor(_iterator: DeparturesIterator, _converter: ServiceConverter<CorequeryDepartureClass, CorequeryServiceClass, CorequeryTagsClass, CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass, CorequeryServiceConnectionClass>, _timezone: string);
+    peek(): Promise<CorequeryDepartureClass | null>;
+    take(): Promise<CorequeryDepartureClass>;
+}

package/dist/corequeryify/service-conversion-iterator.js

@@ -0,0 +1,41 @@
+export class ServiceConversionIterator {
+    _iterator;
+    _converter;
+    _timezone;
+    _convertedNextDeparture;
+    constructor(
+    // TODO: There's two things called DeparturesIterator in this repo, which
+    // isn't ideal.
+    _iterator, _converter, 
+    // TODO: The need to pass around timezone here (and everywhere), I think
+    // hints at that it should be a property of the DeparturesIteratorResult.
+    _timezone) {
+        this._iterator = _iterator;
+        this._converter = _converter;
+        this._timezone = _timezone;
+        this._convertedNextDeparture = null;
+    }
+    peek() {
+        if (this._convertedNextDeparture != null) {
+            return Promise.resolve(this._convertedNextDeparture);
+        }
+        const value = this._iterator.peek();
+        if (value == null) {
+            return Promise.resolve(null);
+        }
+        const result = this._converter.convertDeparture(value, this._timezone);
+        this._convertedNextDeparture = result;
+        return Promise.resolve(result);
+    }
+    take() {
+        if (this._convertedNextDeparture != null) {
+            const result = this._convertedNextDeparture;
+            this._convertedNextDeparture = null;
+            return Promise.resolve(result);
+        }
+        const value = this._iterator.take();
+        const result = this._converter.convertDeparture(value, this._timezone);
+        return Promise.resolve(result);
+    }
+}
+//# sourceMappingURL=service-conversion-iterator.js.map

package/dist/corequeryify/service-conversion-iterator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-conversion-iterator.js","sourceRoot":"","sources":["../../src/corequeryify/service-conversion-iterator.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,yBAAyB;IAejB;IAEA;IAaA;IApBX,uBAAuB,CAAiC;IAEhE;IACE,yEAAyE;IACzE,eAAe;IACE,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,IAAI,IAAI,CAAC,uBAAuB,IAAI,IAAI,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,CAAC;YAC5C,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;YACpC,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CACF"}

package/dist/corequeryify/service-converter.d.ts

@@ -0,0 +1,32 @@
+import type { DepartureFields, ServiceFields, ServiceOriginatingMovementFields, ServicePassingMovementFields, ServiceRegularMovementFields, ServiceTerminatingMovementFields, ServiceConnectionFields } from "../corequery-types.js";
+import { GtfsScheduledTrip } from "../data/gtfs-scheduled-trip.js";
+import type { DeparturesIteratorResult } from "../departures/departures-iterator.js";
+import { GtfsUpdatedTrip } from "../data/gtfs-updated-trip.js";
+export type ServiceConverterFields<CorequeryDepartureClass, CorequeryServiceClass, CorequeryTagsClass, CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass, CorequeryServiceConnectionClass> = {
+    readonly sourceId: string;
+    buildDeparture: (fields: DepartureFields<CorequeryServiceClass>) => CorequeryDepartureClass;
+    buildService: (fields: ServiceFields<CorequeryTagsClass, CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass, CorequeryServiceConnectionClass>) => CorequeryServiceClass;
+    buildTags: (tags: Set<number>) => CorequeryTagsClass;
+    buildServiceOriginatingMovement: (fields: ServiceOriginatingMovementFields) => CorequeryServiceOriginatingMovementClass;
+    buildServiceRegularMovement: (fields: ServiceRegularMovementFields) => CorequeryServiceRegularMovementClass;
+    buildServiceTerminatingMovement: (fields: ServiceTerminatingMovementFields) => CorequeryServiceTerminatingMovementClass;
+    buildServicePassingMovement: (fields: ServicePassingMovementFields) => CorequeryServicePassingMovementClass;
+    buildServiceConnection: (fields: ServiceConnectionFields) => CorequeryServiceConnectionClass;
+};
+export declare class ServiceConverter<CorequeryDepartureClass, CorequeryServiceClass, CorequeryTagsClass, CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass, CorequeryServiceConnectionClass> {
+    private readonly _sourceId;
+    private readonly _buildDeparture;
+    private readonly _buildService;
+    private readonly _buildTags;
+    private readonly _buildServiceOriginatingMovement;
+    private readonly _buildServiceRegularMovement;
+    private readonly _buildServiceTerminatingMovement;
+    private readonly _buildServicePassingMovement;
+    private readonly _buildServiceConnection;
+    constructor(fields: ServiceConverterFields<CorequeryDepartureClass, CorequeryServiceClass, CorequeryTagsClass, CorequeryServiceOriginatingMovementClass, CorequeryServiceRegularMovementClass, CorequeryServiceTerminatingMovementClass, CorequeryServicePassingMovementClass, CorequeryServiceConnectionClass>);
+    convertDeparture(result: DeparturesIteratorResult, timezone: string): CorequeryDepartureClass;
+    convertScheduledTrip(trip: GtfsScheduledTrip, serviceDay: Temporal.PlainDate, timezone: string): CorequeryServiceClass;
+    convertUpdatedTrip(trip: GtfsUpdatedTrip): CorequeryServiceClass;
+    private _convertScheduledTripMovement;
+    private _convertUpdatedTripMovement;
+}

package/dist/corequeryify/service-converter.js

@@ -0,0 +1,206 @@
+import { assertNever } from "@dan-schel/js-utils";
+import { GtfsScheduledTrip } from "../data/gtfs-scheduled-trip.js";
+import { GtfsUpdatedTrip } from "../data/gtfs-updated-trip.js";
+import { CorequeryIntrasourceId } from "./corequery-intrasource-id.js";
+export class ServiceConverter {
+    _sourceId;
+    _buildDeparture;
+    _buildService;
+    _buildTags;
+    _buildServiceOriginatingMovement;
+    _buildServiceRegularMovement;
+    _buildServiceTerminatingMovement;
+    _buildServicePassingMovement;
+    _buildServiceConnection;
+    constructor(fields) {
+        this._sourceId = fields.sourceId;
+        this._buildDeparture = fields.buildDeparture;
+        this._buildService = fields.buildService;
+        this._buildTags = fields.buildTags;
+        this._buildServiceOriginatingMovement =
+            fields.buildServiceOriginatingMovement;
+        this._buildServiceRegularMovement = fields.buildServiceRegularMovement;
+        this._buildServiceTerminatingMovement =
+            fields.buildServiceTerminatingMovement;
+        this._buildServicePassingMovement = fields.buildServicePassingMovement;
+        this._buildServiceConnection = fields.buildServiceConnection;
+    }
+    convertDeparture(result, timezone) {
+        if (result.trip instanceof GtfsScheduledTrip) {
+            const service = this.convertScheduledTrip(result.trip, result.serviceDay, timezone);
+            return this._buildDeparture({
+                service,
+                movementIndex: result.movementIndex,
+            });
+        }
+        else if (result.trip instanceof GtfsUpdatedTrip) {
+            const service = this.convertUpdatedTrip(result.trip);
+            return this._buildDeparture({
+                service,
+                movementIndex: result.movementIndex,
+            });
+        }
+        else {
+            assertNever(result.trip);
+        }
+    }
+    convertScheduledTrip(trip, serviceDay, timezone) {
+        const id = new CorequeryIntrasourceId(trip.gtfsTripId, serviceDay);
+        return this._buildService({
+            sourceId: this._sourceId,
+            intrasourceId: id.toString(),
+            lineIds: trip.lineIds,
+            tags: this._buildTags(new Set(trip.serviceTags)),
+            color: trip.color,
+            liveDataType: "scheduled",
+            movements: trip.movements.map((m) => this._convertScheduledTripMovement(m, serviceDay, timezone)),
+            isCancelled: false,
+            // TODO: This is the part where we check if the connections are still
+            // running, though it'd be great if that wasn't the converter's job. Maybe
+            // we should pass in another param for `upheldConnections` or something.
+            // In the service source after we call GtfsFeed#getTrip maybe we should
+            // call a second GtfsFeed#getUpheldConnectionsForTrip method so that the
+            // GtfsFeed can decide looking at the schedule and realtime data together
+            // which connections are running, and then it can model that however it
+            // wants. (Probably remove the `nextTrip` and `previousTrip` properties
+            // from trips, and just store transfers in an array in the feed, or in the
+            // scheduled/realtime data?)
+            connections: [], // TODO: Not implemented!
+        });
+    }
+    convertUpdatedTrip(trip) {
+        const id = new CorequeryIntrasourceId(trip.gtfsTripId, trip.serviceDay);
+        return this._buildService({
+            sourceId: this._sourceId,
+            intrasourceId: id.toString(),
+            lineIds: trip.lineIds,
+            tags: this._buildTags(new Set(trip.serviceTags)),
+            color: trip.color,
+            liveDataType: "updated",
+            movements: trip.movements.map((m) => this._convertUpdatedTripMovement(m)),
+            isCancelled: trip.isCancelled,
+            connections: [], // TODO: Not implemented!
+        });
+    }
+    _convertScheduledTripMovement(movement, serviceDay, timezone) {
+        if (movement.type === "originating") {
+            return this._buildServiceOriginatingMovement({
+                stopId: movement.stopId,
+                originalPositionId: movement.positionId,
+                updatedPositionId: null,
+                departureTimeType: "scheduled-time",
+                departureTime: movement.departureTime.toInstant(serviceDay, timezone),
+                formerDepartureTime: null,
+            });
+        }
+        else if (movement.type === "regular") {
+            return this._buildServiceRegularMovement({
+                stopId: movement.stopId,
+                originalPositionId: movement.positionId,
+                updatedPositionId: null,
+                arrivalTimeType: "scheduled-time",
+                arrivalTime: movement.arrivalTime.toInstant(serviceDay, timezone),
+                formerArrivalTime: null,
+                departureTimeType: "scheduled-time",
+                departureTime: movement.departureTime.toInstant(serviceDay, timezone),
+                formerDepartureTime: null,
+                picksUp: movement.picksUp,
+                dropsOff: movement.dropsOff,
+            });
+        }
+        else if (movement.type === "terminating") {
+            return this._buildServiceTerminatingMovement({
+                stopId: movement.stopId,
+                originalPositionId: movement.positionId,
+                updatedPositionId: null,
+                arrivalTimeType: "scheduled-time",
+                arrivalTime: movement.arrivalTime.toInstant(serviceDay, timezone),
+                formerArrivalTime: null,
+            });
+        }
+        else if (movement.type === "passing") {
+            return this._buildServicePassingMovement({
+                stopId: movement.stopId,
+            });
+        }
+        else {
+            assertNever(movement);
+        }
+    }
+    _convertUpdatedTripMovement(movement) {
+        if (movement.type === "originating") {
+            return this._buildServiceOriginatingMovement({
+                stopId: movement.stopId,
+                originalPositionId: movement.originalPositionId,
+                updatedPositionId: movement.updatedPositionId,
+                // TODO: Probably move this logic into the GtfsUpdatedTripMovement
+                // classes themselves. I was hesitant at first because I didn't want
+                // them to be concerned with Corequery's data format, but given that
+                // this whole is meant to serve as a plugin to Corequery, it's probably
+                // ok. (And we already do it with `Color` anyway!)
+                //
+                // When we start doing interpolation, I'll forget to update here, and
+                // then the `departureTimeType` will be wrong!
+                //
+                // Note: If pushing things like `departureTimeType` into the
+                // GtfsUpdatedTripMovement classes, why draw the line there? Why not
+                // have a method on the movement classes to convert themselves into
+                // Corequery's data format? Genuinely, is there an argument to be made?
+                // Maybe the whole corequeryify folder should be removed?
+                departureTimeType: movement.realtimeDepartureTime !== null
+                    ? "provided-live-time"
+                    : "scheduled-time",
+                departureTime: movement.realtimeDepartureTime ?? movement.scheduledDepartureTime,
+                formerDepartureTime: movement.realtimeDepartureTime !== null
+                    ? movement.scheduledDepartureTime
+                    : null,
+            });
+        }
+        else if (movement.type === "regular") {
+            return this._buildServiceRegularMovement({
+                stopId: movement.stopId,
+                originalPositionId: movement.originalPositionId,
+                updatedPositionId: movement.updatedPositionId,
+                arrivalTimeType: movement.realtimeArrivalTime !== null
+                    ? "provided-live-time"
+                    : "scheduled-time",
+                arrivalTime: movement.realtimeArrivalTime ?? movement.scheduledArrivalTime,
+                formerArrivalTime: movement.realtimeArrivalTime !== null
+                    ? movement.scheduledArrivalTime
+                    : null,
+                departureTimeType: movement.realtimeDepartureTime !== null
+                    ? "provided-live-time"
+                    : "scheduled-time",
+                departureTime: movement.realtimeDepartureTime ?? movement.scheduledDepartureTime,
+                formerDepartureTime: movement.realtimeDepartureTime !== null
+                    ? movement.scheduledDepartureTime
+                    : null,
+                picksUp: movement.picksUp,
+                dropsOff: movement.dropsOff,
+            });
+        }
+        else if (movement.type === "terminating") {
+            return this._buildServiceTerminatingMovement({
+                stopId: movement.stopId,
+                originalPositionId: movement.originalPositionId,
+                updatedPositionId: movement.updatedPositionId,
+                arrivalTimeType: movement.realtimeArrivalTime !== null
+                    ? "provided-live-time"
+                    : "scheduled-time",
+                arrivalTime: movement.realtimeArrivalTime ?? movement.scheduledArrivalTime,
+                formerArrivalTime: movement.realtimeArrivalTime !== null
+                    ? movement.scheduledArrivalTime
+                    : null,
+            });
+        }
+        else if (movement.type === "passing") {
+            return this._buildServicePassingMovement({
+                stopId: movement.stopId,
+            });
+        }
+        else {
+            assertNever(movement);
+        }
+    }
+}
+//# sourceMappingURL=service-converter.js.map

package/dist/corequeryify/service-converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-converter.js","sourceRoot":"","sources":["../../src/corequeryify/service-converter.ts"],"names":[],"mappings":"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"}

package/dist/data/gtfs-feed.d.ts

@@ -3,6 +3,8 @@ import { GtfsScheduledMovementsIndex } from "../departures/gtfs-scheduled-moveme
 import { ZipperDeparturesIterator } from "../departures/zipper-departures-iterator.js";
 import type { GtfsRealtimeData } from "./gtfs-realtime-data.js";
 import type { GtfsScheduleData } from "./gtfs-schedule-data.js";
+import type { GtfsScheduledTrip } from "./gtfs-scheduled-trip.js";
+import type { GtfsUpdatedTrip } from "./gtfs-updated-trip.js";
 export declare class GtfsFeed {
     readonly corequeryDataSourceId: string;
     readonly scheduleData: GtfsScheduleData;
@@ -12,5 +14,6 @@ export declare class GtfsFeed {
     constructor(corequeryDataSourceId: string, scheduleData: GtfsScheduleData, realtimeData: GtfsRealtimeData, timezoneData: TimezoneData, scheduledMovementsIndex: GtfsScheduledMovementsIndex);
     static fromNewScheduleData(corequeryDataSourceId: string, scheduleData: GtfsScheduleData, realtimeData: GtfsRealtimeData, timezoneData: TimezoneData): GtfsFeed;
     withUpdatedRealtimeData(realtimeData: GtfsRealtimeData): GtfsFeed;
-    createCorequeryDepartureIterator(stopId: number): ZipperDeparturesIterator;
+    getTrip(gtfsTripId: string, serviceDay: Temporal.PlainDate): GtfsScheduledTrip | GtfsUpdatedTrip | null;
+    createDepartureIterator(stopId: number): ZipperDeparturesIterator;
 }

package/dist/data/gtfs-feed.js

@@ -20,13 +20,17 @@ export class GtfsFeed {
     withUpdatedRealtimeData(realtimeData) {
         return new GtfsFeed(this.corequeryDataSourceId, this.scheduleData, realtimeData, this.timezoneData, this.scheduledMovementsIndex);
     }
-    createCorequeryDepartureIterator(stopId) {
-        // TODO: Should be the corequery departure iterator (once the design of that
-        // is finalised).
-        //
-        // TODO: Maybe the MultifeedDeparturesIterator shouldn't operate on the GTFS
-        // level, but instead on CoreQuery departures? Why attach a subfeed ID, when
-        // we could just go straight to attaching the corequery data source ID?
+    getTrip(gtfsTripId, serviceDay) {
+        const realtimeTrip = this.realtimeData.getTrip(gtfsTripId, serviceDay);
+        if (realtimeTrip != null)
+            return realtimeTrip;
+        const scheduledTrip = this.scheduleData.getTrip(gtfsTripId);
+        if (scheduledTrip != null && scheduledTrip.calendar.occursOn(serviceDay)) {
+            return scheduledTrip;
+        }
+        return null;
+    }
+    createDepartureIterator(stopId) {
         return ZipperDeparturesIterator.forFeed(stopId, this.scheduledMovementsIndex, this.realtimeData, this.timezoneData);
     }
 }

package/dist/data/gtfs-feed.js.map

@@ -1 +1 @@
-{"version":3,"file":"gtfs-feed.js","sourceRoot":"","sources":["../../src/data/gtfs-feed.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iDAAiD,CAAC;AAC9F,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AAIvF,MAAM,OAAO,QAAQ;IAER;IACA;IACA;IACA;IACA;IALX,YACW,qBAA6B,EAC7B,YAA8B,EAC9B,YAA8B,EAC9B,YAA0B,EAC1B,uBAAoD;QAJpD,0BAAqB,GAArB,qBAAqB,CAAQ;QAC7B,iBAAY,GAAZ,YAAY,CAAkB;QAC9B,iBAAY,GAAZ,YAAY,CAAkB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,4BAAuB,GAAvB,uBAAuB,CAA6B;IAC5D,CAAC;IAEJ,MAAM,CAAC,mBAAmB,CACxB,qBAA6B,EAC7B,YAA8B,EAC9B,YAA8B,EAC9B,YAA0B;QAE1B,MAAM,uBAAuB,GAC3B,2BAA2B,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAElD,OAAO,IAAI,QAAQ,CACjB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,uBAAuB,CACxB,CAAC;IACJ,CAAC;IAED,uBAAuB,CAAC,YAA8B;QACpD,OAAO,IAAI,QAAQ,CACjB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,YAAY,EACjB,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,uBAAuB,CAC7B,CAAC;IACJ,CAAC;IAED,gCAAgC,CAAC,MAAc;QAC7C,4EAA4E;QAC5E,iBAAiB;QACjB,EAAE;QACF,4EAA4E;QAC5E,4EAA4E;QAC5E,uEAAuE;QACvE,OAAO,wBAAwB,CAAC,OAAO,CACrC,MAAM,EACN,IAAI,CAAC,uBAAuB,EAC5B,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CAClB,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"gtfs-feed.js","sourceRoot":"","sources":["../../src/data/gtfs-feed.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iDAAiD,CAAC;AAC9F,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AAMvF,MAAM,OAAO,QAAQ;IAER;IACA;IACA;IACA;IACA;IALX,YACW,qBAA6B,EAC7B,YAA8B,EAC9B,YAA8B,EAC9B,YAA0B,EAC1B,uBAAoD;QAJpD,0BAAqB,GAArB,qBAAqB,CAAQ;QAC7B,iBAAY,GAAZ,YAAY,CAAkB;QAC9B,iBAAY,GAAZ,YAAY,CAAkB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,4BAAuB,GAAvB,uBAAuB,CAA6B;IAC5D,CAAC;IAEJ,MAAM,CAAC,mBAAmB,CACxB,qBAA6B,EAC7B,YAA8B,EAC9B,YAA8B,EAC9B,YAA0B;QAE1B,MAAM,uBAAuB,GAC3B,2BAA2B,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAElD,OAAO,IAAI,QAAQ,CACjB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,uBAAuB,CACxB,CAAC;IACJ,CAAC;IAED,uBAAuB,CAAC,YAA8B;QACpD,OAAO,IAAI,QAAQ,CACjB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,YAAY,EACjB,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,uBAAuB,CAC7B,CAAC;IACJ,CAAC;IAED,OAAO,CACL,UAAkB,EAClB,UAA8B;QAE9B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACvE,IAAI,YAAY,IAAI,IAAI;YAAE,OAAO,YAAY,CAAC;QAE9C,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC5D,IAAI,aAAa,IAAI,IAAI,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACzE,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uBAAuB,CAAC,MAAc;QACpC,OAAO,wBAAwB,CAAC,OAAO,CACrC,MAAM,EACN,IAAI,CAAC,uBAAuB,EAC5B,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CAClB,CAAC;IACJ,CAAC;CACF"}

package/dist/data/gtfs-realtime-data.d.ts

@@ -5,5 +5,6 @@ export declare class GtfsRealtimeData {
     static readonly empty: GtfsRealtimeData;
     constructor(_updatedTrips: readonly GtfsUpdatedTrip[]);
     allTrips(): readonly GtfsUpdatedTrip[];
+    getTrip(gtfsTripId: string, serviceDay: Temporal.PlainDate): GtfsUpdatedTrip | null;
     getForScheduledTrip(gtfsTripId: string, serviceDay: Temporal.PlainDate): GtfsUpdatedTrip | null;
 }

package/dist/data/gtfs-realtime-data.js

@@ -10,6 +10,11 @@ export class GtfsRealtimeData {
     allTrips() {
         return this._updatedTrips;
     }
+    getTrip(gtfsTripId, serviceDay) {
+        // Right now all realtime trips are updated trips. When we have added trips
+        // in the future, then this needs to be modified to return those too.
+        return this.getForScheduledTrip(gtfsTripId, serviceDay);
+    }
     getForScheduledTrip(gtfsTripId, serviceDay) {
         const trip = this._tripsByScheduledTripId.get(gtfsTripId);
         if (trip == null || !trip.serviceDay.equals(serviceDay))

package/dist/data/gtfs-realtime-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"gtfs-realtime-data.js","sourceRoot":"","sources":["../../src/data/gtfs-realtime-data.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IAKE;IAJZ,uBAAuB,CAA+B;IAEvE,MAAM,CAAU,KAAK,GAAG,IAAI,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAEjD,YAA6B,aAAyC;QAAzC,kBAAa,GAAb,aAAa,CAA4B;QACpE,IAAI,CAAC,uBAAuB,GAAG,IAAI,GAAG,CACpC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CACnE,CAAC;IACJ,CAAC;IAED,sEAAsE;IACtE,QAAQ;QACN,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,mBAAmB,CACjB,UAAkB,EAClB,UAA8B;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC;YAAE,OAAO,IAAI,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC"}
+{"version":3,"file":"gtfs-realtime-data.js","sourceRoot":"","sources":["../../src/data/gtfs-realtime-data.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IAKE;IAJZ,uBAAuB,CAA+B;IAEvE,MAAM,CAAU,KAAK,GAAG,IAAI,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAEjD,YAA6B,aAAyC;QAAzC,kBAAa,GAAb,aAAa,CAA4B;QACpE,IAAI,CAAC,uBAAuB,GAAG,IAAI,GAAG,CACpC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CACnE,CAAC;IACJ,CAAC;IAED,sEAAsE;IACtE,QAAQ;QACN,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,UAAkB,EAAE,UAA8B;QACxD,2EAA2E;QAC3E,qEAAqE;QACrE,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC1D,CAAC;IAED,mBAAmB,CACjB,UAAkB,EAClB,UAA8B;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC;YAAE,OAAO,IAAI,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC"}

package/dist/data/gtfs-scheduled-trip.d.ts

@@ -29,6 +29,7 @@ export declare class GtfsScheduledTrip {
     get origination(): GtfsScheduledTripOriginatingMovement;
     get termination(): GtfsScheduledTripTerminatingMovement;
     get finalTermination(): GtfsScheduledTripTerminatingMovement;
+    requireMovementIndex(movement: GtfsScheduledTripMovement): number;
     static simple({ gtfsTripId, originStopId, originGtfsStopId, originationTime, terminusStopId, terminationTime, terminusGtfsStopId, }: {
         gtfsTripId: string;
         originStopId: number;

package/dist/data/gtfs-scheduled-trip.js

@@ -60,6 +60,12 @@ export class GtfsScheduledTrip {
             return this.termination;
         return this.nextTrip.finalTermination;
     }
+    requireMovementIndex(movement) {
+        const index = this.movements.indexOf(movement);
+        if (index === -1)
+            throw new Error("Movement not found in trip.");
+        return index;
+    }
     static simple({ gtfsTripId, originStopId, originGtfsStopId = `stop-${originStopId}`, originationTime, terminusStopId, terminationTime, terminusGtfsStopId = `stop-${terminusStopId}`, }) {
         return new GtfsScheduledTrip({
             gtfsTripId,

package/dist/data/gtfs-scheduled-trip.js.map

@@ -1 +1 @@
-{"version":3,"file":"gtfs-scheduled-trip.js","sourceRoot":"","sources":["../../src/data/gtfs-scheduled-trip.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gtfs-scheduled-trip.js","sourceRoot":"","sources":["../../src/data/gtfs-scheduled-trip.ts"],"names":[],"mappings":"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"}

package/dist/data/gtfs-stop-time.d.ts

@@ -28,7 +28,7 @@ export declare class GtfsStopTime {
     isAfter(other: GtfsStopTime): boolean;
     isAfterOrEqual(other: GtfsStopTime): boolean;
     toInstant(serviceDay: Temporal.PlainDate, timezone: string): Temporal.Instant;
-    asString(): string;
+    toString(): string;
     plus({ hours, minutes, seconds, }: {
         hours?: number;
         minutes?: number;

package/dist/data/gtfs-stop-time.js

@@ -71,7 +71,7 @@ export class GtfsStopTime {
         // 11am AEST becomes 1am UTC.
         return midnightUtc.add({ seconds: this.secondsSinceMidnight - offset });
     }
-    asString() {
+    toString() {
         const h = Math.floor(this.secondsSinceMidnight / 3600);
         const m = Math.floor((this.secondsSinceMidnight % 3600) / 60);
         const s = this.secondsSinceMidnight % 60;

package/dist/data/gtfs-updated-trip.d.ts

@@ -1,5 +1,6 @@
 import type { GtfsScheduledTrip } from "./gtfs-scheduled-trip.js";
 import type { GtfsUpdatedTripMovement, GtfsUpdatedTripOriginatingMovement, GtfsUpdatedTripTerminatingMovement } from "./gtfs-updated-trip-movements.js";
+import type { Color } from "../corequery-types.js";
 type GtfsUpdatedTripFields = {
     readonly scheduledTrip: GtfsScheduledTrip;
     readonly serviceDay: Temporal.PlainDate;
@@ -16,6 +17,10 @@ export declare class GtfsUpdatedTrip {
     get gtfsTripId(): string;
     get origination(): GtfsUpdatedTripOriginatingMovement;
     get termination(): GtfsUpdatedTripTerminatingMovement;
+    requireMovementIndex(movement: GtfsUpdatedTripMovement): number;
+    get lineIds(): readonly number[];
+    get serviceTags(): readonly number[];
+    get color(): Color | null;
     static unmodified(trip: GtfsScheduledTrip, serviceDay: Temporal.PlainDate, timezone: string): GtfsUpdatedTrip;
 }
 export {};