minotor 5.0.0 → 6.0.0

package/src/routing/router.ts

@@ -186,6 +186,8 @@ export class Router {
       for (const [route, hopOnStop] of reachableRoutes.entries()) {
         let currentTrip: CurrentTrip | undefined = undefined;
         for (const currentStop of route.stopsIterator(hopOnStop)) {
+          // If we're currently on a trip,
+          // check if arrival at the stop improves the earliest arrival time
           if (currentTrip !== undefined) {
             const currentArrivalTime = route.arrivalAt(
               currentStop,
@@ -230,7 +232,7 @@ export class Router {
               markedStops.add(currentStop);
             }
           }
-          // check if we can catch a previous trip at the current stop
+          // check if we can board an earlier trip at the current stop
           // if there was no current trip, find the first one reachable
           const earliestArrivalOnPreviousRound =
             arrivalsAtPreviousRound.get(currentStop)?.arrival;

package/src/stops/__tests__/io.test.ts

@@ -2,39 +2,33 @@ import assert from 'node:assert';
 import { describe, it } from 'node:test';
 
 import { deserializeStopsMap, serializeStopsMap } from '../io.js';
-import { StopsMap } from '../stops.js';
+import { Stop } from '../stops.js';
 
 describe('Stops IO', () => {
-  const stopsMap: StopsMap = new Map([
-    [
-      1,
-      {
-        id: 1,
-        sourceStopId: 'stop1',
-        name: 'Stop 1',
-        lat: 40.712776,
-        lon: -74.005974,
-        children: [2],
-        parent: 3,
-        locationType: 'SIMPLE_STOP_OR_PLATFORM',
-        platform: 'Platform 1',
-      },
-    ],
-    [
-      2,
-      {
-        id: 2,
-        sourceStopId: 'stop2',
-        name: 'Stop 2',
-        lat: 34.052235,
-        lon: -118.243683,
-        children: [],
-        parent: 1,
-        locationType: 'STATION',
-        platform: 'Platform 2',
-      },
-    ],
-  ]);
+  const stopsMap: Stop[] = [
+    {
+      id: 0,
+      sourceStopId: 'stop1',
+      name: 'Stop 1',
+      lat: 40.712776,
+      lon: -74.005974,
+      children: [1],
+      parent: undefined,
+      locationType: 'SIMPLE_STOP_OR_PLATFORM',
+      platform: 'Platform 1',
+    },
+    {
+      id: 1,
+      sourceStopId: 'stop2',
+      name: 'Stop 2',
+      lat: 34.052235,
+      lon: -118.243683,
+      children: [],
+      parent: 0,
+      locationType: 'STATION',
+      platform: 'Platform 2',
+    },
+  ];
   it('should serialize and deserialize stops correctly', () => {
     const serializedData = serializeStopsMap(stopsMap);
     const deserializedStopsMap = deserializeStopsMap(serializedData);

package/src/stops/__tests__/stopFinder.test.ts

@@ -1,97 +1,76 @@
 import assert from 'node:assert';
 import { beforeEach, describe, it } from 'node:test';
 
-import { StopsMap } from '../stops.js';
+import { Stop } from '../stops.js';
 import { StopsIndex } from '../stopsIndex.js';
-const mockStops: StopsMap = new Map([
-  [
-    1,
-    {
-      id: 1,
-      sourceStopId: '8587255',
-      name: 'Fribourg, Tilleul/Cathédrale',
-      lat: 46.8061375857565,
-      lon: 7.16145029437328,
-      children: [],
-      locationType: 'SIMPLE_STOP_OR_PLATFORM',
-    },
-  ],
-  [
-    2,
-    {
-      id: 2,
-      sourceStopId: '8592383',
-      name: 'Fribourg, Neuveville/Court-Ch.',
-      lat: 46.8042990960992,
-      lon: 7.16060587800609,
-      children: [],
-      locationType: 'SIMPLE_STOP_OR_PLATFORM',
-    },
-  ],
-  [
-    3,
-    {
-      id: 3,
-      sourceStopId: '8592386',
-      name: 'Fribourg, Petit-St-Jean',
-      lat: 46.8035550740648,
-      lon: 7.16806189486532,
-      children: [],
-      locationType: 'SIMPLE_STOP_OR_PLATFORM',
-    },
-  ],
-  [
-    4,
-    {
-      id: 4,
-      sourceStopId: 'Parent8504100',
-      name: 'Fribourg/Freiburg',
-      lat: 46.8031492395272,
-      lon: 7.15104780338173,
-      children: [5, 6, 7],
-      locationType: 'STATION',
-    },
-  ],
-  [
-    5,
-    {
-      id: 5,
-      sourceStopId: '8504100:0:1',
-      name: 'Fribourg/Freiburg',
-      lat: 46.8031492395272,
-      lon: 7.15104780338173,
-      children: [],
-      locationType: 'SIMPLE_STOP_OR_PLATFORM',
-      parent: 4,
-    },
-  ],
-  [
-    6,
-    {
-      id: 6,
-      sourceStopId: '8504100:0:1AB',
-      name: 'Fribourg/Freiburg',
-      lat: 46.8031492395272,
-      lon: 7.15104780338173,
-      children: [],
-      locationType: 'SIMPLE_STOP_OR_PLATFORM',
-      parent: 4,
-    },
-  ],
-  [
-    7,
-    {
-      id: 7,
-      sourceStopId: '8504100:0:2',
-      name: 'Fribourg/Freiburg',
-      lat: 46.8031492395272,
-      lon: 7.15104780338173,
-      children: [],
-      locationType: 'SIMPLE_STOP_OR_PLATFORM',
-      parent: 4,
-    },
-  ],
-]);
+const mockStops: Stop[] = [
+  {
+    id: 0,
+    sourceStopId: '8587255',
+    name: 'Fribourg, Tilleul/Cathédrale',
+    lat: 46.8061375857565,
+    lon: 7.16145029437328,
+    children: [],
+    locationType: 'SIMPLE_STOP_OR_PLATFORM',
+  },
+  {
+    id: 1,
+    sourceStopId: '8592383',
+    name: 'Fribourg, Neuveville/Court-Ch.',
+    lat: 46.8042990960992,
+    lon: 7.16060587800609,
+    children: [],
+    locationType: 'SIMPLE_STOP_OR_PLATFORM',
+  },
+  {
+    id: 2,
+    sourceStopId: '8592386',
+    name: 'Fribourg, Petit-St-Jean',
+    lat: 46.8035550740648,
+    lon: 7.16806189486532,
+    children: [],
+    locationType: 'SIMPLE_STOP_OR_PLATFORM',
+  },
+  {
+    id: 3,
+    sourceStopId: 'Parent8504100',
+    name: 'Fribourg/Freiburg',
+    lat: 46.8031492395272,
+    lon: 7.15104780338173,
+    children: [4, 5, 6],
+    locationType: 'STATION',
+  },
+  {
+    id: 4,
+    sourceStopId: '8504100:0:1',
+    name: 'Fribourg/Freiburg',
+    lat: 46.8031492395272,
+    lon: 7.15104780338173,
+    children: [],
+    locationType: 'SIMPLE_STOP_OR_PLATFORM',
+    parent: 3,
+  },
+  {
+    id: 5,
+    sourceStopId: '8504100:0:1AB',
+    name: 'Fribourg/Freiburg',
+    lat: 46.8031492395272,
+    lon: 7.15104780338173,
+    children: [],
+    locationType: 'SIMPLE_STOP_OR_PLATFORM',
+    parent: 3,
+  },
+  {
+    id: 6,
+    sourceStopId: '8504100:0:2',
+    name: 'Fribourg/Freiburg',
+    lat: 46.8031492395272,
+    lon: 7.15104780338173,
+    children: [],
+    locationType: 'SIMPLE_STOP_OR_PLATFORM',
+    parent: 3,
+  },
+];
 
 describe('Stop Finder', () => {
   let stopFinder: StopsIndex;
@@ -105,25 +84,25 @@ describe('Stop Finder', () => {
       const results = stopFinder.findStopsByName(
         'Fribourg, Tilleul/Cathédrale',
       );
-      assert.strictEqual(results[0]?.id, 1);
+      assert.strictEqual(results[0]?.id, 0);
     });
 
     it('should not include children stops', () => {
       const results = stopFinder.findStopsByName('Fribourg/Freiburg', 2);
-      assert.strictEqual(results[0]?.id, 4);
-      assert.strictEqual(results[1]?.id, 1);
+      assert.strictEqual(results[0]?.id, 3);
+      assert.strictEqual(results[1]?.id, 0);
     });
 
     it('should find stops by partial name', () => {
       const results = stopFinder.findStopsByName('Cathédrale');
       assert.strictEqual(results.length, 1);
-      assert.strictEqual(results[0]?.id, 1);
+      assert.strictEqual(results[0]?.id, 0);
     });
 
     it('should find stops by name with accents', () => {
       const results = stopFinder.findStopsByName('Cathedrale');
       assert.strictEqual(results.length, 1);
-      assert.strictEqual(results[0]?.id, 1);
+      assert.strictEqual(results[0]?.id, 0);
     });
 
     it('should return an empty array if no stops match the query', () => {
@@ -136,22 +115,22 @@ describe('Stop Finder', () => {
     it('should find stops by geographic location', () => {
       const results = stopFinder.findStopsByLocation(46.8061, 7.1614, 1);
       assert.strictEqual(results.length, 1);
-      assert.strictEqual(results[0]?.id, 1);
+      assert.strictEqual(results[0]?.id, 0);
     });
 
     it('should find multiple stops within the radius', () => {
       const results = stopFinder.findStopsByLocation(46.8, 7.16, 10, 0.75);
       assert.strictEqual(results.length, 3);
-      assert.strictEqual(results[0]?.id, 2);
-      assert.strictEqual(results[1]?.id, 1);
-      assert.strictEqual(results[2]?.id, 3);
+      assert.strictEqual(results[0]?.id, 1);
+      assert.strictEqual(results[1]?.id, 0);
+      assert.strictEqual(results[2]?.id, 2);
     });
 
     it('should find the N closest stops', () => {
       const results = stopFinder.findStopsByLocation(46.8, 7.16, 2, 10);
       assert.strictEqual(results.length, 2);
-      assert.strictEqual(results[0]?.id, 2);
-      assert.strictEqual(results[1]?.id, 1);
+      assert.strictEqual(results[0]?.id, 1);
+      assert.strictEqual(results[1]?.id, 0);
     });
 
     it('should return an empty array if no stops are within the radius', () => {
@@ -174,7 +153,7 @@ describe('Stop Finder', () => {
       const equivalentStops = stopFinder.equivalentStops('8504100:0:1');
       assert.deepStrictEqual(
         equivalentStops.map((stop) => stop.id),
-        [5, 6, 7],
+        [4, 5, 6],
       );
     });
 
@@ -182,7 +161,7 @@ describe('Stop Finder', () => {
       const equivalentStops = stopFinder.equivalentStops('8587255');
       assert.deepStrictEqual(
         equivalentStops.map((stop) => stop.id),
-        [1],
+        [0],
       );
     });
 

package/src/stops/io.ts

@@ -3,9 +3,9 @@ import {
   Stop as ProtoStop,
   StopsMap as ProtoStopsMap,
 } from './proto/stops.js';
-import { LocationType, Stop, StopsMap } from './stops.js';
+import { LocationType, Stop } from './stops.js';
 
-const CURRENT_VERSION = '0.0.2';
+const CURRENT_VERSION = '0.0.3';
 const serializeStop = (stop: Stop): ProtoStop => {
   return {
     name: stop.name,
@@ -19,16 +19,12 @@ const serializeStop = (stop: Stop): ProtoStop => {
   };
 };
 
-export const serializeStopsMap = (stopsMap: StopsMap): ProtoStopsMap => {
+export const serializeStopsMap = (stops: Stop[]): ProtoStopsMap => {
   const protoStopsMap: ProtoStopsMap = {
     version: CURRENT_VERSION,
-    stops: {},
+    stops: stops.map((value) => serializeStop(value)),
   };
 
-  stopsMap.forEach((value: Stop, key: number) => {
-    protoStopsMap.stops[key] = serializeStop(value);
-  });
-
   return protoStopsMap;
 };
 
@@ -46,18 +42,13 @@ const deserializeStop = (stopId: number, protoStop: ProtoStop): Stop => {
   };
 };
 
-export const deserializeStopsMap = (protoStopsMap: ProtoStopsMap): StopsMap => {
+export const deserializeStopsMap = (protoStopsMap: ProtoStopsMap): Stop[] => {
   if (protoStopsMap.version !== CURRENT_VERSION) {
     throw new Error(`Unsupported stopMap version ${protoStopsMap.version}`);
   }
-  const stopsMap: StopsMap = new Map();
-
-  Object.entries(protoStopsMap.stops).forEach(([key, value]) => {
-    const intKey = parseInt(key, 10);
-    stopsMap.set(intKey, deserializeStop(intKey, value));
-  });
-
-  return stopsMap;
+  return protoStopsMap.stops.map((value, intKey) =>
+    deserializeStop(intKey, value),
+  );
 };
 
 const parseProtoLocationType = (

package/src/stops/proto/stops.proto

@@ -13,8 +13,8 @@ enum LocationType {
 message Stop {
   string name = 1;
   string sourceStopId = 2;
-  optional double lat = 3;
-  optional double lon = 4;
+  optional float lat = 3;
+  optional float lon = 4;
   repeated uint32 children = 5;
   optional uint32 parent = 6;
   LocationType locationType = 7;
@@ -23,5 +23,5 @@ message Stop {
 
 message StopsMap {
   string version = 1;
-  map<uint32, Stop> stops = 2;
+  repeated Stop stops = 2;
 }

package/src/stops/proto/stops.ts

@@ -73,12 +73,7 @@ export interface Stop {
 
 export interface StopsMap {
   version: string;
-  stops: { [key: number]: Stop };
-}
-
-export interface StopsMap_StopsEntry {
-  key: number;
-  value: Stop | undefined;
+  stops: Stop[];
 }
 
 function createBaseStop(): Stop {
@@ -103,10 +98,10 @@ export const Stop: MessageFns<Stop> = {
       writer.uint32(18).string(message.sourceStopId);
     }
     if (message.lat !== undefined) {
-      writer.uint32(25).double(message.lat);
+      writer.uint32(29).float(message.lat);
     }
     if (message.lon !== undefined) {
-      writer.uint32(33).double(message.lon);
+      writer.uint32(37).float(message.lon);
     }
     writer.uint32(42).fork();
     for (const v of message.children) {
@@ -149,19 +144,19 @@ export const Stop: MessageFns<Stop> = {
           continue;
         }
         case 3: {
-          if (tag !== 25) {
+          if (tag !== 29) {
             break;
           }
 
-          message.lat = reader.double();
+          message.lat = reader.float();
           continue;
         }
         case 4: {
-          if (tag !== 33) {
+          if (tag !== 37) {
             break;
           }
 
-          message.lon = reader.double();
+          message.lon = reader.float();
           continue;
         }
         case 5: {
@@ -275,7 +270,7 @@ export const Stop: MessageFns<Stop> = {
 };
 
 function createBaseStopsMap(): StopsMap {
-  return { version: "", stops: {} };
+  return { version: "", stops: [] };
 }
 
 export const StopsMap: MessageFns<StopsMap> = {
@@ -283,9 +278,9 @@ export const StopsMap: MessageFns<StopsMap> = {
     if (message.version !== "") {
       writer.uint32(10).string(message.version);
     }
-    Object.entries(message.stops).forEach(([key, value]) => {
-      StopsMap_StopsEntry.encode({ key: key as any, value }, writer.uint32(18).fork()).join();
-    });
+    for (const v of message.stops) {
+      Stop.encode(v!, writer.uint32(18).fork()).join();
+    }
     return writer;
   },
 
@@ -309,10 +304,7 @@ export const StopsMap: MessageFns<StopsMap> = {
             break;
           }
 
-          const entry2 = StopsMap_StopsEntry.decode(reader, reader.uint32());
-          if (entry2.value !== undefined) {
-            message.stops[entry2.key] = entry2.value;
-          }
+          message.stops.push(Stop.decode(reader, reader.uint32()));
           continue;
         }
       }
@@ -327,12 +319,7 @@ export const StopsMap: MessageFns<StopsMap> = {
   fromJSON(object: any): StopsMap {
     return {
       version: isSet(object.version) ? globalThis.String(object.version) : "",
-      stops: isObject(object.stops)
-        ? Object.entries(object.stops).reduce<{ [key: number]: Stop }>((acc, [key, value]) => {
-          acc[globalThis.Number(key)] = Stop.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
+      stops: globalThis.Array.isArray(object?.stops) ? object.stops.map((e: any) => Stop.fromJSON(e)) : [],
     };
   },
 
@@ -341,14 +328,8 @@ export const StopsMap: MessageFns<StopsMap> = {
     if (message.version !== "") {
       obj.version = message.version;
     }
-    if (message.stops) {
-      const entries = Object.entries(message.stops);
-      if (entries.length > 0) {
-        obj.stops = {};
-        entries.forEach(([k, v]) => {
-          obj.stops[k] = Stop.toJSON(v);
-        });
-      }
+    if (message.stops?.length) {
+      obj.stops = message.stops.map((e) => Stop.toJSON(e));
     }
     return obj;
   },
@@ -359,88 +340,7 @@ export const StopsMap: MessageFns<StopsMap> = {
   fromPartial<I extends Exact<DeepPartial<StopsMap>, I>>(object: I): StopsMap {
     const message = createBaseStopsMap();
     message.version = object.version ?? "";
-    message.stops = Object.entries(object.stops ?? {}).reduce<{ [key: number]: Stop }>((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[globalThis.Number(key)] = Stop.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    return message;
-  },
-};
-
-function createBaseStopsMap_StopsEntry(): StopsMap_StopsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const StopsMap_StopsEntry: MessageFns<StopsMap_StopsEntry> = {
-  encode(message: StopsMap_StopsEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.key !== 0) {
-      writer.uint32(8).uint32(message.key);
-    }
-    if (message.value !== undefined) {
-      Stop.encode(message.value, writer.uint32(18).fork()).join();
-    }
-    return writer;
-  },
-
-  decode(input: BinaryReader | Uint8Array, length?: number): StopsMap_StopsEntry {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    const end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseStopsMap_StopsEntry();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 8) {
-            break;
-          }
-
-          message.key = reader.uint32();
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-
-          message.value = Stop.decode(reader, reader.uint32());
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): StopsMap_StopsEntry {
-    return {
-      key: isSet(object.key) ? globalThis.Number(object.key) : 0,
-      value: isSet(object.value) ? Stop.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: StopsMap_StopsEntry): unknown {
-    const obj: any = {};
-    if (message.key !== 0) {
-      obj.key = Math.round(message.key);
-    }
-    if (message.value !== undefined) {
-      obj.value = Stop.toJSON(message.value);
-    }
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<StopsMap_StopsEntry>, I>>(base?: I): StopsMap_StopsEntry {
-    return StopsMap_StopsEntry.fromPartial(base ?? ({} as any));
-  },
-  fromPartial<I extends Exact<DeepPartial<StopsMap_StopsEntry>, I>>(object: I): StopsMap_StopsEntry {
-    const message = createBaseStopsMap_StopsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null) ? Stop.fromPartial(object.value) : undefined;
+    message.stops = object.stops?.map((e) => Stop.fromPartial(e)) || [];
     return message;
   },
 };
@@ -457,10 +357,6 @@ type KeysOfUnion<T> = T extends T ? keyof T : never;
 export type Exact<P, I extends P> = P extends Builtin ? P
   : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }

package/src/stops/stops.ts

@@ -26,10 +26,6 @@ export type Stop = {
   platform?: Platform;
 };
 
-/**
- * Mapping internal StopIds to Stop objects.
- */
-export type StopsMap = Map<StopId, Stop>;
 /**
  * Mapping source stopIds to internal stopIds;
  */