minotor 7.0.1 → 8.0.0

package/src/timetable/timetable.ts

@@ -12,7 +12,8 @@ import {
   serializeStopsAdjacency,
 } from './io.js';
 import { Timetable as ProtoTimetable } from './proto/timetable.js';
-import { Route, RouteId } from './route.js';
+import { Route, RouteId, TripRouteIndex } from './route.js';
+import { encode, TripId } from './tripId.js';
 
 export type TransferType =
   | 'RECOMMENDED'
@@ -26,8 +27,15 @@ export type Transfer = {
   minTransferTime?: Duration;
 };
 
+export type TripBoarding = {
+  hopOnStop: StopId;
+  routeId: RouteId;
+  tripIndex: TripRouteIndex;
+};
+
 export type StopAdjacency = {
-  transfers: Transfer[];
+  transfers?: Transfer[];
+  tripContinuations?: Map<TripId, TripBoarding[]>;
   routes: RouteId[];
 };
 
@@ -68,7 +76,9 @@ export const ALL_TRANSPORT_MODES: Set<RouteType> = new Set([
   'MONORAIL',
 ]);
 
-export const CURRENT_VERSION = '0.0.7';
+const EMPTY_TRIP_CONTINUATIONS: TripBoarding[] = [];
+
+export const CURRENT_VERSION = '0.0.8';
 
 /**
  * The internal transit timetable format.
@@ -89,9 +99,12 @@ export class Timetable {
     this.serviceRoutes = routes;
     this.activeStops = new Set<StopId>();
     for (let i = 0; i < stopsAdjacency.length; i++) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const stop = stopsAdjacency[i]!;
-      if (stop.routes.length > 0 || stop.transfers.length > 0) {
+      if (
+        stop.routes.length > 0 ||
+        (stop.transfers && stop.transfers.length > 0) ||
+        (stop.tripContinuations && stop.tripContinuations.size > 0)
+      ) {
         this.activeStops.add(i);
       }
     }
@@ -166,7 +179,33 @@ export class Timetable {
    * @returns An array of transfer options available at the stop.
    */
   getTransfers(stopId: StopId): Transfer[] {
-    return this.stopsAdjacency[stopId]?.transfers ?? [];
+    const stopAdjacency = this.stopsAdjacency[stopId];
+    if (!stopAdjacency) {
+      throw new Error(`Stop ID ${stopId} not found`);
+    }
+    return stopAdjacency.transfers || [];
+  }
+
+  /**
+   * Retrieves all trip continuation options available at the specified stop for a given trip.
+   *
+   * @param stopId - The ID of the stop to get trip continuations for.
+   * @param tripIndex - The index of the trip to get continuations for.
+   * @returns An array of trip continuation options available at the stop for the specified trip.
+   */
+  getContinuousTrips(
+    stopId: StopId,
+    routeId: RouteId,
+    tripIndex: TripRouteIndex,
+  ): TripBoarding[] {
+    const stopAdjacency = this.stopsAdjacency[stopId];
+    if (!stopAdjacency) {
+      throw new Error(`Stop ID ${stopId} not found`);
+    }
+    return (
+      stopAdjacency.tripContinuations?.get(encode(routeId, tripIndex)) ||
+      EMPTY_TRIP_CONTINUATIONS
+    );
   }
 
   /**
@@ -184,9 +223,7 @@ export class Timetable {
         `Service route not found for route ID: ${route.serviceRoute()}`,
       );
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { routes, ...serviceRouteInfo } = serviceRoute;
-    return serviceRouteInfo;
+    return { type: serviceRoute.type, name: serviceRoute.name };
   }
 
   /**

package/src/timetable/tripId.ts

@@ -0,0 +1,29 @@
+import { RouteId, TripRouteIndex } from './route.js';
+
+// const ROUTE_ID_BITS = 17;
+const TRIP_INDEX_BITS = 15;
+const TRIP_INDEX_MASK = (1 << TRIP_INDEX_BITS) - 1;
+
+// A TripId encodes a route ID and trip index into a value
+export type TripId = number;
+
+/**
+ * Encodes a route ID and trip index into a single trip ID.
+ * @param routeId - The route identifier, needs to fit on 17 bits
+ * @param tripIndex - The index of the trip within the route, needs to fit on 15 bits
+ * @returns The encoded trip ID
+ */
+export const encode = (routeId: RouteId, tripIndex: TripRouteIndex): TripId => {
+  return (routeId << TRIP_INDEX_BITS) | tripIndex;
+};
+
+/**
+ * Decodes a trip ID back into its constituent route ID and trip index.
+ * @param tripId - The encoded trip ID
+ * @returns A tuple containing the route ID and trip index
+ */
+export const decode = (tripId: TripId): [RouteId, TripRouteIndex] => {
+  const routeId = tripId >>> TRIP_INDEX_BITS;
+  const tripIndex = tripId & TRIP_INDEX_MASK;
+  return [routeId, tripIndex];
+};