corequery-gtfs 0.1.0 → 0.1.2

package/dist/departures/index.js

@@ -0,0 +1,2 @@
+export * from "./multifeed-departures-iterator.js";
+//# sourceMappingURL=index.js.map

package/dist/departures/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/departures/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC"}

package/dist/departures/multifeed-departures-iterator.d.ts

@@ -0,0 +1,20 @@
+import { DeparturesIterator, DeparturesIteratorResult } from "./departures-iterator.js";
+import type { GtfsScheduledTrip } from "../data/gtfs-scheduled-trip.js";
+import type { GtfsUpdatedTrip } from "../data/gtfs-updated-trip.js";
+import type { GtfsTripServicingMovement } from "../data/utils.js";
+import type { DeparturesSearchDirection } from "../corequery-types.js";
+export declare class MultifeedDeparturesIteratorResult extends DeparturesIteratorResult {
+    readonly feed: string;
+    constructor(feed: string, trip: GtfsScheduledTrip | GtfsUpdatedTrip, serviceDay: Temporal.PlainDate, instant: Temporal.Instant, movement: GtfsTripServicingMovement);
+    static from(feed: string, result: DeparturesIteratorResult): MultifeedDeparturesIteratorResult;
+}
+export declare class MultifeedDeparturesIterator {
+    private readonly _iterators;
+    private _zipper;
+    constructor(_iterators: Map<DeparturesIterator, string>);
+    static build(config: Record<string, DeparturesIterator>): MultifeedDeparturesIterator;
+    set(instant: Temporal.Instant, direction: DeparturesSearchDirection): void;
+    peek(): MultifeedDeparturesIteratorResult | null;
+    take(): MultifeedDeparturesIteratorResult;
+    private _wrap;
+}

package/dist/departures/multifeed-departures-iterator.js

@@ -0,0 +1,52 @@
+import { DeparturesIterator, DeparturesIteratorResult, } from "./departures-iterator.js";
+import { ZipperDeparturesIterator } from "./zipper-departures-iterator.js";
+// TODO: [DS] Delete this. We're gonna combine feeds at the corequery departure
+// iterator level, not within the GTFS ecosystem.
+export class MultifeedDeparturesIteratorResult extends DeparturesIteratorResult {
+    feed;
+    constructor(feed, trip, serviceDay, instant, movement) {
+        super(trip, serviceDay, instant, movement);
+        this.feed = feed;
+    }
+    static from(feed, result) {
+        return new MultifeedDeparturesIteratorResult(feed, result.trip, result.serviceDay, result.instant, result.movement);
+    }
+}
+export class MultifeedDeparturesIterator {
+    _iterators;
+    _zipper;
+    constructor(_iterators) {
+        this._iterators = _iterators;
+        this._zipper = new ZipperDeparturesIterator(Array.from(_iterators.keys()));
+    }
+    static build(config) {
+        const iterators = new Map();
+        for (const [feed, iterator] of Object.entries(config)) {
+            iterators.set(iterator, feed);
+        }
+        return new MultifeedDeparturesIterator(iterators);
+    }
+    set(instant, direction) {
+        this._zipper.set(instant, direction);
+    }
+    peek() {
+        const result = this._zipper.peek();
+        const iterator = this._zipper.peekAtIterator();
+        if (result == null || iterator == null)
+            return null;
+        return this._wrap(result, iterator);
+    }
+    take() {
+        const iterator = this._zipper.peekAtIterator();
+        if (iterator == null)
+            throw new Error("Nothing to take.");
+        return this._wrap(this._zipper.take(), iterator);
+    }
+    _wrap(result, iterator) {
+        const feed = this._iterators.get(iterator);
+        if (feed == null)
+            throw new Error("Unrecognized iterator.");
+        return MultifeedDeparturesIteratorResult.from(feed, result);
+    }
+}
+//# sourceMappingURL=multifeed-departures-iterator.js.map

package/dist/departures/multifeed-departures-iterator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multifeed-departures-iterator.js","sourceRoot":"","sources":["../../src/departures/multifeed-departures-iterator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,+EAA+E;AAC/E,iDAAiD;AAEjD,MAAM,OAAO,iCAAkC,SAAQ,wBAAwB;IAElE;IADX,YACW,IAAY,EACrB,IAAyC,EACzC,UAA8B,EAC9B,OAAyB,EACzB,QAAmC;QAEnC,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QANlC,SAAI,GAAJ,IAAI,CAAQ;IAOvB,CAAC;IAED,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,MAAgC;QAEhC,OAAO,IAAI,iCAAiC,CAC1C,IAAI,EACJ,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,QAAQ,CAChB,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,2BAA2B;IAGT;IAFrB,OAAO,CAA2B;IAE1C,YAA6B,UAA2C;QAA3C,eAAU,GAAV,UAAU,CAAiC;QACtE,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,CAAC,KAAK,CACV,MAA0C;QAE1C,MAAM,SAAS,GAAG,IAAI,GAAG,EAA8B,CAAC;QACxD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,IAAI,2BAA2B,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,OAAyB,EAAE,SAAoC;QACjE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC/C,IAAI,MAAM,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAEpD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,IAAI;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC/C,IAAI,QAAQ,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CACX,MAAgC,EAChC,QAA4B;QAE5B,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,IAAI,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAE5D,OAAO,iCAAiC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;CACF"}

