minotor 3.0.2 → 5.0.0

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

@@ -12,11 +12,7 @@ import {
 } from '../io.js';
 import { REGULAR, Route } from '../route.js';
 import { Time } from '../time.js';
-import {
-  RoutesAdjacency,
-  ServiceRoutesMap,
-  StopsAdjacency,
-} from '../timetable.js';
+import { ServiceRoutesMap, StopsAdjacency } from '../timetable.js';
 
 describe('Timetable IO', () => {
   const stopsAdjacency: StopsAdjacency = new Map([
@@ -24,7 +20,7 @@ describe('Timetable IO', () => {
       1,
       {
         transfers: [{ destination: 2, type: 'RECOMMENDED' }],
-        routes: ['route1'],
+        routes: [0],
       },
     ],
     [
@@ -37,45 +33,39 @@ describe('Timetable IO', () => {
             minTransferTime: Duration.fromMinutes(3),
           },
         ],
-        routes: ['route2'],
+        routes: [1],
       },
     ],
   ]);
-  const routesAdjacency: RoutesAdjacency = new Map([
-    [
-      'route1',
-      new Route(
-        new Uint16Array([
-          Time.fromHMS(16, 40, 0).toMinutes(),
-          Time.fromHMS(16, 50, 0).toMinutes(),
-        ]),
-        new Uint8Array([REGULAR, REGULAR]),
-        new Uint32Array([1, 2]),
-        'gtfs1',
-      ),
-    ],
-    [
-      'route2',
-      new Route(
-        new Uint16Array([
-          Time.fromHMS(15, 20, 0).toMinutes(),
-          Time.fromHMS(15, 30, 0).toMinutes(),
-        ]),
-        new Uint8Array([REGULAR, REGULAR]),
-        new Uint32Array([2, 1]),
-        'gtfs2',
-      ),
-    ],
-  ]);
+  const routesAdjacency = [
+    new Route(
+      new Uint16Array([
+        Time.fromHMS(16, 40, 0).toMinutes(),
+        Time.fromHMS(16, 50, 0).toMinutes(),
+      ]),
+      new Uint8Array([REGULAR, REGULAR]),
+      new Uint32Array([1, 2]),
+      'gtfs1',
+    ),
+    new Route(
+      new Uint16Array([
+        Time.fromHMS(15, 20, 0).toMinutes(),
+        Time.fromHMS(15, 30, 0).toMinutes(),
+      ]),
+      new Uint8Array([REGULAR, REGULAR]),
+      new Uint32Array([2, 1]),
+      'gtfs2',
+    ),
+  ];
   const routes: ServiceRoutesMap = new Map([
-    ['gtfs1', { type: 'RAIL', name: 'Route 1' }],
-    ['gtfs2', { type: 'RAIL', name: 'Route 2' }],
+    ['gtfs1', { type: 'RAIL', name: 'Route 1', routes: [0] }],
+    ['gtfs2', { type: 'RAIL', name: 'Route 2', routes: [1] }],
   ]);
   const stopsAdjacencyProto = {
     stops: {
       '1': {
         transfers: [{ destination: 2, type: 0 }],
-        routes: ['route1'],
+        routes: [0],
       },
       '2': {
         transfers: [
@@ -85,42 +75,40 @@ describe('Timetable IO', () => {
             minTransferTime: 180,
           },
         ],
-        routes: ['route2'],
+        routes: [1],
       },
     },
   };
 
-  const routesAdjacencyProto = {
-    routes: {
-      route1: {
-        stopTimes: new Uint8Array(
-          new Uint16Array([
-            Time.fromHMS(16, 40, 0).toMinutes(),
-            Time.fromHMS(16, 50, 0).toMinutes(),
-          ]).buffer,
-        ),
-        pickUpDropOffTypes: new Uint8Array([REGULAR, REGULAR]),
-        stops: new Uint8Array(new Uint32Array([1, 2]).buffer),
-        serviceRouteId: 'gtfs1',
-      },
-      route2: {
-        stopTimes: new Uint8Array(
-          new Uint16Array([
-            Time.fromHMS(15, 20, 0).toMinutes(),
-            Time.fromHMS(15, 30, 0).toMinutes(),
-          ]).buffer,
-        ),
-        pickUpDropOffTypes: new Uint8Array([REGULAR, REGULAR]),
-        stops: new Uint8Array(new Uint32Array([2, 1]).buffer),
-        serviceRouteId: 'gtfs2',
-      },
+  const routesAdjacencyProto = [
+    {
+      stopTimes: new Uint8Array(
+        new Uint16Array([
+          Time.fromHMS(16, 40, 0).toMinutes(),
+          Time.fromHMS(16, 50, 0).toMinutes(),
+        ]).buffer,
+      ),
+      pickUpDropOffTypes: new Uint8Array([REGULAR, REGULAR]),
+      stops: new Uint8Array(new Uint32Array([1, 2]).buffer),
+      serviceRouteId: 'gtfs1',
     },
-  };
+    {
+      stopTimes: new Uint8Array(
+        new Uint16Array([
+          Time.fromHMS(15, 20, 0).toMinutes(),
+          Time.fromHMS(15, 30, 0).toMinutes(),
+        ]).buffer,
+      ),
+      pickUpDropOffTypes: new Uint8Array([REGULAR, REGULAR]),
+      stops: new Uint8Array(new Uint32Array([2, 1]).buffer),
+      serviceRouteId: 'gtfs2',
+    },
+  ];
 
   const routesProto = {
     routes: {
-      gtfs1: { type: 2, name: 'Route 1' },
-      gtfs2: { type: 2, name: 'Route 2' },
+      gtfs1: { type: 2, name: 'Route 1', routes: [0] },
+      gtfs2: { type: 2, name: 'Route 2', routes: [1] },
     },
   };
 

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

@@ -1,6 +1,7 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 
+import { encodePickUpDropOffTypes } from '../../gtfs/trips.js';
 import {
   MUST_COORDINATE_WITH_DRIVER,
   MUST_PHONE_AGENCY,
@@ -29,23 +30,30 @@ describe('Route', () => {
     Time.fromHMS(10, 31, 0).toMinutes(),
   ]);
 
-  const pickUpDropOffTypes = new Uint8Array([
-    // Trip 0
-    REGULAR,
-    REGULAR,
-    NOT_AVAILABLE,
-    REGULAR,
-    // Trip 1
-    REGULAR,
-    REGULAR,
-    REGULAR,
-    REGULAR,
-    // Trip 2
-    MUST_PHONE_AGENCY,
-    REGULAR,
-    MUST_COORDINATE_WITH_DRIVER,
-    REGULAR,
-  ]);
+  const pickUpDropOffTypes = encodePickUpDropOffTypes(
+    [
+      // Trip 0
+      REGULAR,
+      NOT_AVAILABLE,
+      // Trip 1
+      REGULAR,
+      REGULAR,
+      // Trip 2
+      MUST_PHONE_AGENCY,
+      MUST_COORDINATE_WITH_DRIVER,
+    ],
+    [
+      // Trip 0
+      REGULAR,
+      REGULAR,
+      // Trip 1
+      REGULAR,
+      REGULAR,
+      // Trip 2
+      REGULAR,
+      REGULAR,
+    ],
+  );
 
   const stops = new Uint32Array([1001, 1002]);
   const serviceRouteId = 'test-route-1';

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

@@ -1,11 +1,11 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 
+import { encodePickUpDropOffTypes } from '../../gtfs/trips.js';
 import { Duration } from '../duration.js';
 import { NOT_AVAILABLE, REGULAR, Route } from '../route.js';
 import { Time } from '../time.js';
 import {
-  RoutesAdjacency,
   RouteType,
   ServiceRoutesMap,
   StopsAdjacency,
@@ -18,7 +18,7 @@ describe('Timetable', () => {
       1,
       {
         transfers: [{ destination: 2, type: 'RECOMMENDED' }],
-        routes: ['route1', 'route2'],
+        routes: [0, 1],
       },
     ],
     [
@@ -31,7 +31,7 @@ describe('Timetable', () => {
             minTransferTime: Duration.fromMinutes(3),
           },
         ],
-        routes: ['route2', 'route1'],
+        routes: [1, 0],
       },
     ],
     [
@@ -42,6 +42,7 @@ describe('Timetable', () => {
       },
     ],
   ]);
+
   const route1 = new Route(
     new Uint16Array([
       Time.fromHMS(16, 40, 0).toMinutes(),
@@ -53,16 +54,10 @@ describe('Timetable', () => {
       Time.fromHMS(19, 0, 0).toMinutes(),
       Time.fromHMS(19, 10, 0).toMinutes(),
     ]),
-    new Uint8Array([
-      REGULAR,
-      REGULAR,
-      NOT_AVAILABLE,
-      REGULAR,
-      REGULAR,
-      REGULAR,
-      REGULAR,
-      REGULAR,
-    ]),
+    encodePickUpDropOffTypes(
+      [REGULAR, NOT_AVAILABLE, REGULAR, REGULAR],
+      [REGULAR, REGULAR, REGULAR, REGULAR],
+    ),
     new Uint32Array([1, 2]),
     'gtfs1',
   );
@@ -73,17 +68,14 @@ describe('Timetable', () => {
       Time.fromHMS(23, 20, 0).toMinutes(),
       Time.fromHMS(23, 30, 0).toMinutes(),
     ]),
-    new Uint8Array([REGULAR, REGULAR, REGULAR, REGULAR]),
+    encodePickUpDropOffTypes([REGULAR, REGULAR], [REGULAR, REGULAR]),
     new Uint32Array([2, 1]),
     'gtfs2',
   );
-  const routesAdjacency: RoutesAdjacency = new Map([
-    ['route1', route1],
-    ['route2', route2],
-  ]);
+  const routesAdjacency = [route1, route2];
   const routes: ServiceRoutesMap = new Map([
-    ['gtfs1', { type: 'RAIL', name: 'Route 1' }],
-    ['gtfs2', { type: 'RAIL', name: 'Route 2' }],
+    ['gtfs1', { type: 'RAIL', name: 'Route 1', routes: [0] }],
+    ['gtfs2', { type: 'RAIL', name: 'Route 2', routes: [1] }],
   ]);
 
   const sampleTimetable: Timetable = new Timetable(
@@ -105,14 +97,14 @@ describe('Timetable', () => {
 
   it('should find the earliest trip for stop1 on route1', () => {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const route = sampleTimetable.getRoute('route1')!;
+    const route = sampleTimetable.getRoute(0)!;
     const tripIndex = route.findEarliestTrip(1);
     assert.strictEqual(tripIndex, 0);
   });
 
   it('should find the earliest trip for stop1 on route1 after a specific time', () => {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const route = sampleTimetable.getRoute('route1')!;
+    const route = sampleTimetable.getRoute(0)!;
     const afterTime = Time.fromHMS(17, 0, 0);
     const tripIndex = route.findEarliestTrip(1, afterTime);
     assert.strictEqual(tripIndex, 1);
@@ -120,14 +112,14 @@ describe('Timetable', () => {
 
   it('should return undefined if no valid trip exists after a specific time', () => {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const route = sampleTimetable.getRoute('route1')!;
+    const route = sampleTimetable.getRoute(0)!;
     const afterTime = Time.fromHMS(23, 40, 0);
     const tripIndex = route.findEarliestTrip(1, afterTime);
     assert.strictEqual(tripIndex, undefined);
   });
   it('should return undefined if the stop on a trip has pick up not available', () => {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const route = sampleTimetable.getRoute('route1')!;
+    const route = sampleTimetable.getRoute(0)!;
     const tripIndex = route.findEarliestTrip(2);
     assert.strictEqual(tripIndex, 1);
   });

package/src/timetable/io.ts

@@ -1,15 +1,14 @@
 import { Duration } from './duration.js';
 import {
-  RoutesAdjacency as ProtoRoutesAdjacency,
+  Route as ProtoRoute,
   RouteType as ProtoRouteType,
   ServiceRoutesMap as ProtoServiceRoutesMap,
   StopsAdjacency as ProtoStopsAdjacency,
   Transfer as ProtoTransfer,
   TransferType as ProtoTransferType,
 } from './proto/timetable.js';
-import { Route } from './route.js';
+import { Route, RouteId } from './route.js';
 import {
-  RoutesAdjacency,
   RouteType,
   ServiceRouteId,
   ServiceRoutesMap,
@@ -130,7 +129,7 @@ export const serializeStopsAdjacency = (
   };
 
   stopsAdjacency.forEach(
-    (value: { transfers: Transfer[]; routes: string[] }, key: number) => {
+    (value: { transfers: Transfer[]; routes: number[] }, key: number) => {
       protoStopsAdjacency.stops[key] = {
         transfers: value.transfers.map((transfer) => ({
           destination: transfer.destination,
@@ -148,20 +147,18 @@ export const serializeStopsAdjacency = (
 };
 
 export const serializeRoutesAdjacency = (
-  routesAdjacency: RoutesAdjacency,
-): ProtoRoutesAdjacency => {
-  const protoRoutesAdjacency: ProtoRoutesAdjacency = {
-    routes: {},
-  };
+  routesAdjacency: Route[],
+): ProtoRoute[] => {
+  const protoRoutesAdjacency: ProtoRoute[] = [];
 
-  routesAdjacency.forEach((route: Route, key: string) => {
+  routesAdjacency.forEach((route: Route) => {
     const routeData = route.serialize();
-    protoRoutesAdjacency.routes[key] = {
+    protoRoutesAdjacency.push({
       stopTimes: uint16ArrayToBytes(routeData.stopTimes),
       pickUpDropOffTypes: routeData.pickUpDropOffTypes,
       stops: uint32ArrayToBytes(routeData.stops),
       serviceRouteId: routeData.serviceRouteId,
-    };
+    });
   });
 
   return protoRoutesAdjacency;
@@ -175,10 +172,14 @@ export const serializeServiceRoutesMap = (
   };
 
   serviceRoutesMap.forEach(
-    (value: { type: RouteType; name: string }, key: string) => {
+    (
+      value: { type: RouteType; name: string; routes: RouteId[] },
+      key: string,
+    ) => {
       protoServiceRoutesMap.routes[key] = {
         type: serializeRouteType(value.type),
         name: value.name,
+        routes: value.routes,
       };
     },
   );
@@ -211,14 +212,13 @@ export const deserializeStopsAdjacency = (
 };
 
 export const deserializeRoutesAdjacency = (
-  protoRoutesAdjacency: ProtoRoutesAdjacency,
-): RoutesAdjacency => {
-  const routesAdjacency: RoutesAdjacency = new Map();
+  protoRoutesAdjacency: ProtoRoute[],
+): Route[] => {
+  const routesAdjacency: Route[] = [];
 
-  Object.entries(protoRoutesAdjacency.routes).forEach(([key, value]) => {
+  protoRoutesAdjacency.forEach((value) => {
     const stops = bytesToUint32Array(value.stops);
-    routesAdjacency.set(
-      key,
+    routesAdjacency.push(
       new Route(
         bytesToUint16Array(value.stopTimes),
         value.pickUpDropOffTypes,
@@ -240,6 +240,7 @@ export const deserializeServiceRoutesMap = (
     serviceRoutesMap.set(key, {
       type: parseRouteType(value.type),
       name: value.name,
+      routes: value.routes,
     });
   });
 

package/src/timetable/proto/timetable.proto

@@ -15,7 +15,8 @@ message Route {
    *   1: NOT_AVAILABLE
    *   2: MUST_PHONE_AGENCY
    *   3: MUST_COORDINATE_WITH_DRIVER
-   * Format: [pickupTypeStop1, dropOffTypeStop1, pickupTypeStop2, dropOffTypeStop2, etc.]
+   * Format: [drop_off_1][pickup_1][drop_off_0][pickup_0]
+   * 2 bits per value
    */
   bytes pickUpDropOffTypes = 2;
   /**
@@ -26,10 +27,6 @@ message Route {
   string serviceRouteId = 4;
 }
 
-message RoutesAdjacency {
-  map<string, Route> routes = 1;
-}
-
 enum TransferType {
   RECOMMENDED_TRANSFER_POINT = 0;
   TIMED_TRANSFER = 1;
@@ -40,15 +37,15 @@ enum TransferType {
 message Transfer {
   uint32 destination = 1;
   TransferType type = 2;
-  optional int32 minTransferTime = 3;
+  optional uint32 minTransferTime = 3;
 }
 
 message StopsAdjacency {
   message StopAdjacency {
     repeated Transfer transfers = 1;
-    repeated string routes = 2;
+    repeated int32 routes = 2;
   }
-  map<string, StopAdjacency> stops = 1;
+  map<uint32, StopAdjacency> stops = 1;
 }
 
 enum RouteType {
@@ -67,6 +64,7 @@ enum RouteType {
 message ServiceRoute {
   RouteType type = 1;
   string name = 2;
+  repeated int32 routes = 3;
 }
 
 message ServiceRoutesMap {
@@ -76,6 +74,6 @@ message ServiceRoutesMap {
 message Timetable {
   string version = 1;
   StopsAdjacency stopsAdjacency = 2;
-  RoutesAdjacency routesAdjacency = 3;
+  repeated Route routesAdjacency = 3;
   ServiceRoutesMap routes = 4;
 }