minotor 7.0.2 → 9.0.0

package/src/__e2e__/router.test.ts

@@ -7,160 +7,169 @@ import { Query, Router, StopsIndex, Time, Timetable } from '../router.js';
 
 const routes = [
   {
-    from: 'Parent8504100', // Fribourg/Freiburg
-    to: 'Parent8504748', // Le Moléson
+    from: 'Parent8504100',
+    to: 'Parent8504880',
     at: '08:30',
     route: [
       {
-        from: '8504100:0:2', // Fribourg/Freiburg, Pl. 2
-        to: '8504086:0:2', // Bulle, Pl. 2
+        from: '8504100:0:2',
+        to: '8504086:0:2',
         departure: '08:34',
         arrival: '09:11',
-        route: {
-          type: 'RAIL',
-          name: 'RE2',
-        },
+        route: { type: 'RAIL', name: 'RE2' },
       },
       {
-        from: '8504086:0:2', // Bulle, Pl. 2
-        to: '8504086:0:4', // Bulle, Pl. 4
+        from: '8504086:0:2',
+        to: '8504086:0:4',
         type: 'REQUIRES_MINIMAL_TIME',
         minTransferTime: '03:00',
       },
       {
-        from: '8504086:0:4', // Bulle, Pl. 4
-        to: '8504077:0:1', // Gruyères, Pl. 1
+        from: '8504086:0:4',
+        to: '8504077:0:1',
         departure: '09:20',
         arrival: '09:28',
-        route: {
-          type: 'RAIL',
-          name: 'S51',
-        },
+        route: { type: 'RAIL', name: 'S51' },
       },
       {
-        from: '8504077:0:1', // Gruyères, Pl. 1
-        to: '8577737', // Gruyères, gare
+        from: '8504077:0:1',
+        to: '8577737',
         type: 'REQUIRES_MINIMAL_TIME',
         minTransferTime: '02:00',
       },
       {
-        from: '8577737', // Gruyères, gare
-        to: '8504880', // Moléson-sur-Gruyères
+        from: '8577737',
+        to: '8504880',
         departure: '09:33',
         arrival: '09:44',
-        route: {
-          type: 'BUS',
-          name: '263',
-        },
-      },
-      {
-        from: '8504880', // Moléson-sur-Gruyères
-        to: '8530024', // Moléson-sur-Gruyères (funi)
-        type: 'REQUIRES_MINIMAL_TIME',
-        minTransferTime: '02:00',
-      },
-      {
-        from: '8530024', // Moléson-sur-Gruyères (funi)
-        to: '8504749', // Plan-Francey
-        departure: '10:00',
-        arrival: '10:05',
-        route: {
-          type: 'FUNICULAR',
-          name: 'FUN',
-        },
-      },
-      {
-        from: '8504749', // Plan-Francey
-        to: '8531209', // Plan-Francey (téléphérique)
-        type: 'REQUIRES_MINIMAL_TIME',
-        minTransferTime: '02:00',
-      },
-      {
-        from: '8531209', // Plan-Francey (téléphérique)
-        to: '8504748', // Le Moléson
-        departure: '10:10',
-        arrival: '10:15',
-        route: {
-          type: 'AERIAL_LIFT',
-          name: 'PB',
-        },
+        route: { type: 'BUS', name: '263' },
       },
     ],
   },
   {
-    from: 'Parent8507000', // Bern
-    to: 'Parent8509253', // St. Moritz
+    from: 'Parent8507000',
+    to: 'Parent8509253',
     at: '12:30',
     route: [
       {
-        from: '8507000:0:8', // Bern, Pl.8
-        to: '8503000:0:33', // Zürich HB, Pl. 33
+        from: '8507000:0:8',
+        to: '8503000:0:33',
         departure: '12:31',
         arrival: '13:28',
-        route: {
-          type: 'RAIL',
-          name: 'IC1',
-        },
+        route: { type: 'RAIL', name: 'IC1' },
       },
       {
-        from: '8503000:0:33', // Zürich HB, Pl. 33
-        to: '8503000:0:9', // Zürich HB, Pl. 9
+        from: '8503000:0:33',
+        to: '8503000:0:9',
         type: 'REQUIRES_MINIMAL_TIME',
         minTransferTime: '07:00',
       },
       {
-        from: '8503000:0:9', // Zürich HB, Pl. 9
-        to: '8509000:0:9', // Chur, Pl. 9
+        from: '8503000:0:9',
+        to: '8509002:0:2',
         departure: '13:38',
-        arrival: '14:52',
-        route: {
-          type: 'RAIL',
-          name: 'IC3',
-        },
+        arrival: '14:41',
+        route: { type: 'RAIL', name: 'IC3' },
       },
       {
-        from: '8509000:0:9', // Chur, Pl. 9
-        to: '8509000:0:10', // Chur, Pl. 10
+        from: '8509002:0:2',
+        to: '8509002:0:6',
         type: 'REQUIRES_MINIMAL_TIME',
-        minTransferTime: '03:00',
+        minTransferTime: '04:00',
+      },
+      {
+        from: '8509002:0:6',
+        to: '8509269:0:3',
+        departure: '14:49',
+        arrival: '15:52',
+        route: { type: 'RAIL', name: 'RE24' },
       },
       {
-        from: '8509000:0:10', // Chur, Pl. 10
-        to: '8509253:0:2', // St-Moritz,  Pl. 2
-        departure: '14:58',
-        arrival: '16:56',
-        route: {
-          type: 'RAIL',
-          name: 'IR38',
-        },
+        from: '8509269:0:3',
+        to: '8509269:0:4',
+        type: 'REQUIRES_MINIMAL_TIME',
+        minTransferTime: '01:00',
+      },
+      {
+        from: '8509269:0:4',
+        to: '8509251:0:3',
+        departure: '15:54',
+        arrival: '16:43',
+        route: { type: 'RAIL', name: 'R15' },
+      },
+      {
+        from: '8509251:0:3',
+        to: '8509251:0:2',
+        type: 'REQUIRES_MINIMAL_TIME',
+        minTransferTime: '01:00',
+      },
+      {
+        from: '8509251:0:2',
+        to: '8509253:0:1',
+        departure: '16:48',
+        arrival: '17:00',
+        route: { type: 'RAIL', name: 'IR38' },
       },
     ],
   },
   {
-    // Cross-border train as two routes (TODO, check if there is an in-seat transfer modeled for it)
-    from: 'Parent8500010', // Basel SBB
-    to: 'Parent8721202', // Strasbourg
+    from: 'Parent8500010',
+    to: 'Parent8721202',
     at: '16:50',
     route: [
       {
-        from: '8500010:0:31', // Basel SBB, Pl. 31
-        to: '8718213', // Saint-Louis (Haut-Rhin)
-        departure: '16:50',
-        arrival: '16:58',
-        route: {
-          type: 'RAIL',
-          name: 'TER',
-        },
-      },
-      {
-        from: '8718213', // Saint-Louis (Haut-Rhin)
-        to: '8721202', // Strasbourg
-        departure: '16:59',
-        arrival: '18:09',
-        route: {
-          type: 'RAIL',
-          name: 'K200',
-        },
+        from: '8500010:0:33',
+        to: '8718213',
+        departure: '17:08',
+        arrival: '17:15',
+        route: { type: 'RAIL', name: 'TER' },
+      },
+      {
+        from: '8718213',
+        to: '8721202',
+        departure: '17:30',
+        arrival: '18:39',
+        route: { type: 'RAIL', name: 'K200' },
+      },
+    ],
+  },
+  {
+    from: 'Parent8504100',
+    to: 'Parent8509073',
+    at: '08:30',
+    route: [
+      {
+        from: '8504100:0:3',
+        to: '8503000:0:33',
+        departure: '09:03',
+        arrival: '10:28',
+        route: { type: 'RAIL', name: 'IC1' },
+      },
+      {
+        from: '8503000:0:33',
+        to: '8503000:0:10',
+        type: 'REQUIRES_MINIMAL_TIME',
+        minTransferTime: '07:00',
+      },
+      {
+        from: '8503000:0:10',
+        to: '8509002:0:2',
+        departure: '10:38',
+        arrival: '11:41',
+        route: { type: 'RAIL', name: 'IC3' },
+      },
+      {
+        from: '8509002:0:2',
+        to: '8509002:0:6',
+        type: 'REQUIRES_MINIMAL_TIME',
+        minTransferTime: '04:00',
+      },
+      {
+        from: '8509002:0:6',
+        to: '8509073:0:1',
+        departure: '11:49',
+        arrival: '13:03',
+        route: { type: 'RAIL', name: 'RE24' },
       },
     ],
   },

package/src/__e2e__/timetable/stops.bin

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d01e1988e595441682589f20612343670f6c01d18df037c389d0946a4ca6e61
-size 5121353
+oid sha256:18eaba61a6014cc31041103c3bcc74a4bebd37c234781c57238113a1de61ffd1
+size 5147203

package/src/__e2e__/timetable/timetable.bin

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

package/src/cli/repl.ts

@@ -3,6 +3,8 @@ import repl from 'node:repl';
 import fs from 'fs';
 
 import { Query, Router, StopsIndex, Time, Timetable } from '../router.js';
+import type { Stop } from '../stops/stops.js';
+import { Route } from '../timetable/route.js';
 import { plotGraphToDotFile } from './utils.js';
 
 export const startRepl = (stopsPath: string, timetablePath: string) => {
@@ -113,7 +115,7 @@ export const startRepl = (stopsPath: string, timetablePath: string) => {
           console.log(`Destination not reachable`);
         } else {
           console.log(
-            `Arriving to ${toStop.name} at ${arrivalTime.arrival.toString()} with ${arrivalTime.legNumber - 1} transfers from ${stopsIndex.findStopById(arrivalTime.origin)?.name}.`,
+            `Arriving to ${toStop.name} at ${arrivalTime.arrival.toString()} with ${arrivalTime.legNumber - 1} transfers from ${fromStop.name}.`,
           );
         }
         const bestRoute = result.bestRoute(toStop.sourceStopId);
@@ -212,4 +214,246 @@ export const startRepl = (stopsPath: string, timetablePath: string) => {
       this.displayPrompt();
     },
   });