package/dist/departures/realtime-departures-block-iterator.d.ts

@@ -0,0 +1,12 @@
+import { DeparturesIteratorResult } from "./departures-iterator.js";
+import { RealtimeDeparturesBlock, type RealtimeDeparturesBlockEntry } from "./realtime-departures-block.js";
+import type { GtfsRealtimeData } from "../data/gtfs-realtime-data.js";
+import { DeparturesBlockIterator } from "./departures-block-iterator.js";
+export declare class RealtimeDeparturesBlockIterator extends DeparturesBlockIterator<RealtimeDeparturesBlock, RealtimeDeparturesBlockEntry> {
+    private readonly _realtimeData;
+    constructor(block: RealtimeDeparturesBlock, _realtimeData: GtfsRealtimeData);
+    static tryBuild(stopId: number, realtimeData: GtfsRealtimeData): RealtimeDeparturesBlockIterator | null;
+    protected _convertEntryToResult(entry: RealtimeDeparturesBlockEntry): DeparturesIteratorResult;
+    protected _shouldSkipEntry(entry: RealtimeDeparturesBlockEntry): boolean;
+    private _isTripCancelled;
+}

package/dist/departures/realtime-departures-block-iterator.js

@@ -0,0 +1,38 @@
+import { DeparturesIteratorResult } from "./departures-iterator.js";
+import { RealtimeDeparturesBlock, } from "./realtime-departures-block.js";
+import { DeparturesBlockIterator } from "./departures-block-iterator.js";
+export class RealtimeDeparturesBlockIterator extends DeparturesBlockIterator {
+    _realtimeData;
+    constructor(block, _realtimeData) {
+        super(block, block.entries);
+        this._realtimeData = _realtimeData;
+    }
+    static tryBuild(stopId, realtimeData) {
+        const block = RealtimeDeparturesBlock.tryBuild(stopId, realtimeData);
+        if (block == null)
+            return null;
+        return new RealtimeDeparturesBlockIterator(block, realtimeData);
+    }
+    _convertEntryToResult(entry) {
+        return new DeparturesIteratorResult(entry.trip, entry.trip.serviceDay, entry.instant, entry.movement);
+    }
+    _shouldSkipEntry(entry) {
+        const { movement, trip } = entry;
+        // Even users not filtering arrivals won't be interested to see the same
+        // trip listed twice at stations like Flinders Street or Town Hall, once for
+        // the arrival and then again for the departure of the continuing trip. We
+        // just need to be sure the continuing trip is actually running!
+        const isArrivalWhichContinues = movement.type === "terminating" &&
+            trip.scheduledTrip.nextTrip != null &&
+            trip.scheduledTrip.nextTrip.calendar.occursOn(trip.serviceDay) &&
+            !this._isTripCancelled(trip.scheduledTrip.nextTrip.gtfsTripId, entry.trip.serviceDay);
+        if (isArrivalWhichContinues)
+            return true;
+        return false;
+    }
+    _isTripCancelled(tripId, serviceDay) {
+        const realtimeTrip = this._realtimeData.getForScheduledTrip(tripId, serviceDay);
+        return realtimeTrip?.isCancelled ?? false;
+    }
+}
+//# sourceMappingURL=realtime-departures-block-iterator.js.map

package/dist/departures/realtime-departures-block-iterator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"realtime-departures-block-iterator.js","sourceRoot":"","sources":["../../src/departures/realtime-departures-block-iterator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EACL,uBAAuB,GAExB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,MAAM,OAAO,+BAAgC,SAAQ,uBAGpD;IAGoB;IAFnB,YACE,KAA8B,EACb,aAA+B;QAEhD,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAFX,kBAAa,GAAb,aAAa,CAAkB;IAGlD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,MAAc,EAAE,YAA8B;QAC5D,MAAM,KAAK,GAAG,uBAAuB,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACrE,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAE/B,OAAO,IAAI,+BAA+B,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAClE,CAAC;IAEkB,qBAAqB,CACtC,KAAmC;QAEnC,OAAO,IAAI,wBAAwB,CACjC,KAAK,CAAC,IAAI,EACV,KAAK,CAAC,IAAI,CAAC,UAAU,EACrB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,QAAQ,CACf,CAAC;IACJ,CAAC;IAEkB,gBAAgB,CACjC,KAAmC;QAEnC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QAEjC,wEAAwE;QACxE,4EAA4E;QAC5E,0EAA0E;QAC1E,gEAAgE;QAChE,MAAM,uBAAuB,GAC3B,QAAQ,CAAC,IAAI,KAAK,aAAa;YAC/B,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,IAAI;YACnC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9D,CAAC,IAAI,CAAC,gBAAgB,CACpB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,EACtC,KAAK,CAAC,IAAI,CAAC,UAAU,CACtB,CAAC;QACJ,IAAI,uBAAuB;YAAE,OAAO,IAAI,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,gBAAgB,CACtB,MAAc,EACd,UAA8B;QAE9B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CACzD,MAAM,EACN,UAAU,CACX,CAAC;QACF,OAAO,YAAY,EAAE,WAAW,IAAI,KAAK,CAAC;IAC5C,CAAC;CACF"}

