minotor 6.0.0 → 7.0.0

package/dist/timetable/route.d.ts

@@ -44,7 +44,7 @@ export declare class Route {
      * A binary array of stopIds in the route.
      * [stop1, stop2, stop3,...]
      */
-    private readonly stops;
+    readonly stops: Uint32Array;
     /**
      * A reverse mapping of each stop with their index in the route:
      * {
@@ -126,15 +126,6 @@ export declare class Route {
      * @returns The drop-off type at the specified stop and trip.
      */
     dropOffTypeAt(stopId: StopId, tripIndex: TripIndex): PickUpDropOffType;
-    /**
-     * Iterates over the stops in the route, starting from an optional specified stop.
-     * If no start stop is provided, the iteration begins from the first stop in the route.
-     *
-     * @param [startStopId] - (Optional) The StopId of the stop to start the iteration from.
-     * @returns An IterableIterator of StopIds, starting from the specified stop or the first stop.
-     * @throws An error if the specified start stop is not found in the route.
-     */
-    stopsIterator(startStopId?: StopId): IterableIterator<StopId>;
     /**
      * Finds the earliest trip that can be taken from a specific stop on a given route,
      * optionally constrained by a latest trip index and a time before which the trip
@@ -153,5 +144,5 @@ export declare class Route {
      * @param stopId The StopId of the stop to locate in the route.
      * @returns The index of the stop in the route.
      */
-    private stopIndex;
+    stopIndex(stopId: StopId): number;
 }

package/dist/timetable/timetable.d.ts

@@ -20,7 +20,7 @@ export type ServiceRoute = {
 };
 export type ServiceRouteInfo = Omit<ServiceRoute, 'routes'>;
 export declare const ALL_TRANSPORT_MODES: Set<RouteType>;
