minotor 8.0.0 → 9.0.0

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

@@ -0,0 +1,57 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+
+import { RouteId, StopRouteIndex, TripRouteIndex } from '../route.js';
+import {
+  decode,
+  encode,
+  getRouteId,
+  getStopIndex,
+  getTripIndex,
+} from '../tripBoardingId.js';
+
+describe('tripBoardingId', () => {
+  it('should maintain identity for encode/decode round-trip', () => {
+    const testCases: [StopRouteIndex, RouteId, TripRouteIndex][] = [
+      [0, 0, 0],
+      [1, 1, 1],
+      [500, 1000, 500],
+      [100000, 200000, 300000],
+      [0, 1048575, 0],
+      [1048575, 0, 1048575],
+      [1048575, 1048575, 1048575], // Maximum values (2^20 - 1)
+    ];
+
+    testCases.forEach(([stopIndex, routeId, tripIndex]) => {
+      const tripBoardingId = encode(stopIndex, routeId, tripIndex);
+      const [decodedStopIndex, decodedRouteId, decodedTripIndex] =
+        decode(tripBoardingId);
+
+      assert.strictEqual(decodedStopIndex, stopIndex);
+      assert.strictEqual(decodedRouteId, routeId);
+      assert.strictEqual(decodedTripIndex, tripIndex);
+    });
+  });
+
+  it('should extract stop index correctly', () => {
+    const tripBoardingId = encode(42, 100, 200);
+    assert.strictEqual(getStopIndex(tripBoardingId), 42);
+  });
+
+  it('should extract route ID correctly', () => {
+    const tripBoardingId = encode(42, 100, 200);
+    assert.strictEqual(getRouteId(tripBoardingId), 100);
+  });
+
+  it('should extract trip index correctly', () => {
+    const tripBoardingId = encode(42, 100, 200);
+    assert.strictEqual(getTripIndex(tripBoardingId), 200);
+  });
+
+  it('should throw error for values exceeding 20-bit limit', () => {
+    const maxValue = 1048575; // 2^20 - 1
+    assert.throws(() => encode(maxValue + 1, 0, 0));
+    assert.throws(() => encode(0, maxValue + 1, 0));
+    assert.throws(() => encode(0, 0, maxValue + 1));
+  });
+});

package/src/timetable/io.ts

@@ -16,7 +16,9 @@ import {
   Transfer,
   TransferType,
   TripBoarding,
+  TripContinuations,
 } from './timetable.js';
+import { decode, encode, TripBoardingId } from './tripBoardingId.js';
 
 export type SerializedRoute = {
   stopTimes: Uint16Array;
@@ -137,9 +139,6 @@ export const serializeStopsAdjacency = (
           }))
         : [],
       routes: value.routes,
-      tripContinuations: value.tripContinuations
-        ? serializeTripContinuations(value.tripContinuations)
-        : [],
     };
   });
 };
@@ -205,13 +204,6 @@ export const deserializeStopsAdjacency = (
       stopAdjacency.transfers = transfers;
     }
 
-    const deserializedTripContinuations = deserializeTripContinuations(
-      value.tripContinuations,
-    );
-    if (deserializedTripContinuations.size > 0) {
-      stopAdjacency.tripContinuations = deserializedTripContinuations;
-    }
-
     result.push(stopAdjacency);
   }
 