package/dist/departures/realtime-departures-block.d.ts

@@ -0,0 +1,16 @@
+import type { GtfsRealtimeData } from "../data/gtfs-realtime-data.js";
+import type { GtfsUpdatedTripServicingMovement } from "../data/gtfs-updated-trip-movements.js";
+import type { GtfsUpdatedTrip } from "../data/gtfs-updated-trip.js";
+import { DeparturesBlock } from "./departures-block.js";
+export type RealtimeDeparturesBlockEntry = {
+    readonly trip: GtfsUpdatedTrip;
+    readonly instant: Temporal.Instant;
+    readonly movement: GtfsUpdatedTripServicingMovement;
+};
+export declare class RealtimeDeparturesBlock extends DeparturesBlock {
+    readonly entries: readonly RealtimeDeparturesBlockEntry[];
+    private constructor();
+    static tryBuild(stopId: number, realtimeData: GtfsRealtimeData): RealtimeDeparturesBlock | null;
+    getIterationIndexOfNextFrom(instant: Temporal.Instant): number;
+    getIterationIndexOfPreviousFrom(instant: Temporal.Instant): number;
+}

package/dist/departures/realtime-departures-block.js

@@ -0,0 +1,43 @@
+import { itsOk } from "@dan-schel/js-utils";
+import { DeparturesBlock } from "./departures-block.js";
+export class RealtimeDeparturesBlock extends DeparturesBlock {
+    entries;
+    constructor(entries, earliestDepartureInstant, latestDepartureInstant) {
+        super(earliestDepartureInstant, latestDepartureInstant);
+        this.entries = entries;
+    }
+    static tryBuild(stopId, 
+    // No point using an index for the realtime data, since it can change every
+    // 30 seconds, so you're unlikely to re-use it across queries.
+    realtimeData) {
+        const movements = [];
+        for (const trip of realtimeData.allTrips()) {
+            for (const movement of trip.movements) {
+                if (!movement.isServicing)
+                    continue;
+                if (movement.stopId !== stopId)
+                    continue;
+                movements.push({
+                    trip,
+                    instant: movement.timeRelevantToDeparturesAlgorithm,
+                    movement,
+                });
+            }
+        }
+        if (movements.length === 0)
+            return null;
+        movements.sort((a, b) => Temporal.Instant.compare(a.instant, b.instant));
+        const earliestDepInstant = itsOk(movements[0]).instant;
+        const latestDepInstant = itsOk(movements[movements.length - 1]).instant;
+        return new RealtimeDeparturesBlock(movements, earliestDepInstant, latestDepInstant);
+    }
+    getIterationIndexOfNextFrom(instant) {
+        const result = this.entries.findIndex((m) => Temporal.Instant.compare(m.instant, instant) >= 0);
+        return result !== -1 ? result : this.entries.length;
+    }
+    getIterationIndexOfPreviousFrom(instant) {
+        // No need to handle -1, because we'd want to return -1 in that case anyway!
+        return this.entries.findLastIndex((m) => Temporal.Instant.compare(m.instant, instant) <= 0);
+    }
+}
+//# sourceMappingURL=realtime-departures-block.js.map

package/dist/departures/realtime-departures-block.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"realtime-departures-block.js","sourceRoot":"","sources":["../../src/departures/realtime-departures-block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI5C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAQxD,MAAM,OAAO,uBAAwB,SAAQ,eAAe;IAE/C;IADX,YACW,OAAgD,EACzD,wBAA0C,EAC1C,sBAAwC;QAExC,KAAK,CAAC,wBAAwB,EAAE,sBAAsB,CAAC,CAAC;QAJ/C,YAAO,GAAP,OAAO,CAAyC;IAK3D,CAAC;IAED,MAAM,CAAC,QAAQ,CACb,MAAc;IAEd,2EAA2E;IAC3E,8DAA8D;IAC9D,YAA8B;QAE9B,MAAM,SAAS,GAAmC,EAAE,CAAC;QACrD,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACtC,IAAI,CAAC,QAAQ,CAAC,WAAW;oBAAE,SAAS;gBACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM;oBAAE,SAAS;gBAEzC,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI;oBACJ,OAAO,EAAE,QAAQ,CAAC,iCAAiC;oBACnD,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAExC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAEzE,MAAM,kBAAkB,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACvD,MAAM,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAExE,OAAO,IAAI,uBAAuB,CAChC,SAAS,EACT,kBAAkB,EAClB,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAEQ,2BAA2B,CAAC,OAAyB;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CACzD,CAAC;QACF,OAAO,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IACtD,CAAC;IAEQ,+BAA+B,CAAC,OAAyB;QAChE,4EAA4E;QAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CACzD,CAAC;IACJ,CAAC;CACF"}

package/dist/departures/scheduled-departures-block-iterator.d.ts