+
+  const formatPickupDropoffType = (type: string): string => {
+    switch (type) {
+      case 'REGULAR':
+        return 'R';
+      case 'NOT_AVAILABLE':
+        return 'N';
+      case 'MUST_PHONE_AGENCY':
+        return 'A';
+      case 'MUST_COORDINATE_WITH_DRIVER':
+        return 'D';
+      default:
+        return '?';
+    }
+  };
+
+  replServer.defineCommand('inspect', {
+    help: 'Inspect a route or stop using .inspect route <routeId> or .inspect stop <stopId>',
+    action(inspectQuery: string) {
+      this.clearBufferedCommand();
+
+      const parts = inspectQuery.trim().split(' ');
+      if (parts.length !== 2) {
+        console.log(
+          'Usage: .inspect route <routeId> or .inspect stop <stopId>',
+        );
+        this.displayPrompt();
+        return;
+      }
+
+      const [type, idStr] = parts;
+      if (type !== 'route' && type !== 'stop') {
+        console.log(
+          'Usage: .inspect route <routeId> or .inspect stop <stopId>',
+        );
+        this.displayPrompt();
+        return;
+      }
+
+      const inspectRoute = (routeIdStr: string) => {
+        const routeId = parseInt(routeIdStr.trim());
+        if (isNaN(routeId)) {
+          console.log('Usage: .inspect route <routeId>');
+          return;
+        }
+
+        const route = timetable.getRoute(routeId);
+        if (!route) {
+          console.log(`Route ${routeId} not found`);
+          return;
+        }
+
+        const serviceRouteInfo = timetable.getServiceRouteInfo(route);
+        const routeName = serviceRouteInfo.name;
+        const routeType = serviceRouteInfo.type;
+
+        console.log(`\n=== Route ${routeId} ===`);
+        console.log(`Service Route: ${routeName}`);
+        console.log(`Type: ${routeType}`);
+        console.log(`Number of stops: ${route.getNbStops()}`);
+        console.log(`Number of trips: ${route.getNbTrips()}`);
+
+        console.log('\n--- Stops ---');
+        for (let i = 0; i < route.stops.length; i++) {
+          const stopId = route.stopId(i);
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          const stop = stopsIndex.findStopById(stopId)!;
+          const platform = stop.platform ? ` (Pl. ${stop.platform})` : '';
+          console.log(
+            `${i + 1}. ${stop.name}${platform} (${stopId}, ${stop.sourceStopId})`,
+          );
+        }
+
+        console.log('\n--- Trips ---');
+        for (let tripIndex = 0; tripIndex < route.getNbTrips(); tripIndex++) {
+          console.log(`\nTrip ${tripIndex}:`);
+          for (let stopIndex = 0; stopIndex < route.stops.length; stopIndex++) {
+            const stopId = route.stopId(stopIndex);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const stop = stopsIndex.findStopById(stopId)!;
+
+            const departure = route.departureFrom(stopIndex, tripIndex);
+            const arrival = route.arrivalAt(stopIndex, tripIndex);
+            const pickupType = route.pickUpTypeFrom(stopIndex, tripIndex);
+            const dropOffType = route.dropOffTypeAt(stopIndex, tripIndex);
+
+            const pickupStr = formatPickupDropoffType(pickupType);
+            const dropOffStr = formatPickupDropoffType(dropOffType);
+
+            console.log(
+              `  ${stopIndex + 1}. ${stop.name}: arr ${arrival.toString()} (${pickupStr}) → dep ${departure.toString()} (${dropOffStr})`,
+            );
+          }
+        }
+
+        console.log();
+      };
+
+      const inspectStop = (stopIdStr: string) => {
+        let stop: Stop | undefined;
+        const stopBySourceId = stopsIndex.findStopBySourceStopId(stopIdStr);
+        if (stopBySourceId !== undefined) {
+          stop = stopBySourceId;
+        } else if (!isNaN(Number(stopIdStr))) {
+          const stopById = stopsIndex.findStopById(Number(stopIdStr));
+          if (stopById !== undefined) {
+            stop = stopById;
+          }
+        } else {
+          const stops = stopsIndex.findStopsByName(stopIdStr);
+          if (stops.length > 0) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            stop = stops[0]!;
+          }
+        }
+
+        if (!stop) {
+          console.log(`Stop not found: ${stopIdStr}`);
+          return;
+        }
+
+        console.log(`\n=== Stop ${stop.id} ===`);
+        console.log(`Name: ${stop.name}`);
+        if (stop.platform) {
+          console.log(`Platform: ${stop.platform}`);
+        }
+        console.log(`Source ID: ${stop.sourceStopId}`);
+
+        const routes: Route[] = timetable.routesPassingThrough(stop.id);
+        console.log(`Number of routes: ${routes.length}`);
+
+        const equivalentStops = stopsIndex
+          .equivalentStops(stop.sourceStopId)
+          .filter((equivStop) => equivStop.id !== stop.id);
+        console.log(`Number of equivalent stops: ${equivalentStops.length}`);
+
+        if (equivalentStops.length > 0) {
+          console.log('\n--- Equivalent Stops ---');
+          equivalentStops.forEach((equivStop, index) => {
+            const platform = equivStop.platform
+              ? ` (Pl. ${equivStop.platform})`
+              : '';
+            console.log(
+              `${index + 1}. ${equivStop.name}${platform} (${equivStop.id}, ${equivStop.sourceStopId})`,
+            );
+          });
+        }
+
+        if (routes.length > 0) {
+          console.log('\n--- Routes ---');
+          routes.forEach((route, index) => {
+            const serviceRouteInfo = timetable.getServiceRouteInfo(route);
+            console.log(
+              `${index + 1}. Route ${route.id}: ${serviceRouteInfo.name} (${serviceRouteInfo.type})`,
+            );
+          });
+        }
+
+        const transfers = timetable.getTransfers(stop.id);
+        console.log(`Number of transfers: ${transfers.length}`);
+
+        if (transfers.length > 0) {
+          console.log('\n--- Transfers ---');
+          transfers.forEach((transfer, index) => {
+            const destStop = stopsIndex.findStopById(transfer.destination);
+            const platform = destStop?.platform
+              ? ` (Pl. ${destStop.platform})`
+              : '';
+            const minTime = transfer.minTransferTime
+              ? ` (min: ${Math.floor(transfer.minTransferTime.toSeconds() / 60)}min)`
+              : '';
+            console.log(
+              `${index + 1}. ${transfer.type} to ${destStop?.name ?? 'Unknown'}${platform} (${transfer.destination}, ${destStop?.sourceStopId ?? 'N/A'})${minTime}`,
+            );
+          });
+        }
+
+        let totalContinuations = 0;
+        console.log('\n--- Trip Continuations ---');
+
+        routes.forEach((route: Route) => {
+          const serviceRouteInfo = timetable.getServiceRouteInfo(route);
+          const stopIndices = route.stopRouteIndices(stop.id);
+
+          for (let tripIndex = 0; tripIndex < route.getNbTrips(); tripIndex++) {
+            for (const stopIndex of stopIndices) {
+              const continuations = timetable.getContinuousTrips(
+                stopIndex,
+                route.id,
+                tripIndex,
+              );
+
+              for (const continuation of continuations) {
+                totalContinuations++;
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const destRoute = timetable.getRoute(continuation.routeId)!;
+                const destStopId = destRoute.stopId(
+                  continuation.hopOnStopIndex,
+                );
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const destStop = stopsIndex.findStopById(destStopId)!;
+                const destPlatform = destStop.platform
+                  ? ` (Pl. ${destStop.platform})`
+                  : '';
+
+                const destServiceRouteInfo =
+                  timetable.getServiceRouteInfo(destRoute);
+
+                const originTime = route.departureFrom(stopIndex, tripIndex);
+                const continuationTime = destRoute.departureFrom(
+                  continuation.hopOnStopIndex,
+                  continuation.tripIndex,
+                );
+
+                console.log(
+                  `${totalContinuations}. From Route ${route.id} (${serviceRouteInfo.name}) Trip ${tripIndex} at ${originTime.toString()} → ` +
+                    `Route ${continuation.routeId} (${destServiceRouteInfo.name}) Trip ${continuation.tripIndex} at ${continuationTime.toString()} ` +
+                    `at ${destStop.name}${destPlatform} (${destStopId}, ${destStop.sourceStopId})`,
+                );
+              }
+            }
+          }
+        });
+
+        if (totalContinuations === 0) {
+          console.log('No trip continuations found.');
+        } else {
+          console.log(`\nTotal trip continuations: ${totalContinuations}`);
+        }
+
+        console.log();
+      };
+
+      if (type === 'route') {
+        inspectRoute(idStr ?? '');
+      } else {
+        inspectStop(idStr ?? '');
+      }
+
+      this.displayPrompt();
+    },
+  });
 };

