minotor 5.0.1 → 6.0.0

package/src/timetable/timetable.ts

@@ -25,15 +25,12 @@ export type Transfer = {
   minTransferTime?: Duration;
 };
 
-export type StopsAdjacency = Map<
-  StopId,
-  {
-    transfers: Transfer[];
-    routes: RouteId[];
-  }
->;
+export type StopAdjacency = {
+  transfers: Transfer[];
+  routes: RouteId[];
+};
 
-export type ServiceRouteId = string;
+export type ServiceRouteId = number;
 
 export type RouteType =
   | 'TRAM'
@@ -47,18 +44,16 @@ export type RouteType =
   | 'TROLLEYBUS'
   | 'MONORAIL';
 
-type ServiceRoute = {
+// A service refers to a collection of trips that are displayed to riders as a single service.
+// As opposed to a route which consists of the subset of trips from a service which shares the same list of stops.
+// Service is here a synonym for route in the GTFS sense.
+export type ServiceRoute = {
   type: RouteType;
   name: string;
   routes: RouteId[];
 };
 export type ServiceRouteInfo = Omit<ServiceRoute, 'routes'>;
 
-// A service refers to a collection of trips that are displayed to riders as a single service.
-// As opposed to a route which consists of the subset of trips from a service which shares the same list of stops.
-// Service is here a synonym for route in the GTFS sense.
-export type ServiceRoutesMap = Map<ServiceRouteId, ServiceRoute>;
-
 export const ALL_TRANSPORT_MODES: Set<RouteType> = new Set([
   'TRAM',
   'SUBWAY',
@@ -72,24 +67,33 @@ export const ALL_TRANSPORT_MODES: Set<RouteType> = new Set([
   'MONORAIL',
 ]);
 
-export const CURRENT_VERSION = '0.0.5';
+export const CURRENT_VERSION = '0.0.6';
 
 /**
  * The internal transit timetable format.
  */
 export class Timetable {
-  private readonly stopsAdjacency: StopsAdjacency;
+  private readonly stopsAdjacency: StopAdjacency[];
   private readonly routesAdjacency: Route[];
-  private readonly routes: ServiceRoutesMap;
+  private readonly serviceRoutes: ServiceRoute[];
+  private readonly activeStops: Set<StopId>;
 
   constructor(
-    stopsAdjacency: StopsAdjacency,
+    stopsAdjacency: StopAdjacency[],
     routesAdjacency: Route[],
-    routes: ServiceRoutesMap,
+    routes: ServiceRoute[],
   ) {
     this.stopsAdjacency = stopsAdjacency;
     this.routesAdjacency = routesAdjacency;
-    this.routes = routes;
+    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) {
+        this.activeStops.add(i);
+      }
+    }
   }
 
   /**
@@ -102,7 +106,7 @@ export class Timetable {
       version: CURRENT_VERSION,
       stopsAdjacency: serializeStopsAdjacency(this.stopsAdjacency),
       routesAdjacency: serializeRoutesAdjacency(this.routesAdjacency),
-      routes: serializeServiceRoutesMap(this.routes),
+      serviceRoutes: serializeServiceRoutesMap(this.serviceRoutes),
     };
     const writer = new BinaryWriter();
     ProtoTimetable.encode(protoTimetable, writer);
@@ -124,14 +128,25 @@ export class Timetable {
       );
     }
     return new Timetable(
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      deserializeStopsAdjacency(protoTimetable.stopsAdjacency!),
+      deserializeStopsAdjacency(protoTimetable.stopsAdjacency),
       deserializeRoutesAdjacency(protoTimetable.routesAdjacency),
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      deserializeServiceRoutesMap(protoTimetable.routes!),
+
+      deserializeServiceRoutesMap(protoTimetable.serviceRoutes),
     );
   }
 
+  /**
+   * Checks if the given stop is active on the timetable.
+   * An active stop is a stop reached by a route that is active on the timetable
+   * or by a transfer reachable from an active route.
+   *
+   * @param stopId - The ID of the stop to check.
+   * @returns True if the stop is active, false otherwise.
+   */
+  isActive(stopId: StopId): boolean {
+    return this.activeStops.has(stopId);
+  }
+
   /**
    * Retrieves the route associated with the given route ID.
    *
@@ -150,7 +165,7 @@ export class Timetable {
    * @returns An array of transfer options available at the stop.
    */
   getTransfers(stopId: StopId): Transfer[] {
-    return this.stopsAdjacency.get(stopId)?.transfers ?? [];
+    return this.stopsAdjacency[stopId]?.transfers ?? [];
   }
 
   /**
@@ -162,7 +177,7 @@ export class Timetable {
    * @returns The service route corresponding to the provided route.
    */
   getServiceRouteInfo(route: Route): ServiceRouteInfo {
-    const serviceRoute = this.routes.get(route.serviceRoute());
+    const serviceRoute = this.serviceRoutes[route.serviceRoute()];
     if (!serviceRoute) {
       throw new Error(
         `Service route not found for route ID: ${route.serviceRoute()}`,
@@ -180,7 +195,7 @@ export class Timetable {
    * @returns An array of routes passing through the specified stop.
    */
   routesPassingThrough(stopId: StopId): Route[] {
-    const stopData = this.stopsAdjacency.get(stopId);
+    const stopData = this.stopsAdjacency[stopId];
     if (!stopData) {
       return [];
     }