@@ -0,0 +1,12 @@
+import type { ScheduledDeparturesBlock } from "./scheduled-departures-block.js";
+import { DeparturesIteratorResult } from "./departures-iterator.js";
+import type { GtfsRealtimeData } from "../data/gtfs-realtime-data.js";
+import { DeparturesBlockIterator } from "./departures-block-iterator.js";
+import type { GtfsScheduledMovementsIndexEntry } from "./gtfs-scheduled-movements-index.js";
+export declare class ScheduledDeparturesBlockIterator extends DeparturesBlockIterator<ScheduledDeparturesBlock, GtfsScheduledMovementsIndexEntry> {
+    private readonly _realtimeData;
+    constructor(block: ScheduledDeparturesBlock, _realtimeData: GtfsRealtimeData);
+    protected _convertEntryToResult(entry: GtfsScheduledMovementsIndexEntry): DeparturesIteratorResult;
+    protected _shouldSkipEntry(entry: GtfsScheduledMovementsIndexEntry): boolean;
+    private _isTripCancelled;
+}

package/dist/departures/scheduled-departures-block-iterator.js

@@ -0,0 +1,55 @@
+import { DeparturesIteratorResult } from "./departures-iterator.js";
+import { DeparturesBlockIterator } from "./departures-block-iterator.js";
+export class ScheduledDeparturesBlockIterator extends DeparturesBlockIterator {
+    _realtimeData;
+    constructor(block, _realtimeData) {
+        super(block, block.allMovementsAtStop);
+        this._realtimeData = _realtimeData;
+    }
+    _convertEntryToResult(entry) {
+        return new DeparturesIteratorResult(entry.trip, this.block.serviceDay, entry.time.toInstant(this.block.serviceDay, this.block.timezone), entry.movement);
+    }
+    _shouldSkipEntry(entry) {
+        // A scheduled departures block has all movements for a given stop, not just
+        // the ones that occur today!
+        const doesntRunToday = !entry.trip.calendar.occursOn(this.block.serviceDay);
+        if (doesntRunToday)
+            return true;
+        // Trips with realtime data will be supplied by the realtime departures
+        // block, so we don't want to show duplicate entries by also showing them
+        // from the scheduled departures block (at the outdated departure time/order
+        // too!).
+        const tripId = entry.trip.gtfsTripId;
+        const realtimeTrip = this._realtimeData.getForScheduledTrip(tripId, this.block.serviceDay);
+        const isOverriddenByRealtimeTrip = realtimeTrip != null;
+        if (isOverriddenByRealtimeTrip)
+            return true;
+        // Even users not filtering arrivals won't be interested to see the same
+        // trip listed twice at stations like Flinders Street or Town Hall, once for
+        // the arrival and then again for the departure of the continuing trip. We
+        // just need to be sure the continuing trip is actually running!
+        //
+        // TODO: Realtime trips which connect to other trips must cause those
+        // scheduled trips to become realtime trips too, and realtime trips need to
+        // have their own `nextTrip` and `prevTrip` properties, otherwise fetching
+        // `nextTrip` here can lead to outdated info (the next trip might have been
+        // altered and no longer connects with this one). Alternatively, having
+        // `nextTrip` and `prevTrip` was a mistake, and we just only have trip IDs
+        // in their place, or maybe an entirely separate list of transfers which
+        // lives outside the trip (and supports other future transfer types).
+        //
+        // TODO: Wherever this logic ends up living, make sure it's tested.
+        const isArrivalWhichContinues = entry.movement.type === "terminating" &&
+            entry.trip.nextTrip != null &&
+            entry.trip.nextTrip.calendar.occursOn(this.block.serviceDay) &&
+            !this._isTripCancelled(entry.trip.nextTrip.gtfsTripId);
+        if (isArrivalWhichContinues)
+            return true;
+        return false;
+    }
+    _isTripCancelled(tripId) {
+        const realtimeTrip = this._realtimeData.getForScheduledTrip(tripId, this.block.serviceDay);
+        return realtimeTrip?.isCancelled ?? false;
+    }
+}
+//# sourceMappingURL=scheduled-departures-block-iterator.js.map

package/dist/departures/scheduled-departures-block-iterator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scheduled-departures-block-iterator.js","sourceRoot":"","sources":["../../src/departures/scheduled-departures-block-iterator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGzE,MAAM,OAAO,gCAAiC,SAAQ,uBAGrD;IAGoB;IAFnB,YACE,KAA+B,EACd,aAA+B;QAEhD,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAFtB,kBAAa,GAAb,aAAa,CAAkB;IAGlD,CAAC;IAEkB,qBAAqB,CACtC,KAAuC;QAEvC,OAAO,IAAI,wBAAwB,CACjC,KAAK,CAAC,IAAI,EACV,IAAI,CAAC,KAAK,CAAC,UAAU,EACrB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAChE,KAAK,CAAC,QAAQ,CACf,CAAC;IACJ,CAAC;IAEkB,gBAAgB,CACjC,KAAuC;QAEvC,4EAA4E;QAC5E,6BAA6B;QAC7B,MAAM,cAAc,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC5E,IAAI,cAAc;YAAE,OAAO,IAAI,CAAC;QAEhC,uEAAuE;QACvE,yEAAyE;QACzE,4EAA4E;QAC5E,SAAS;QACT,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CACzD,MAAM,EACN,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;QACF,MAAM,0BAA0B,GAAG,YAAY,IAAI,IAAI,CAAC;QACxD,IAAI,0BAA0B;YAAE,OAAO,IAAI,CAAC;QAE5C,wEAAwE;QACxE,4EAA4E;QAC5E,0EAA0E;QAC1E,gEAAgE;QAChE,EAAE;QACF,qEAAqE;QACrE,2EAA2E;QAC3E,0EAA0E;QAC1E,2EAA2E;QAC3E,uEAAuE;QACvE,0EAA0E;QAC1E,wEAAwE;QACxE,qEAAqE;QACrE,EAAE;QACF,mEAAmE;QACnE,MAAM,uBAAuB,GAC3B,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,aAAa;YACrC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI;YAC3B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YAC5D,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,uBAAuB;YAAE,OAAO,IAAI,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,gBAAgB,CAAC,MAAc;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CACzD,MAAM,EACN,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;QACF,OAAO,YAAY,EAAE,WAAW,IAAI,KAAK,CAAC;IAC5C,CAAC;CACF"}

