minotor 7.0.0 → 7.0.2

package/dist/routing/router.d.ts

@@ -14,7 +14,7 @@ export type ReachingTime = {
     origin: StopId;
 };
 /**
- * A public transportation network router utilizing the RAPTOR algorithm for
+ * A public transportation network router implementing the RAPTOR algorithm for
  * efficient journey planning and routing. For more information on the RAPTOR
  * algorithm, refer to its detailed explanation in the research paper:
  * https://www.microsoft.com/en-us/research/wp-content/uploads/2012/01/raptor_alenex.pdf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minotor",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "A lightweight client-side transit routing library.",
   "keywords": [
     "minotor",

package/src/routing/router.ts

@@ -28,7 +28,7 @@ type CurrentTrip = {
 };
 
 /**
- * A public transportation network router utilizing the RAPTOR algorithm for
+ * A public transportation network router implementing the RAPTOR algorithm for
  * efficient journey planning and routing. For more information on the RAPTOR
  * algorithm, refer to its detailed explanation in the research paper:
  * https://www.microsoft.com/en-us/research/wp-content/uploads/2012/01/raptor_alenex.pdf
@@ -190,6 +190,10 @@ export class Router {
         options.transportModes,
       );
       markedStops.clear();
+      const earliestArrivalAtAnyDestination = this.earliestArrivalAtAnyStop(
+        earliestArrivals,
+        destinations,
+      );
       // for each route that can be reached with at least round - 1 trips
       const reachableRoutesArray = Array.from(reachableRoutes.entries());
       for (let i = 0; i < reachableRoutesArray.length; i++) {
@@ -214,9 +218,7 @@ export class Router {
             if (
               currentDropOffType !== 'NOT_AVAILABLE' &&
               currentArrivalTime.isBefore(earliestArrivalAtCurrentStop) &&
-              currentArrivalTime.isBefore(
-                this.earliestArrivalAtAnyStop(earliestArrivals, destinations),
-              )
+              currentArrivalTime.isBefore(earliestArrivalAtAnyDestination)
             ) {
               const bestHopOnDepartureTime = route.departureFrom(
                 currentTrip.bestHopOnStop,
@@ -252,10 +254,10 @@ export class Router {
             earliestArrivalOnPreviousRound !== undefined &&
             (currentTrip === undefined ||
               earliestArrivalOnPreviousRound.isBefore(
-                route.arrivalAt(currentStop, currentTrip.tripIndex),
+                route.departureFrom(currentStop, currentTrip.tripIndex),
               ) ||
               earliestArrivalOnPreviousRound.equals(
-                route.arrivalAt(currentStop, currentTrip.tripIndex),
+                route.departureFrom(currentStop, currentTrip.tripIndex),
               ))
           ) {
             const earliestTrip = route.findEarliestTrip(

package/src/timetable/route.ts

@@ -286,32 +286,33 @@ export class Route {
     after: Time = Time.origin(),
     beforeTrip?: TripIndex,
   ): TripIndex | undefined {
-    const maxTripIndex =
-      beforeTrip !== undefined
-        ? Math.min(beforeTrip - 1, this.nbTrips - 1)
-        : this.nbTrips - 1;
-    if (maxTripIndex < 0) {
-      return undefined;
-    }
-    let earliestTripIndex: TripIndex | undefined;
-    let lowTrip = 0;
-    let highTrip = maxTripIndex;
+    if (this.nbTrips <= 0) return undefined;
+
+    let hi = this.nbTrips - 1;
+    if (beforeTrip !== undefined) hi = Math.min(hi, beforeTrip - 1);
+    if (hi < 0) return undefined;
 
-    while (lowTrip <= highTrip) {
-      const midTrip = Math.floor((lowTrip + highTrip) / 2);
-      const departure = this.departureFrom(stopId, midTrip);
-      const pickUpType = this.pickUpTypeFrom(stopId, midTrip);
-      if (
-        (departure.isAfter(after) || departure.equals(after)) &&
-        pickUpType !== 'NOT_AVAILABLE'
-      ) {
-        earliestTripIndex = midTrip;
-        highTrip = midTrip - 1;
+    let lo = 0;
+    let lb = -1;
+    while (lo <= hi) {
+      const mid = (lo + hi) >>> 1;
+      const depMid = this.departureFrom(stopId, mid);
+      if (depMid.isBefore(after)) {
+        lo = mid + 1;
       } else {
-        lowTrip = midTrip + 1;
+        lb = mid;
+        hi = mid - 1;
+      }
+    }
+    if (lb === -1) return undefined;
+
+    for (let t = lb; t < (beforeTrip ?? this.nbTrips); t++) {
+      const pickup = this.pickUpTypeFrom(stopId, t);
+      if (pickup !== 'NOT_AVAILABLE') {
+        return t;
       }
     }
-    return earliestTripIndex;
+    return undefined;
   }
 
   /**

package/src/timetable/time.ts

@@ -193,9 +193,16 @@ export class Time {
     if (times.length === 0) {
       throw new Error('At least one Time instance is required.');
     }
-    return times.reduce((maxTime, currentTime) => {
-      return currentTime.isAfter(maxTime) ? currentTime : maxTime;
-    });
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    let maxTime = times[0]!;
+    for (let i = 1; i < times.length; i++) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      if (times[i]!.minutesSinceMidnight > maxTime.minutesSinceMidnight) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        maxTime = times[i]!;
+      }
+    }
+    return maxTime;
   }
 
   /**
@@ -208,9 +215,16 @@ export class Time {
     if (times.length === 0) {
       throw new Error('At least one Time instance is required.');
     }
-    return times.reduce((minTime, currentTime) => {
-      return currentTime.isBefore(minTime) ? currentTime : minTime;
-    });
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    let minTime = times[0]!;
+    for (let i = 1; i < times.length; i++) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      if (times[i]!.minutesSinceMidnight < minTime.minutesSinceMidnight) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        minTime = times[i]!;
+      }
+    }
+    return minTime;
   }
 
   /**
@@ -220,7 +234,7 @@ export class Time {
    * @returns True if the current Time instance is after the other Time instance, otherwise false.
    */
   isAfter(otherTime: Time): boolean {
-    return this.minutesSinceMidnight > otherTime.toMinutes();
+    return this.minutesSinceMidnight > otherTime.minutesSinceMidnight;
   }
 
   /**
@@ -230,7 +244,7 @@ export class Time {
    * @returns True if the current Time instance is before the other Time instance, otherwise false.
    */
   isBefore(otherTime: Time): boolean {
-    return this.minutesSinceMidnight < otherTime.toMinutes();
+    return this.minutesSinceMidnight < otherTime.minutesSinceMidnight;
   }
 
   /**
@@ -240,6 +254,6 @@ export class Time {
    * @returns True if the current Time instance is equal to the other Time instance, otherwise false.
    */
   equals(otherTime: Time): boolean {
-    return this.minutesSinceMidnight === otherTime.toMinutes();
+    return this.minutesSinceMidnight === otherTime.minutesSinceMidnight;
   }
 }

package/src/timetable/timetable.ts

@@ -184,9 +184,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 };
   }
 
   /**