package/src/gtfs/__tests__/parser.test.ts

@@ -38,12 +38,27 @@ describe('GTFS parser', () => {
     const bullfrogId = stopsIndex.findStopBySourceStopId('BULLFROG')?.id;
     assert(beattyAirportId !== undefined && bullfrogId !== undefined);
     assert.strictEqual(route.getNbStops(), 2);
-    assert(route.arrivalAt(beattyAirportId, 0).equals(Time.fromHMS(8, 0, 0)));
+
+    const beattyAirportStopIndex = route.stopRouteIndices(beattyAirportId)[0];
+    const bullfrogStopIndex = route.stopRouteIndices(bullfrogId)[0];
+    assert(
+      beattyAirportStopIndex !== undefined && bullfrogStopIndex !== undefined,
+    );
+
+    assert(
+      route.arrivalAt(beattyAirportStopIndex, 0).equals(Time.fromHMS(8, 0, 0)),
+    );
+    assert(
+      route
+        .departureFrom(beattyAirportStopIndex, 0)
+        .equals(Time.fromHMS(8, 0, 0)),
+    );
+    assert(
+      route.arrivalAt(bullfrogStopIndex, 0).equals(Time.fromHMS(8, 10, 0)),
+    );
     assert(
-      route.departureFrom(beattyAirportId, 0).equals(Time.fromHMS(8, 0, 0)),
+      route.departureFrom(bullfrogStopIndex, 0).equals(Time.fromHMS(8, 15, 0)),
     );
-    assert(route.arrivalAt(bullfrogId, 0).equals(Time.fromHMS(8, 10, 0)));
-    assert(route.departureFrom(bullfrogId, 0).equals(Time.fromHMS(8, 15, 0)));
 
     const routes = timetable.routesPassingThrough(furCreekResId);
     assert.strictEqual(routes.length, 2);