-export declare const CURRENT_VERSION = "0.0.6";
+export declare const CURRENT_VERSION = "0.0.7";
 /**
  * The internal transit timetable format.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minotor",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "A lightweight client-side transit routing library.",
   "keywords": [
     "minotor",

package/src/__e2e__/timetable/timetable.bin

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2ba83dc99279de7efd87f05c5b49c16f4dbf509e6c3f77af8f98b3273afb9e2
+oid sha256:c7552c57f15104abaa7a67adc4b2c12177cd5d34f2e7f826860b1d073b1b1f26
 size 18173715

package/src/gtfs/trips.ts

@@ -204,8 +204,12 @@ export const buildStopsAdjacencyStructure = (
   for (let i = 0; i < nbStops; i++) {
     stopsAdjacency[i] = { routes: [], transfers: [] };
   }
-  routes.forEach((route, index) => {
-    for (const stop of route.stopsIterator()) {
+  for (let index = 0; index < routes.length; index++) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const route = routes[index]!;
+    for (let j = 0; j < route.getNbStops(); j++) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const stop = route.stops[j]!;
       if (activeStops.has(stop)) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         stopsAdjacency[stop]!.routes.push(index);
@@ -218,9 +222,11 @@ export const buildStopsAdjacencyStructure = (
       );
     }
     serviceRoute.routes.push(index);
-  });
+  }
   for (const [stop, transfers] of transfersMap) {
-    for (const transfer of transfers) {
+    for (let i = 0; i < transfers.length; i++) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const transfer = transfers[i]!;
       if (activeStops.has(stop) || activeStops.has(transfer.destination)) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         stopsAdjacency[stop]!.transfers.push(transfer);

package/src/routing/router.ts

@@ -56,7 +56,9 @@ export class Router {
   ): void {
     const { options } = query;
     const newlyMarkedStops: Set<StopId> = new Set();
-    for (const stop of markedStops) {
+    const markedStopsArray = Array.from(markedStops);
+    for (let i = 0; i < markedStopsArray.length; i++) {
+      const stop = markedStopsArray[i]!;
       const currentArrival = arrivalsAtCurrentRound.get(stop);
       if (!currentArrival) continue;
       // Skip transfers if the last leg was also a transfer
@@ -65,7 +67,9 @@ export class Router {
         continue;
       }
 
-      for (const transfer of this.timetable.getTransfers(stop)) {
+      const transfers = this.timetable.getTransfers(stop);
+      for (let j = 0; j < transfers.length; j++) {
+        const transfer = transfers[j]!;
         let transferTime: Duration;
         if (transfer.minTransferTime) {
           transferTime = transfer.minTransferTime;
@@ -100,7 +104,9 @@ export class Router {
         }
       }
     }
-    for (const newStop of newlyMarkedStops) {
+    const newlyMarkedStopsArray = Array.from(newlyMarkedStops);
+    for (let i = 0; i < newlyMarkedStopsArray.length; i++) {
+      const newStop = newlyMarkedStopsArray[i]!;
       markedStops.add(newStop);
     }
   }
@@ -117,7 +123,8 @@ export class Router {
     destinations: Stop[],
   ): Time {
     let earliestArrivalAtAnyDestination = UNREACHED;
-    for (const destination of destinations) {
+    for (let i = 0; i < destinations.length; i++) {
+      const destination = destinations[i]!;
       const arrival =
         earliestArrivals.get(destination.id)?.arrival ?? UNREACHED;
       earliestArrivalAtAnyDestination = Time.min(
@@ -149,7 +156,8 @@ export class Router {
     // Stops that have been improved at round k-1
     const markedStops = new Set<StopId>();
 
-    for (const originStop of origins) {
+    for (let i = 0; i < origins.length; i++) {
+      const originStop = origins[i]!;
       markedStops.add(originStop.id);
       earliestArrivals.set(originStop.id, {
         arrival: departureTime,
@@ -183,9 +191,13 @@ export class Router {
       );
       markedStops.clear();
       // for each route that can be reached with at least round - 1 trips
-      for (const [route, hopOnStop] of reachableRoutes.entries()) {
+      const reachableRoutesArray = Array.from(reachableRoutes.entries());
+      for (let i = 0; i < reachableRoutesArray.length; i++) {
+        const [route, hopOnStop] = reachableRoutesArray[i]!;
         let currentTrip: CurrentTrip | undefined = undefined;
-        for (const currentStop of route.stopsIterator(hopOnStop)) {
+        const startIndex = route.stopIndex(hopOnStop);
+        for (let j = startIndex; j < route.getNbStops(); j++) {
+          const currentStop = route.stops[j]!;
           // If we're currently on a trip,
           // check if arrival at the stop improves the earliest arrival time
           if (currentTrip !== undefined) {

package/src/stops/stopsIndex.ts

@@ -25,17 +25,14 @@ export class StopsIndex {
   constructor(stops: Stop[]) {
     this.stops = stops;
     this.sourceStopsMap = new Map<SourceStopId, StopId>();
-    stops.forEach((stop, id) => {
-      this.sourceStopsMap.set(stop.sourceStopId, id);
-    });
-    this.textIndex = createIndex({
-      fields: ['name'],
-      storeFields: ['id'],
-      searchOptions: { prefix: true, fuzzy: 0.2 },
-      processTerm: generateAccentVariants,
-    });
     const stopsSet = new Map<StopId, { id: StopId; name: string }>();
-    stops.forEach((stop, id) => {
+    this.stopPoints = [];
+    for (let id = 0; id < stops.length; id++) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const stop = stops[id]!;
+
+      this.sourceStopsMap.set(stop.sourceStopId, id);
+
       const effectiveStopId = stop.parent ?? id;
       if (!stopsSet.has(effectiveStopId)) {
         stopsSet.set(effectiveStopId, {
@@ -44,22 +41,27 @@ export class StopsIndex {
           name: stop.parent ? this.stops[stop.parent]!.name : stop.name,
         });
       }
+
+      if (stop.lat && stop.lon) {
+        this.stopPoints.push({
+          id: id,
+          lat: stop.lat,
+          lon: stop.lon,
+        });
+      }
+    }
+    this.textIndex = createIndex({
+      fields: ['name'],
+      storeFields: ['id'],
+      searchOptions: { prefix: true, fuzzy: 0.2 },
+      processTerm: generateAccentVariants,
     });
     const stopsArray = Array.from(stopsSet.values());
     addAll(this.textIndex, stopsArray);
-
-    this.stopPoints = this.stops
-      .filter((stop) => {
-        if (stop.lat && stop.lon) return true;
-        return false;
-      })
-      .map((stop, id) => ({
-        id: id,
-        lat: stop.lat as number,
-        lon: stop.lon as number,
-      }));
     this.geoIndex = new KDTree(this.stopPoints.length);
-    for (const { lat, lon } of this.stopPoints) {
+    for (let i = 0; i < this.stopPoints.length; i++) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const { lat, lon } = this.stopPoints[i]!;
       this.geoIndex.add(lon, lat);
     }
     this.geoIndex.finish();

package/src/timetable/__tests__/route.test.ts

@@ -249,25 +249,6 @@ describe('Route', () => {
     });
   });
 
-  describe('stopsIterator', () => {
-    it('should iterate over all stops when no start stop is provided', () => {
-      const stopsList = Array.from(route.stopsIterator());
-      assert.deepStrictEqual(stopsList, [1001, 1002]);
-    });
-
-    it('should iterate from specified start stop', () => {
-      const stopsList = Array.from(route.stopsIterator(1002));
-      assert.deepStrictEqual(stopsList, [1002]);
-    });
-
-    it('should throw error for invalid start stop ID', () => {
-      assert.throws(
-        () => Array.from(route.stopsIterator(9999)),
-        /Start stop 9999 not found in route 0/,
-      );
-    });
-  });
-
   describe('findEarliestTrip', () => {
     it('should find earliest trip without time constraint', () => {
       const tripIndex = route.findEarliestTrip(1001);

package/src/timetable/io.ts

@@ -4,7 +4,6 @@ import {
   RouteType as ProtoRouteType,
   ServiceRoute as ProtoServiceRoute,
   StopAdjacency as ProtoStopAdjacency,
-  Transfer as ProtoTransfer,
   TransferType as ProtoTransferType,
 } from './proto/timetable.js';
 import { Route } from './route.js';
@@ -171,20 +170,33 @@ export const serializeServiceRoutesMap = (
 export const deserializeStopsAdjacency = (
   protoStopsAdjacency: ProtoStopAdjacency[],
 ): StopAdjacency[] => {
-  return protoStopsAdjacency.map((value) => {
-    return {
-      transfers: value.transfers.map(
-        (transfer: ProtoTransfer): Transfer => ({
-          destination: transfer.destination,
-          type: parseTransferType(transfer.type),
-          ...(transfer.minTransferTime !== undefined && {
-            minTransferTime: Duration.fromSeconds(transfer.minTransferTime),
-          }),
+  const result: StopAdjacency[] = [];
+
+  for (let i = 0; i < protoStopsAdjacency.length; i++) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const value = protoStopsAdjacency[i]!;
+    const transfers: Transfer[] = [];
+
+    for (let j = 0; j < value.transfers.length; j++) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const transfer = value.transfers[j]!;
+      const newTransfer: Transfer = {
+        destination: transfer.destination,
+        type: parseTransferType(transfer.type),
+        ...(transfer.minTransferTime !== undefined && {
+          minTransferTime: Duration.fromSeconds(transfer.minTransferTime),
         }),
-      ),
+      };
+      transfers.push(newTransfer);
+    }
+
+    result.push({
+      transfers: transfers,
       routes: value.routes,
-    };
-  });
+    });
+  }
+
+  return result;
 };
 
 export const deserializeRoutesAdjacency = (
@@ -192,7 +204,9 @@ export const deserializeRoutesAdjacency = (
 ): Route[] => {
   const routesAdjacency: Route[] = [];
 
-  protoRoutesAdjacency.forEach((value) => {
+  for (let i = 0; i < protoRoutesAdjacency.length; i++) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const value = protoRoutesAdjacency[i]!;
     const stops = bytesToUint32Array(value.stops);
     routesAdjacency.push(
       new Route(
@@ -202,7 +216,7 @@ export const deserializeRoutesAdjacency = (
         value.serviceRouteId,
       ),
     );
-  });
+  }
 
   return routesAdjacency;
 };
@@ -210,13 +224,19 @@ export const deserializeRoutesAdjacency = (
 export const deserializeServiceRoutesMap = (
   protoServiceRoutes: ProtoServiceRoute[],
 ): ServiceRoute[] => {
-  return protoServiceRoutes.map((value) => {
-    return {
+  const result: ServiceRoute[] = [];
+
+  for (let i = 0; i < protoServiceRoutes.length; i++) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const value = protoServiceRoutes[i]!;
+    result.push({
       type: parseRouteType(value.type),
       name: value.name,
       routes: value.routes,
-    };
-  });
+    });
+  }
+
+  return result;
 };
 
 const parseTransferType = (type: ProtoTransferType): TransferType => {

package/src/timetable/proto/timetable.proto

@@ -42,7 +42,7 @@ message Transfer {
 
 message StopAdjacency {
   repeated Transfer transfers = 1;
-  repeated int32 routes = 2;
+  repeated uint32 routes = 2;
 }
 
 enum RouteType {
@@ -61,7 +61,7 @@ enum RouteType {
 message ServiceRoute {
   RouteType type = 1;
   string name = 2;
-  repeated int32 routes = 3;
+  repeated uint32 routes = 3;
 }
 
 message Timetable {

package/src/timetable/proto/timetable.ts

@@ -402,7 +402,7 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
     }
     writer.uint32(18).fork();
     for (const v of message.routes) {
-      writer.int32(v);
+      writer.uint32(v);
     }
     writer.join();
     return writer;
@@ -425,7 +425,7 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
         }
         case 2: {
           if (tag === 16) {
-            message.routes.push(reader.int32());
+            message.routes.push(reader.uint32());
 
             continue;
           }
@@ -433,7 +433,7 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
           if (tag === 18) {
             const end2 = reader.uint32() + reader.pos;
             while (reader.pos < end2) {
-              message.routes.push(reader.int32());
+              message.routes.push(reader.uint32());
             }
 
             continue;
@@ -495,7 +495,7 @@ export const ServiceRoute: MessageFns<ServiceRoute> = {
     }
     writer.uint32(26).fork();
     for (const v of message.routes) {
-      writer.int32(v);
+      writer.uint32(v);
     }
     writer.join();
     return writer;
@@ -526,7 +526,7 @@ export const ServiceRoute: MessageFns<ServiceRoute> = {
         }
         case 3: {
           if (tag === 24) {
-            message.routes.push(reader.int32());
+            message.routes.push(reader.uint32());
 
             continue;
           }
@@ -534,7 +534,7 @@ export const ServiceRoute: MessageFns<ServiceRoute> = {
           if (tag === 26) {
             const end2 = reader.uint32() + reader.pos;
             while (reader.pos < end2) {
-              message.routes.push(reader.int32());
+              message.routes.push(reader.uint32());
             }
 
             continue;

package/src/timetable/route.ts

@@ -81,7 +81,7 @@ export class Route {
    * A binary array of stopIds in the route.
    * [stop1, stop2, stop3,...]
    */