@@ -341,15 +333,19 @@ const serializeRouteType = (type: RouteType): ProtoRouteType => {
 };
 
 export const serializeTripContinuations = (
-  tripContinuations: Map<number, TripBoarding[]>,
+  tripContinuations: TripContinuations,
 ): ProtoTripContinuationEntry[] => {
   const result: ProtoTripContinuationEntry[] = [];
+  for (const [tripBoardingId, boardings] of tripContinuations.entries()) {
+    const [originStopIndex, originRouteId, originTripIndex] =
+      decode(tripBoardingId);
 
-  for (const [key, value] of tripContinuations.entries()) {
     result.push({
-      key: key,
-      value: value.map((tripBoarding) => ({
-        hopOnStop: tripBoarding.hopOnStop,
+      originStopIndex,
+      originRouteId,
+      originTripIndex,
+      continuations: boardings.map((tripBoarding) => ({
+        hopOnStopIndex: tripBoarding.hopOnStopIndex,
         routeId: tripBoarding.routeId,
         tripIndex: tripBoarding.tripIndex,
       })),
@@ -361,21 +357,26 @@ export const serializeTripContinuations = (
 
 export const deserializeTripContinuations = (
   protoTripContinuations: ProtoTripContinuationEntry[],
-): Map<number, TripBoarding[]> => {
-  const result = new Map<number, TripBoarding[]>();
+): TripContinuations => {
+  const result = new Map<TripBoardingId, TripBoarding[]>();
 
   for (let i = 0; i < protoTripContinuations.length; i++) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const entry = protoTripContinuations[i]!;
-    const tripBoardings: TripBoarding[] = entry.value.map(
+    const tripBoardingId = encode(
+      entry.originStopIndex,
+      entry.originRouteId,
+      entry.originTripIndex,
+    );
+    const tripBoardings: TripBoarding[] = entry.continuations.map(
       (protoTripBoarding) => ({
-        hopOnStop: protoTripBoarding.hopOnStop,
+        hopOnStopIndex: protoTripBoarding.hopOnStopIndex,
         routeId: protoTripBoarding.routeId,
         tripIndex: protoTripBoarding.tripIndex,
       }),
     );
 
-    result.set(entry.key, tripBoardings);
+    result.set(tripBoardingId, tripBoardings);
   }
 
   return result;

package/src/timetable/proto/timetable.proto

@@ -41,20 +41,21 @@ message Transfer {
 }
 
 message TripBoarding {
-  uint32 hopOnStop = 1;
+  uint32 hopOnStopIndex = 1;
   uint32 routeId = 2;
   uint32 tripIndex = 3;
 }
 
 message TripContinuationEntry {
-  uint32 key = 1;
-  repeated TripBoarding value = 2;
+  uint32 originStopIndex = 1;
+  uint32 originRouteId = 2;
+  uint32 originTripIndex = 3;
+  repeated TripBoarding continuations = 4;
 }
 
 message StopAdjacency {
   repeated uint32 routes = 1;
   repeated Transfer transfers = 2;
-  repeated TripContinuationEntry tripContinuations = 3;
 }
 
 enum RouteType {
@@ -81,4 +82,5 @@ message Timetable {
   repeated StopAdjacency stopsAdjacency = 2;
   repeated Route routesAdjacency = 3;
   repeated ServiceRoute serviceRoutes = 4;
+  repeated TripContinuationEntry tripContinuations = 5;
 }

package/src/timetable/proto/timetable.ts

@@ -167,20 +167,21 @@ export interface Transfer {
 }
 
 export interface TripBoarding {
-  hopOnStop: number;
+  hopOnStopIndex: number;
   routeId: number;
   tripIndex: number;
 }
 
 export interface TripContinuationEntry {
-  key: number;
-  value: TripBoarding[];
+  originStopIndex: number;
+  originRouteId: number;
+  originTripIndex: number;
+  continuations: TripBoarding[];
 }
 
 export interface StopAdjacency {
   routes: number[];
   transfers: Transfer[];
-  tripContinuations: TripContinuationEntry[];
 }
 
 export interface ServiceRoute {
@@ -194,6 +195,7 @@ export interface Timetable {
   stopsAdjacency: StopAdjacency[];
   routesAdjacency: Route[];
   serviceRoutes: ServiceRoute[];
+  tripContinuations: TripContinuationEntry[];
 }
 
 function createBaseRoute(): Route {
@@ -404,13 +406,13 @@ export const Transfer: MessageFns<Transfer> = {
 };
 
 function createBaseTripBoarding(): TripBoarding {
-  return { hopOnStop: 0, routeId: 0, tripIndex: 0 };
+  return { hopOnStopIndex: 0, routeId: 0, tripIndex: 0 };
 }
 
 export const TripBoarding: MessageFns<TripBoarding> = {
   encode(message: TripBoarding, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.hopOnStop !== 0) {
-      writer.uint32(8).uint32(message.hopOnStop);
+    if (message.hopOnStopIndex !== 0) {
+      writer.uint32(8).uint32(message.hopOnStopIndex);
     }
     if (message.routeId !== 0) {
       writer.uint32(16).uint32(message.routeId);
@@ -433,7 +435,7 @@ export const TripBoarding: MessageFns<TripBoarding> = {
             break;
           }
 
-          message.hopOnStop = reader.uint32();
+          message.hopOnStopIndex = reader.uint32();
           continue;
         }
         case 2: {
@@ -463,7 +465,7 @@ export const TripBoarding: MessageFns<TripBoarding> = {
 
   fromJSON(object: any): TripBoarding {
     return {
-      hopOnStop: isSet(object.hopOnStop) ? globalThis.Number(object.hopOnStop) : 0,
+      hopOnStopIndex: isSet(object.hopOnStopIndex) ? globalThis.Number(object.hopOnStopIndex) : 0,
       routeId: isSet(object.routeId) ? globalThis.Number(object.routeId) : 0,
       tripIndex: isSet(object.tripIndex) ? globalThis.Number(object.tripIndex) : 0,
     };
@@ -471,8 +473,8 @@ export const TripBoarding: MessageFns<TripBoarding> = {
 
   toJSON(message: TripBoarding): unknown {
     const obj: any = {};
-    if (message.hopOnStop !== 0) {
-      obj.hopOnStop = Math.round(message.hopOnStop);
+    if (message.hopOnStopIndex !== 0) {
+      obj.hopOnStopIndex = Math.round(message.hopOnStopIndex);
     }
     if (message.routeId !== 0) {
       obj.routeId = Math.round(message.routeId);
@@ -488,7 +490,7 @@ export const TripBoarding: MessageFns<TripBoarding> = {
   },
   fromPartial<I extends Exact<DeepPartial<TripBoarding>, I>>(object: I): TripBoarding {
     const message = createBaseTripBoarding();
-    message.hopOnStop = object.hopOnStop ?? 0;
+    message.hopOnStopIndex = object.hopOnStopIndex ?? 0;
     message.routeId = object.routeId ?? 0;
     message.tripIndex = object.tripIndex ?? 0;
     return message;
@@ -496,16 +498,22 @@ export const TripBoarding: MessageFns<TripBoarding> = {
 };
 
 function createBaseTripContinuationEntry(): TripContinuationEntry {
-  return { key: 0, value: [] };
+  return { originStopIndex: 0, originRouteId: 0, originTripIndex: 0, continuations: [] };
 }
 
 export const TripContinuationEntry: MessageFns<TripContinuationEntry> = {
   encode(message: TripContinuationEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.key !== 0) {
-      writer.uint32(8).uint32(message.key);
+    if (message.originStopIndex !== 0) {
+      writer.uint32(8).uint32(message.originStopIndex);
+    }
+    if (message.originRouteId !== 0) {
+      writer.uint32(16).uint32(message.originRouteId);
+    }
+    if (message.originTripIndex !== 0) {
+      writer.uint32(24).uint32(message.originTripIndex);
     }
-    for (const v of message.value) {
-      TripBoarding.encode(v!, writer.uint32(18).fork()).join();
+    for (const v of message.continuations) {
+      TripBoarding.encode(v!, writer.uint32(34).fork()).join();
     }
     return writer;
   },
@@ -522,15 +530,31 @@ export const TripContinuationEntry: MessageFns<TripContinuationEntry> = {
             break;
           }
 
-          message.key = reader.uint32();
+          message.originStopIndex = reader.uint32();
           continue;
         }
         case 2: {
-          if (tag !== 18) {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.originRouteId = reader.uint32();
+          continue;
+        }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+
+          message.originTripIndex = reader.uint32();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
             break;
           }
 
-          message.value.push(TripBoarding.decode(reader, reader.uint32()));
+          message.continuations.push(TripBoarding.decode(reader, reader.uint32()));
           continue;
         }
       }
@@ -544,18 +568,28 @@ export const TripContinuationEntry: MessageFns<TripContinuationEntry> = {
 
   fromJSON(object: any): TripContinuationEntry {
     return {
-      key: isSet(object.key) ? globalThis.Number(object.key) : 0,
-      value: globalThis.Array.isArray(object?.value) ? object.value.map((e: any) => TripBoarding.fromJSON(e)) : [],
+      originStopIndex: isSet(object.originStopIndex) ? globalThis.Number(object.originStopIndex) : 0,
+      originRouteId: isSet(object.originRouteId) ? globalThis.Number(object.originRouteId) : 0,
+      originTripIndex: isSet(object.originTripIndex) ? globalThis.Number(object.originTripIndex) : 0,
+      continuations: globalThis.Array.isArray(object?.continuations)
+        ? object.continuations.map((e: any) => TripBoarding.fromJSON(e))
+        : [],
     };
   },
 
   toJSON(message: TripContinuationEntry): unknown {
     const obj: any = {};
-    if (message.key !== 0) {
-      obj.key = Math.round(message.key);
+    if (message.originStopIndex !== 0) {
+      obj.originStopIndex = Math.round(message.originStopIndex);
     }
-    if (message.value?.length) {
-      obj.value = message.value.map((e) => TripBoarding.toJSON(e));
+    if (message.originRouteId !== 0) {
+      obj.originRouteId = Math.round(message.originRouteId);
+    }
+    if (message.originTripIndex !== 0) {
+      obj.originTripIndex = Math.round(message.originTripIndex);
+    }
+    if (message.continuations?.length) {
+      obj.continuations = message.continuations.map((e) => TripBoarding.toJSON(e));
     }
     return obj;
   },
@@ -565,14 +599,16 @@ export const TripContinuationEntry: MessageFns<TripContinuationEntry> = {
   },
   fromPartial<I extends Exact<DeepPartial<TripContinuationEntry>, I>>(object: I): TripContinuationEntry {
     const message = createBaseTripContinuationEntry();
-    message.key = object.key ?? 0;
-    message.value = object.value?.map((e) => TripBoarding.fromPartial(e)) || [];
+    message.originStopIndex = object.originStopIndex ?? 0;
+    message.originRouteId = object.originRouteId ?? 0;
+    message.originTripIndex = object.originTripIndex ?? 0;
+    message.continuations = object.continuations?.map((e) => TripBoarding.fromPartial(e)) || [];
     return message;
   },
 };
 
 function createBaseStopAdjacency(): StopAdjacency {
-  return { routes: [], transfers: [], tripContinuations: [] };
+  return { routes: [], transfers: [] };
 }
 
 export const StopAdjacency: MessageFns<StopAdjacency> = {
@@ -585,9 +621,6 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
     for (const v of message.transfers) {
       Transfer.encode(v!, writer.uint32(18).fork()).join();
     }
-    for (const v of message.tripContinuations) {
-      TripContinuationEntry.encode(v!, writer.uint32(26).fork()).join();
-    }
     return writer;
   },
 
@@ -624,14 +657,6 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
           message.transfers.push(Transfer.decode(reader, reader.uint32()));
           continue;
         }
-        case 3: {
-          if (tag !== 26) {
-            break;
-          }
-
-          message.tripContinuations.push(TripContinuationEntry.decode(reader, reader.uint32()));
-          continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -647,9 +672,6 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
       transfers: globalThis.Array.isArray(object?.transfers)
         ? object.transfers.map((e: any) => Transfer.fromJSON(e))
         : [],
-      tripContinuations: globalThis.Array.isArray(object?.tripContinuations)
-        ? object.tripContinuations.map((e: any) => TripContinuationEntry.fromJSON(e))
-        : [],
     };
   },
 
@@ -661,9 +683,6 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
     if (message.transfers?.length) {
       obj.transfers = message.transfers.map((e) => Transfer.toJSON(e));
     }
-    if (message.tripContinuations?.length) {
-      obj.tripContinuations = message.tripContinuations.map((e) => TripContinuationEntry.toJSON(e));
-    }
     return obj;
   },
 
@@ -674,7 +693,6 @@ export const StopAdjacency: MessageFns<StopAdjacency> = {
     const message = createBaseStopAdjacency();
     message.routes = object.routes?.map((e) => e) || [];
     message.transfers = object.transfers?.map((e) => Transfer.fromPartial(e)) || [];
-    message.tripContinuations = object.tripContinuations?.map((e) => TripContinuationEntry.fromPartial(e)) || [];
     return message;
   },
 };
@@ -784,7 +802,7 @@ export const ServiceRoute: MessageFns<ServiceRoute> = {
 };
 
 function createBaseTimetable(): Timetable {
-  return { version: "", stopsAdjacency: [], routesAdjacency: [], serviceRoutes: [] };
+  return { version: "", stopsAdjacency: [], routesAdjacency: [], serviceRoutes: [], tripContinuations: [] };
 }
 
 export const Timetable: MessageFns<Timetable> = {
@@ -801,6 +819,9 @@ export const Timetable: MessageFns<Timetable> = {
     for (const v of message.serviceRoutes) {
       ServiceRoute.encode(v!, writer.uint32(34).fork()).join();
     }
+    for (const v of message.tripContinuations) {
+      TripContinuationEntry.encode(v!, writer.uint32(42).fork()).join();
+    }
     return writer;
   },
 
@@ -843,6 +864,14 @@ export const Timetable: MessageFns<Timetable> = {
           message.serviceRoutes.push(ServiceRoute.decode(reader, reader.uint32()));
           continue;
         }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+
+          message.tripContinuations.push(TripContinuationEntry.decode(reader, reader.uint32()));
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -864,6 +893,9 @@ export const Timetable: MessageFns<Timetable> = {
       serviceRoutes: globalThis.Array.isArray(object?.serviceRoutes)
         ? object.serviceRoutes.map((e: any) => ServiceRoute.fromJSON(e))
         : [],
+      tripContinuations: globalThis.Array.isArray(object?.tripContinuations)
+        ? object.tripContinuations.map((e: any) => TripContinuationEntry.fromJSON(e))
+        : [],
     };
   },
 
@@ -881,6 +913,9 @@ export const Timetable: MessageFns<Timetable> = {
     if (message.serviceRoutes?.length) {
       obj.serviceRoutes = message.serviceRoutes.map((e) => ServiceRoute.toJSON(e));
     }
+    if (message.tripContinuations?.length) {
+      obj.tripContinuations = message.tripContinuations.map((e) => TripContinuationEntry.toJSON(e));
+    }
     return obj;
   },
 
@@ -893,6 +928,7 @@ export const Timetable: MessageFns<Timetable> = {
     message.stopsAdjacency = object.stopsAdjacency?.map((e) => StopAdjacency.fromPartial(e)) || [];
     message.routesAdjacency = object.routesAdjacency?.map((e) => Route.fromPartial(e)) || [];
     message.serviceRoutes = object.serviceRoutes?.map((e) => ServiceRoute.fromPartial(e)) || [];
+    message.tripContinuations = object.tripContinuations?.map((e) => TripContinuationEntry.fromPartial(e)) || [];
     return message;
   },
 };