Merge branch 'master' into otp2-fare-products-table

opentripplanner · Jul 3, 2023 · 118d5fe · 118d5fe
2 parents d5f1340 + 423dbd6
commit 118d5fe
Show file tree

Hide file tree

Showing 38 changed files with 10,272 additions and 20,662 deletions.
diff --git a/__snapshots__/storybook.test.ts.snap b/__snapshots__/storybook.test.ts.snap
diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/core-utils",
-  "version": "8.2.4",
+  "version": "8.3.2",
   "description": "Core functionality that is shared among numerous UI components",
   "engines": {
     "node": ">=13"

diff --git a/packages/core-utils/src/__tests__/__mocks__/tnc-itinerary.json b/packages/core-utils/src/__tests__/__mocks__/tnc-itinerary.json
@@ -66,15 +66,23 @@
       "rentedCar": false,
       "rentedVehicle": false,
       "hailedCar": true,
-      "tncData": {
-        "company": "UBER",
-        "currency": "USD",
-        "travelDuration": 300,
-        "maxCost": 10,
-        "minCost": 9,
-        "productId": "a6eef2e1-c99a-436f-bde9-fefb9181c0b0",
-        "displayName": "UberX",
-        "estimatedArrival": 240
+      "rideHailingEstimate": {
+        "provider": {
+          "id": "uber"
+        },
+        "arrival": "PT4M",
+        "minPrice": {
+          "currency": {
+            "code": "USD"
+          },
+          "amount": 17
+        },
+        "maxPrice": {
+          "currency": {
+            "code": "USD"
+          },
+          "amount": 19
+        }
       },
       "duration": 180,
       "transitLeg": false,
@@ -1045,15 +1053,23 @@
       "rentedCar": false,
       "rentedVehicle": false,
       "hailedCar": true,
-      "tncData": {
-        "company": "UBER",
-        "currency": "USD",
-        "travelDuration": 300,
-        "maxCost": 9,
-        "minCost": 8,
-        "productId": "a6eef2e1-c99a-436f-bde9-fefb9181c0b0",
-        "displayName": "UberX",
-        "estimatedArrival": 240
+      "rideHailingEstimate": {
+        "provider": {
+          "id": "uber"
+        },
+        "arrival": "PT4M",
+        "minPrice": {
+          "currency": {
+            "code": "USD"
+          },
+          "amount": 17
+        },
+        "maxPrice": {
+          "currency": {
+            "code": "USD"
+          },
+          "amount": 19
+        }
       },
       "duration": 341,
       "transitLeg": false,

diff --git a/packages/core-utils/src/__tests__/itinerary.js b/packages/core-utils/src/__tests__/itinerary.js
@@ -33,16 +33,16 @@ describe("util > itinerary", () => {
 
     it("should return company for TNC leg", () => {
       const company = getCompanyFromLeg(tncItinerary.legs[0]);
-      expect(company).toEqual("UBER");
+      expect(company).toEqual("uber");
     });
   });
 
   describe("calculateTncFares", () => {
     it("should return the correct amounts and currency for an itinerary with TNC", () => {
       const fareResult = calculateTncFares(tncItinerary, true);
       expect(fareResult.currencyCode).toEqual("USD");
-      expect(fareResult.maxTNCFare).toEqual(19);
-      expect(fareResult.minTNCFare).toEqual(17);
+      expect(fareResult.maxTNCFare).toEqual(38);
+      expect(fareResult.minTNCFare).toEqual(34);
     });
   });
 

diff --git a/packages/core-utils/src/itinerary.ts b/packages/core-utils/src/itinerary.ts
@@ -78,6 +78,10 @@ export function legDropoffRequiresAdvanceBooking(leg: Leg): boolean {
   return isAdvanceBookingRequired(leg.dropOffBookingInfo);
 }
 
+export function isRideshareLeg(leg: Leg): boolean {
+  return !!leg.rideHailingEstimate?.provider?.id;
+}
+
 export function isWalk(mode: string): boolean {
   if (!mode) return false;
 
@@ -193,16 +197,26 @@ export function toSentenceCase(str: string): string {
  */
 export function getCompanyFromLeg(leg: Leg): string {
   if (!leg) return null;
-  const { from, mode, rentedBike, rentedCar, rentedVehicle, tncData } = leg;
+  const {
+    from,
+    mode,
+    rentedBike,
+    rentedCar,
+    rentedVehicle,
+    rideHailingEstimate
+  } = leg;
   if (mode === "CAR" && rentedCar) {
     return from.networks[0];
   }
-  if (mode === "CAR" && tncData) {
-    return tncData.company;
+  if (mode === "CAR" && rideHailingEstimate) {
+    return rideHailingEstimate.provider.id;
   }
   if (mode === "BICYCLE" && rentedBike && from.networks) {
     return from.networks[0];
   }
+  if (from.rentalVehicle) {
+    return from.rentalVehicle.network;
+  }
   if (
     (mode === "MICROMOBILITY" || mode === "SCOOTER") &&
     rentedVehicle &&
@@ -440,15 +454,15 @@ export function calculateTncFares(
   itinerary: ItineraryOnlyLegsRequired
 ): TncFare {
   return itinerary.legs
-    .filter(leg => leg.mode === "CAR" && leg.hailedCar && leg.tncData)
+    .filter(leg => leg.mode === "CAR" && leg.rideHailingEstimate)
     .reduce(
-      ({ maxTNCFare, minTNCFare }, { tncData }) => {
-        const { currency, maxCost, minCost } = tncData;
+      ({ maxTNCFare, minTNCFare }, { rideHailingEstimate }) => {
+        const { minPrice, maxPrice } = rideHailingEstimate;
         return {
           // Assumes a single currency for entire itinerary.
-          currencyCode: currency,
-          maxTNCFare: maxTNCFare + maxCost,
-          minTNCFare: minTNCFare + minCost
+          currencyCode: minPrice.currency.code,
+          maxTNCFare: maxTNCFare + maxPrice.amount,
+          minTNCFare: minTNCFare + minPrice.amount
         };
       },
       {