-  private readonly stops: Uint32Array;
+  public readonly stops: Uint32Array;
   /**
    * A reverse mapping of each stop with their index in the route:
    * {
@@ -269,36 +269,6 @@ export class Route {
     return toPickupDropOffType(dropOffValue);
   }
 
-  /**
-   * Iterates over the stops in the route, starting from an optional specified stop.
-   * If no start stop is provided, the iteration begins from the first stop in the route.
-   *
-   * @param [startStopId] - (Optional) The StopId of the stop to start the iteration from.
-   * @returns An IterableIterator of StopIds, starting from the specified stop or the first stop.
-   * @throws An error if the specified start stop is not found in the route.
-   */
-  stopsIterator(startStopId?: StopId): IterableIterator<StopId> {
-    const startIndex =
-      startStopId !== undefined ? this.stopIndices.get(startStopId) : 0;
-    if (startIndex === undefined) {
-      throw new Error(
-        `Start stop ${startStopId} not found in route ${this.serviceRouteId}`,
-      );
-    }
-
-    function* generator(
-      stops: Uint32Array,
-      startIndex: number,
-    ): IterableIterator<StopId> {
-      for (let i = startIndex; i < stops.length; i++) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        yield stops[i]!;
-      }
-    }
-
-    return generator(this.stops, startIndex);
-  }
-
   /**
    * Finds the earliest trip that can be taken from a specific stop on a given route,
    * optionally constrained by a latest trip index and a time before which the trip
@@ -349,7 +319,7 @@ export class Route {
    * @param stopId The StopId of the stop to locate in the route.
    * @returns The index of the stop in the route.
    */
