minotor 3.0.2 → 4.0.0

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,6 +1,7 @@
 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';
@@ -42,6 +43,7 @@ describe('Timetable', () => {
       },
     ],
   ]);
+
   const route1 = new Route(
     new Uint16Array([
       Time.fromHMS(16, 40, 0).toMinutes(),
@@ -53,16 +55,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,7 +69,7 @@ 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',
   );

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;
   /**

package/src/timetable/proto/timetable.ts

@@ -148,7 +148,8 @@ export interface 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
    */
   pickUpDropOffTypes: Uint8Array;
   /**

package/src/timetable/route.ts

@@ -65,14 +65,16 @@ export class Route {
    */
   private readonly stopTimes: Uint16Array;
   /**
-   * PickUp and DropOff types represented as a binary Uint8Array.
-   * Values:
+   * PickUp and DropOff types represented as a 2-bit encoded Uint8Array.
+   * Values (2 bits each):
    *   0: REGULAR
    *   1: NOT_AVAILABLE
    *   2: MUST_PHONE_AGENCY
    *   3: MUST_COORDINATE_WITH_DRIVER
-   * Format: [pickupTypeStop1, dropOffTypeStop1, pickupTypeStop2, dropOffTypeStop2, etc.]
-   * TODO: Encode 4 values instead of 1 in 8 bits.
+   *
+   * Encoding format: Each byte contains 2 pickup/drop-off pairs (4 bits each)
+   * Bit layout per byte: [pickup_1 (2 bits)][drop_off_1 (2 bits)][pickup_0 (2 bits)][drop_off_0 (2 bits)]
+   * Example: For stops 0 and 1 in a trip, one byte encodes all 4 values
    */
   private readonly pickUpDropOffTypes: Uint8Array;
   /**
@@ -225,14 +227,20 @@ export class Route {
    * @returns The pick-up type at the specified stop and trip.
    */
   pickUpTypeFrom(stopId: StopId, tripIndex: TripIndex): PickUpDropOffType {
-    const pickUpIndex =
-      (tripIndex * this.stops.length + this.stopIndex(stopId)) * 2;
-    const pickUpValue = this.pickUpDropOffTypes[pickUpIndex];
-    if (pickUpValue === undefined) {
+    const globalIndex = tripIndex * this.stops.length + this.stopIndex(stopId);
+    const byteIndex = Math.floor(globalIndex / 2);
+    const isSecondPair = globalIndex % 2 === 1;
+
+    const byte = this.pickUpDropOffTypes[byteIndex];
+    if (byte === undefined) {
       throw new Error(
         `Pick up type not found for stop ${stopId} at trip index ${tripIndex} in route ${this.serviceRouteId}`,
       );
     }
+
+    const pickUpValue = isSecondPair
+      ? (byte >> 6) & 0x03 // Upper 2 bits for second pair
+      : (byte >> 2) & 0x03; // Bits 2-3 for first pair
     return toPickupDropOffType(pickUpValue);
   }
 
@@ -244,14 +252,20 @@ export class Route {
    * @returns The drop-off type at the specified stop and trip.
    */
   dropOffTypeAt(stopId: StopId, tripIndex: TripIndex): PickUpDropOffType {
-    const dropOffIndex =
-      (tripIndex * this.stops.length + this.stopIndex(stopId)) * 2 + 1;
-    const dropOffValue = this.pickUpDropOffTypes[dropOffIndex];
-    if (dropOffValue === undefined) {
+    const globalIndex = tripIndex * this.stops.length + this.stopIndex(stopId);
+    const byteIndex = Math.floor(globalIndex / 2);
+    const isSecondPair = globalIndex % 2 === 1;
+
+    const byte = this.pickUpDropOffTypes[byteIndex];
+    if (byte === undefined) {
       throw new Error(
         `Drop off type not found for stop ${stopId} at trip index ${tripIndex} in route ${this.serviceRouteId}`,
       );
     }
+
+    const dropOffValue = isSecondPair
+      ? (byte >> 4) & 0x03 // Bits 4-5 for second pair
+      : byte & 0x03; // Lower 2 bits for first pair
     return toPickupDropOffType(dropOffValue);
   }
 

package/src/timetable/timetable.ts

@@ -72,7 +72,7 @@ export const ALL_TRANSPORT_MODES: Set<RouteType> = new Set([
   'MONORAIL',
 ]);
 
-export const CURRENT_VERSION = '0.0.3';
+export const CURRENT_VERSION = '0.0.4';
 
 /**
  * The internal transit timetable format.