package/dist/departures/scheduled-departures-block.d.ts

@@ -0,0 +1,18 @@
+import { DeparturesBlock } from "./departures-block.js";
+import { GtfsStopTime } from "../data/gtfs-stop-time.js";
+import type { GtfsScheduledMovementsIndexEntry } from "./gtfs-scheduled-movements-index.js";
+export declare class ScheduledDeparturesBlock extends DeparturesBlock {
+    readonly allMovementsAtStop: readonly GtfsScheduledMovementsIndexEntry[];
+    readonly serviceDay: Temporal.PlainDate;
+    readonly timezone: string;
+    constructor(allMovementsAtStop: readonly GtfsScheduledMovementsIndexEntry[], serviceDay: Temporal.PlainDate, earliestDepartureInstant: Temporal.Instant, latestDepartureInstant: Temporal.Instant, timezone: string);
+    static build(movements: readonly GtfsScheduledMovementsIndexEntry[], serviceDay: Temporal.PlainDate, timezone: string): ScheduledDeparturesBlock;
+    /**
+     * Returns the GtfsStopTime for the given instant, relative to the service day
+     * (and for the timezone) of this block.
+     */
+    toGtfsStopTime(time: Temporal.Instant): GtfsStopTime;
+    getIterationIndexOfNextFrom(instant: Temporal.Instant): number;
+    getIterationIndexOfPreviousFrom(instant: Temporal.Instant): number;
+    isSameServiceDay(other: ScheduledDeparturesBlock): boolean;
+}

package/dist/departures/scheduled-departures-block.js

@@ -0,0 +1,54 @@
+import { itsOk } from "@dan-schel/js-utils";
+import { DeparturesBlock } from "./departures-block.js";
+import { GtfsStopTime } from "../data/gtfs-stop-time.js";
+export class ScheduledDeparturesBlock extends DeparturesBlock {
+    allMovementsAtStop;
+    serviceDay;
+    timezone;
+    constructor(
+    // Note that we pass ALL movements for this stop into the block, not just
+    // ones which occur on this service day. That filtering is done at the
+    // `ScheduledDeparturesBlockIterator` level instead (by skipping over
+    // values when we reach them in the iteration), and that way we avoid
+    // doing a bunch of computation upfront for each movement at the stop here
+    // (for the whole day), which might be useless if we're at a big stop like
+    // Southern Cross with thousands of movements and we end up only iterating
+    // through of them.
+    allMovementsAtStop, serviceDay, earliestDepartureInstant, latestDepartureInstant, timezone) {
+        super(earliestDepartureInstant, latestDepartureInstant);
+        this.allMovementsAtStop = allMovementsAtStop;
+        this.serviceDay = serviceDay;
+        this.timezone = timezone;
+    }
+    static build(movements, serviceDay, timezone) {
+        if (movements.length === 0)
+            throw new Error("Movements cannot be empty");
+        const firstEntry = itsOk(movements[0]);
+        const lastEntry = itsOk(movements[movements.length - 1]);
+        return new ScheduledDeparturesBlock(movements, serviceDay, firstEntry.time.toInstant(serviceDay, timezone), lastEntry.time.toInstant(serviceDay, timezone), timezone);
+    }
+    /**
+     * Returns the GtfsStopTime for the given instant, relative to the service day
+     * (and for the timezone) of this block.
+     */
+    toGtfsStopTime(time) {
+        const midnight = GtfsStopTime.fromSecondsSinceMidnight(0);
+        const midnightInstant = midnight.toInstant(this.serviceDay, this.timezone);
+        const secondsSinceMidnight = time.since(midnightInstant).total("seconds");
+        return GtfsStopTime.fromSecondsSinceMidnight(secondsSinceMidnight);
+    }
+    getIterationIndexOfNextFrom(instant) {
+        const time = this.toGtfsStopTime(instant);
+        const result = this.allMovementsAtStop.findIndex((m) => m.time.isAfterOrEqual(time));
+        return result !== -1 ? result : this.allMovementsAtStop.length;
+    }
+    getIterationIndexOfPreviousFrom(instant) {
+        const time = this.toGtfsStopTime(instant);
+        // No need to handle -1, because we'd want to return -1 in that case anyway!
+        return this.allMovementsAtStop.findLastIndex((m) => m.time.isBeforeOrEqual(time));
+    }
+    isSameServiceDay(other) {
+        return Temporal.PlainDate.compare(this.serviceDay, other.serviceDay) === 0;
+    }
+}
+//# sourceMappingURL=scheduled-departures-block.js.map