-  private stopIndex(stopId: StopId): number {
+  public stopIndex(stopId: StopId): number {
     const stopIndex = this.stopIndices.get(stopId);
     if (stopIndex === undefined) {
       throw new Error(

package/src/timetable/timetable.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { BinaryReader, BinaryWriter } from '@bufbuild/protobuf/wire';
 
 import { StopId } from '../stops/stops.js';
@@ -67,7 +68,7 @@ export const ALL_TRANSPORT_MODES: Set<RouteType> = new Set([
   'MONORAIL',
 ]);
 
-export const CURRENT_VERSION = '0.0.6';
+export const CURRENT_VERSION = '0.0.7';
 
 /**
  * The internal transit timetable format.
@@ -200,7 +201,8 @@ export class Timetable {
       return [];
     }
     const routes: Route[] = [];
-    for (const routeId of stopData.routes) {
+    for (let i = 0; i < stopData.routes.length; i++) {
+      const routeId = stopData.routes[i]!;
       const route = this.routesAdjacency[routeId];
       if (route) {
         routes.push(route);
@@ -223,14 +225,17 @@ export class Timetable {
     transportModes: Set<RouteType> = ALL_TRANSPORT_MODES,
   ): Map<Route, StopId> {
     const reachableRoutes = new Map<Route, StopId>();
-    for (const originStop of fromStops) {
+    const fromStopsArray = Array.from(fromStops);
+    for (let i = 0; i < fromStopsArray.length; i++) {
+      const originStop = fromStopsArray[i]!;
       const validRoutes = this.routesPassingThrough(originStop).filter(
         (route) => {
           const serviceRoute = this.getServiceRouteInfo(route);
           return transportModes.has(serviceRoute.type);
         },
       );
-      for (const route of validRoutes) {
+      for (let j = 0; j < validRoutes.length; j++) {
+        const route = validRoutes[j]!;
         const hopOnStop = reachableRoutes.get(route);
         if (hopOnStop) {
           if (route.isBefore(originStop, hopOnStop)) {