package/dist/departures/scheduled-departures-block.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scheduled-departures-block.js","sourceRoot":"","sources":["../../src/departures/scheduled-departures-block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,MAAM,OAAO,wBAAyB,SAAQ,eAAe;IAUhD;IAEA;IAGA;IAdX;IACE,yEAAyE;IACzE,sEAAsE;IACtE,qEAAqE;IACrE,qEAAqE;IACrE,0EAA0E;IAC1E,0EAA0E;IAC1E,0EAA0E;IAC1E,mBAAmB;IACV,kBAA+D,EAE/D,UAA8B,EACvC,wBAA0C,EAC1C,sBAAwC,EAC/B,QAAgB;QAEzB,KAAK,CAAC,wBAAwB,EAAE,sBAAsB,CAAC,CAAC;QAP/C,uBAAkB,GAAlB,kBAAkB,CAA6C;QAE/D,eAAU,GAAV,UAAU,CAAoB;QAG9B,aAAQ,GAAR,QAAQ,CAAQ;IAG3B,CAAC;IAED,MAAM,CAAC,KAAK,CACV,SAAsD,EACtD,UAA8B,EAC9B,QAAgB;QAEhB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAEzD,OAAO,IAAI,wBAAwB,CACjC,SAAS,EACT,UAAU,EACV,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,EAC/C,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,EAC9C,QAAQ,CACT,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,IAAsB;QACnC,MAAM,QAAQ,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3E,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC1E,OAAO,YAAY,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,CAAC;IACrE,CAAC;IAEQ,2BAA2B,CAAC,OAAyB;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CACrD,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAC5B,CAAC;QAEF,OAAO,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;IACjE,CAAC;IAEQ,+BAA+B,CAAC,OAAyB;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE1C,4EAA4E;QAC5E,OAAO,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CACjD,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAC7B,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,KAA+B;QAC9C,OAAO,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC7E,CAAC;CACF"}

package/dist/departures/scheduled-departures-blocks-builder.d.ts

@@ -0,0 +1,20 @@
+import type { BoundedInstantRange } from "../data/bounded-instant-range.js";
+import type { GtfsScheduledMovementsIndex, GtfsScheduledMovementsIndexEntry } from "./gtfs-scheduled-movements-index.js";
+import { ScheduledDeparturesBlock } from "./scheduled-departures-block.js";
+import type { PlainDateRange } from "../data/plain-date-range.js";
+import type { TimezoneData } from "../config/timezone-data.js";
+export declare class ScheduledDeparturesBlocksBuilder {
+    private readonly _movements;
+    private readonly _timezoneData;
+    private readonly _rangeEncompassingAllCalendars;
+    /** If given, all movements are guaranteed to occur at/after this time. */
+    readonly earliestPossibleMovementInstant: Temporal.Instant | null;
+    /** If given, all movements are guaranteed to occur at/before this time. */
+    readonly latestPossibleMovementInstant: Temporal.Instant | null;
+    constructor(_movements: readonly GtfsScheduledMovementsIndexEntry[], _timezoneData: TimezoneData, _rangeEncompassingAllCalendars: PlainDateRange);
+    static tryBuild(stopId: number, scheduledMovementsIndex: GtfsScheduledMovementsIndex, timezoneData: TimezoneData): ScheduledDeparturesBlocksBuilder | null;
+    hasMoreBefore(instant: Temporal.Instant): boolean;
+    hasMoreAfter(instant: Temporal.Instant): boolean;
+    allWithinTimeRange(range: BoundedInstantRange): ScheduledDeparturesBlock[];
+    private _splitDateAndSecondOfDayUtc;
+}

package/dist/departures/scheduled-departures-blocks-builder.js

@@ -0,0 +1,222 @@
+import { itsOk } from "@dan-schel/js-utils";
+import { ScheduledDeparturesBlock } from "./scheduled-departures-block.js";
+export class ScheduledDeparturesBlocksBuilder {
+    _movements;
+    _timezoneData;
+    _rangeEncompassingAllCalendars;
+    /** If given, all movements are guaranteed to occur at/after this time. */
+    earliestPossibleMovementInstant;
+    /** If given, all movements are guaranteed to occur at/before this time. */
+    latestPossibleMovementInstant;
+    constructor(_movements, _timezoneData, _rangeEncompassingAllCalendars) {
+        this._movements = _movements;
+        this._timezoneData = _timezoneData;
+        this._rangeEncompassingAllCalendars = _rangeEncompassingAllCalendars;
+        if (_movements.length === 0)
+            throw new Error("No movements given.");
+        if (_rangeEncompassingAllCalendars.start != null) {
+            const firstMovement = itsOk(_movements[0]);
+            this.earliestPossibleMovementInstant = firstMovement.time.toInstant(_rangeEncompassingAllCalendars.start, _timezoneData.timezone);
+        }
+        else {
+            this.earliestPossibleMovementInstant = null;
+        }
+        if (_rangeEncompassingAllCalendars.end != null) {
+            const lastMovement = itsOk(_movements.at(-1));
+            this.latestPossibleMovementInstant = lastMovement.time.toInstant(_rangeEncompassingAllCalendars.end, _timezoneData.timezone);
+        }
+        else {
+            this.latestPossibleMovementInstant = null;
+        }
+    }
+    static tryBuild(stopId, scheduledMovementsIndex, timezoneData) {
+        const movements = scheduledMovementsIndex.getMovementsForStop(stopId);
+        const rangeEncompassingAllCalendars = scheduledMovementsIndex.getRangeEncompassingAllCalendarsForStop(stopId);
+        if (movements.length === 0 || rangeEncompassingAllCalendars == null) {
+            return null;
+        }
+        return new ScheduledDeparturesBlocksBuilder(movements, timezoneData, rangeEncompassingAllCalendars);
+    }
+    hasMoreBefore(instant) {
+        const earliest = this.earliestPossibleMovementInstant;
+        if (earliest == null)
+            return true;
+        return Temporal.Instant.compare(earliest, instant) < 0;
+    }
+    hasMoreAfter(instant) {
+        const latest = this.latestPossibleMovementInstant;
+        if (latest == null)
+            return true;
+        return Temporal.Instant.compare(latest, instant) > 0;
+    }
+    allWithinTimeRange(range) {
+        /* -------------------------------------------------------------------------
+    
+        Ok. Let's work this out!
+    
+        Suppose we're querying:
+        
+        Start   =>   12:00am Aug 2 AEST   (14:00 Aug 1 UTC)
+        End     =>   12:00am Aug 3 AEST   (14:00 Aug 2 UTC)
+    
+        We know our query starts at 14:00 UTC Aug 1. That means it's likely
+        the first service day we'll need to check is Aug 1, or possibly one day
+        before/after depending on the timezone conversions and earliest/latest
+        movement times, and likewise for the last service day. What we need to
+        figure out is how many days to add/subtract from each to make sure we've
+        definitely found all the scheduled blocks which overlap our query range.
+    
+        For this station, the first movement of the day is 5:18am, and last is
+        2:08am the next day. That means:
+        
+        Local time zone    =>   [05:18 +0d]   to   [02:08 +1d]
+        UTC, during AEST   =>   [19:18 -1d]   to   [16:08 +0d]   (-10hrs from local)
+        UTC, during AEDT   =>   [18:18 -1d]   to   [15:08 +0d]   (-11hrs from local)
+    
+        This means for a given service day, the movements occur always occur between
+        [18:18 -1d] and [16:08 +0d] in UTC, regardless of whether its AEST or AEDT.
+        (For our first pass, we're not gonna check if a certain service day is AEST
+        or AEDT.)
+        
+        Those day offsets mean for the service day of say, May 4, the first movement
+        could be at 18:18 UTC on May 3 at the earliest (which would translate to
+        5:18am AEDT on May 4, though May 4 uses AEST so this is actually being
+        conservative).
+    
+        We're gonna represent our times as seconds since [00:00 +0d]. It can be a
+        negative value if the time is earlier than [00:00 +0d].
+    
+        ------------------------------------------------------------------------- */
+        const maxViableOffsetSecs = this._timezoneData.maximumViableOffsetSeconds;
+        const minViableOffsetSecs = this._timezoneData.minimumViableOffsetSeconds;
+        const firstMvmt = itsOk(this._movements[0]);
+        const lastMvmt = itsOk(this._movements.at(-1));
+        const firstMvmtSecondsSinceMidnight = firstMvmt.time.secondsSinceMidnight;
+        const lastMvmtSecondsSinceMidnight = lastMvmt.time.secondsSinceMidnight;
+        // -20520 (represents [18:18 -1d] in seconds since [00:00 +0d])
+        const e = firstMvmtSecondsSinceMidnight - maxViableOffsetSecs;
+        // 58080 (represents [16:08 +0d] in seconds since [00:00 +0d])
+        const l = lastMvmtSecondsSinceMidnight - minViableOffsetSecs;
+        /* -------------------------------------------------------------------------
+    
+        The first service day which is relevant to our query will be the first one
+        which ENDS AFTER the start of our query range.
+    
+        Our query range starts from Aug 1 in UTC terms, at 14:00 UTC. This is
+        earlier than [16:08 +0d], so the service day for Aug 1 DOES fall within our
+        query by just over 2 hours, or 0.089 days.
+    
+        That number of days value actually tells us how many days to shift by. Let's
+        say instead that the last movement was [16:08 +1d]. That would mean the last
+        movement for Aug 1 would be at 16:08 UTC on Aug 2, or 1.089 days after the
+        beginning of our query. Because it's a full day after our query begins, we
+        therefore must know that the PREVIOUS service day's movements (Jul 31) must
+        end 0.089 days after our query begins (because we're accounting for the full
+        range of offsets possible for a service day already in our calculations
+        above, we can confidently say 0.089, not worrying about different days
+        having different offsets, we account for that at the very end), so the
+        earliest service day we'd need to check is Jul 31 (we shift back one day).
+    
+        Likewise if the last movement was just a few hours earlier at [13:08 +0d],
+        because that's before 14:00 UTC (a.k.a. -0.036 days after), we know that all
+        of Aug 1's movements have occured from this stop before our query start
+        time, so we can shift forward one day. We only shift by one day because the
+        last service is still within 24 hours of our query start time.
+    
+        In summary:
+        - If the service day ends 0.089 days after the query, shift by 0 days.
+        - If the service day ends 1.089 days after the query, shift by -1 days.
+        - If the service day ends -0.036 days after the query, shift by +1 days.
+    
+        i.e. We're shifting by `-floor(numOfDays)`.
+    
+        (Floor always moves values toward negative infinity, i.e. -0.05 -> -1)
+    
+        ------------------------------------------------------------------------- */
+        const startSplit = this._splitDateAndSecondOfDayUtc(range.start);
+        const startDate = startSplit.date; // Aug 1
+        const startSecondOfDayUtc = startSplit.secondOfDayUtc; // 50400 (14:00 UTC)
+        const daysAfterStart = (l - startSecondOfDayUtc) / (24 * 60 * 60); // 0.089
+        const daysToShiftStart = -Math.floor(daysAfterStart); // 0
+        const firstServiceDay = startDate.add({ days: daysToShiftStart }); // Aug 1
+        /* -------------------------------------------------------------------------
+    
+        And now we do the same to find the last service day in range, by looking for
+        the last service day which STARTS BEFORE the end of our query range.
+    
+        Our query range ends at 14:00 UTC on Aug 2. The first movement of the day is
+        [18:18 -1d], so 18:18 Aug 1, which is just under 20 hours before our query
+        end time, or 0.821 days.
+        
+        That means the last service day in range is Aug 2, because while Aug 2
+        starts before our query ends, it doesn't start OVER 24 HOURS before our
+        query ends, and therefore Aug 3 must start AFTER our query ends and is
+        therefore irrelevant.
+    
+        If the first movement of the day was [18:18 -2d], so 18:18 Jul 31, which is
+        1.821 days before 14:00 Aug 2, then at 14:00 Aug 2 we'd have started to
+        enter the service day of Aug 3, because it must've began at 18:18 Aug 1.
+        
+        And if the first movement of the day was [18:18 +0d], so 18:18 Aug 2, which
+        is a few hours after 14:00 Aug 2 (a.k.a. -0.036 days before), then Aug 2's
+        movements don't start until after the query end time, so we only need to go
+        up until Aug 1.
+    
+        This means:
+        - If the service days starts 0.821 days before the query, shift by 0 days.
+        - If the service days starts 1.821 days before the query, shift by +1 days.
+        - If the service days starts -0.036 days before the query, shift by -1 days.
+    
+        i.e. We're shifting by `floor(numOfDays)`.
+    
+        ------------------------------------------------------------------------- */
+        const endSplit = this._splitDateAndSecondOfDayUtc(range.end);
+        const endDate = endSplit.date; // Aug 2
+        const endSecondOfDayUtc = endSplit.secondOfDayUtc; // 50400 (14:00 UTC)
+        const daysBeforeEnd = (endSecondOfDayUtc - e) / (24 * 60 * 60); // 0.821
+        const daysToShiftEnd = Math.floor(daysBeforeEnd); // 0
+        const lastServiceDay = endDate.add({ days: daysToShiftEnd }); // Aug 2
+        /* -------------------------------------------------------------------------
+    
+        Now that we have our date range, we just need to construct the blocks.
+        
+        When the blocks are constructed, they will determine the Temporal.Instant of
+        the first and last movement in the block using the ACTUAL offset for that
+        service day (the offset at 12pm noon as per the GTFS spec).
+        
+        So far, we've been calculating everything assuming the worst case scenario
+        of minimum/maximum offsets, so there's a possibility now that when we
+        construct the block we were being conservative and the block doesn't
+        actually intersect our query range, hence the check before adding it to the
+        final result.
+    
+        (Because not every trip runs every day, and realtime trips are filtered out
+        of the scheduled blocks for the relevant day, this can be another
+        contributing factor to a block's time range being narrower once constructed
+        than what this algorithm assumes.)
+    
+        ------------------------------------------------------------------------- */
+        const blocks = [];
+        for (let date = firstServiceDay; Temporal.PlainDate.compare(date, lastServiceDay) <= 0; date = date.add({ days: 1 })) {
+            if (!this._rangeEncompassingAllCalendars.includes(date))
+                continue;
+            const tz = this._timezoneData.timezone;
+            const block = ScheduledDeparturesBlock.build(this._movements, date, tz);
+            // Use `touches`, not `intersects`, so that the first and last movements
+            // of a block are included if the query range starts or ends exactly at
+            // the same time as them.
+            if (block.instantRange.touches(range)) {
+                blocks.push(block);
+            }
+        }
+        return blocks;
+    }
+    _splitDateAndSecondOfDayUtc(instant) {
+        const startOfDayUtc = instant.toZonedDateTimeISO("UTC").startOfDay();
+        return {
+            date: startOfDayUtc.toPlainDate(),
+            secondOfDayUtc: instant.since(startOfDayUtc.toInstant()).total("seconds"),
+        };
+    }
+}
+//# sourceMappingURL=scheduled-departures-blocks-builder.js.map

package/dist/departures/scheduled-departures-blocks-builder.js.map

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