@opentripplanner/core-utils 13.0.0-alpha.4 → 13.0.1

package/esm/__mocks__/fake-transit-operators.story.json

@@ -0,0 +1,97 @@
+{
+  "fakeTransitOperators": [
+    {
+      "feedId": "kcm",
+      "agencyId": "kcm:23",
+      "name": "City of Seattle",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_4_City_of_Seattle.png"
+    },
+    {
+      "feedId": "CommTrans",
+      "agencyId": "CommTrans:29",
+      "name": "Community Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_community_transit.png"
+    },
+    {
+      "feedId": "97",
+      "agencyId": "97:97",
+      "name": "Everett Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_Everett_Transit.png"
+    },
+    {
+      "feedId": "19",
+      "agencyId": "19:0",
+      "name": "Intercity Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/intercity_transit_logo.jpg"
+    },
+    {
+      "feedId": "kcm",
+      "agencyId": "kcm:1",
+      "name": "King County Metro",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_kcm.png"
+    },
+    {
+      "feedId": "Kitsap",
+      "agencyId": "Kitsap:kt",
+      "name": "Kitsap Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_Kitsap_Transit.png",
+      "order": 2
+    },
+    {
+      "feedId": "3",
+      "agencyId": "3:3",
+      "name": "Pierce Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_pierce_transit.png"
+    },
+    {
+      "feedId": "Skagit",
+      "agencyId": "Skagit:e0e4541a-2714-487b-b30c-f5c6cb4a310f",
+      "name": "Skagit Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_Skagit.png"
+    },
+    {
+      "feedId": "96",
+      "agencyId": "96:96",
+      "name": "Seattle Center Monorail",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_seattle_monorail.png"
+    },
+    {
+      "feedId": "40",
+      "agencyId": "40:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png",
+      "order": 1
+    },
+    {
+      "feedId": "CommTrans",
+      "agencyId": "CommTrans:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png"
+    },
+    {
+      "feedId": "kcm",
+      "agencyId": "kcm:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png"
+    },
+    {
+      "feedId": "3",
+      "agencyId": "3:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png",
+      "order": 1
+    },
+    {
+      "feedId": "95",
+      "agencyId": "95:95",
+      "name": "Washington State Ferries",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_wash_state_ferry.png"
+    },
+    {
+      "feedId": "Whatcom",
+      "agencyId": "Whatcom:14",
+      "name": "Whatcom Transportation Authority",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_wta.png"
+    }
+  ]
+}

package/esm/__tests__/__mocks__/routes.json

@@ -1,107 +1,236 @@
 {
-  "route1": {
-    "longName": "Across town",
-    "mode": "BUS",
-    "shortName": "10",
-    "sortOrder": 10
-  },
-  "route2": {
-    "longName": "Around town",
-    "mode": "BUS",
-    "shortName": "20",
-    "sortOrder": 2
-  },
-  "route3": {
-    "longName": "Around another town",
-    "shortName": "3",
-    "sortOrder": -999,
-    "type": 3
-  },
-  "route4": {
-    "longName": "Loop route",
-    "mode": "BUS",
-    "shortName": "2",
-    "sortOrder": -999
-  },
-  "route5": {
-    "longName": "A-line",
-    "mode": "BUS",
-    "shortName": "A",
-    "sortOrder": -999
-  },
-  "route6": {
-    "longName": "B-line",
-    "mode": "BUS",
-    "shortName": "B",
-    "sortOrder": -999
-  },
-  "route7": {
-    "longName": "A meandering route",
-    "mode": "BUS",
-    "sortOrder": -999
-  },
-  "route8": {
-    "longName": "Zig-zagging route",
-    "mode": "BUS",
-    "shortName": "30",
-    "sortOrder": 2
-  },
-  "route9": {
-    "longName": "Express route",
-    "mode": "BUS",
-    "shortName": "30",
-    "sortOrder": 2
-  },
-  "route10": {
-    "longName": "Variation of express route",
-    "mode": "BUS",
-    "shortName": "30",
-    "sortOrder": 2
-  },
-  "route11": {
-    "longName": "Local route",
-    "mode": "BUS",
-    "shortName": "6",
-    "sortOrder": 2
-  },
-  "route12": {
-    "longName": "Intercity Train",
-    "mode": "RAIL",
-    "shortName": "IC",
-    "sortOrder": 2
-  },
-  "route13": {
-    "longName": "Yellow line Subway",
-    "mode": "SUBWAY",
-    "shortName": "Yellow",
-    "sortOrder": 2
-  },
-  "route14": {
-    "longName": "Xpress route C",
-    "mode": "BUS",
-    "shortName": "30C",
-    "sortOrder": 2
-  },
-  "route15": {
-    "longName": "Express route X",
-    "mode": "BUS",
-    "shortName": "30X",
-    "sortOrder": 2
-  },
-  "route16": {
-    "agencyId": "abc",
-    "agencyName": "Agency 1",
-    "longName": "Intercity Train 2",
-    "mode": "RAIL",
-    "routeId": "1:it2",
-    "shortName": "IC"
-  },
-  "route17": {
-    "agencyId": "abc",
-    "agencyName": "Acclaimed agency 1",
-    "longName": "Express route X",
-    "mode": "BUS",
-    "routeId": "2:erx",
-    "shortName": "30X"
-  }
+  "otp1Routes": [
+    {
+      "agencyId": "bcd",
+      "longName": "Across town",
+      "mode": "BUS",
+      "shortName": "10",
+      "sortOrder": 10
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Around town",
+      "mode": "BUS",
+      "shortName": "20",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Around another town",
+      "shortName": "3",
+      "sortOrder": -999,
+      "type": 3
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Loop route",
+      "mode": "BUS",
+      "shortName": "2",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "A-line",
+      "mode": "BUS",
+      "shortName": "A",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "B-line",
+      "mode": "BUS",
+      "shortName": "B",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "A meandering route",
+      "mode": "BUS",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Zig-zagging route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Variation of express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Local route",
+      "mode": "BUS",
+      "shortName": "6",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Intercity Train",
+      "mode": "RAIL",
+      "shortName": "IC",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Yellow line Subway",
+      "mode": "SUBWAY",
+      "shortName": "Yellow",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Xpress route C",
+      "mode": "BUS",
+      "shortName": "30C",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Express route X",
+      "mode": "BUS",
+      "shortName": "30X"
+    },
+    {
+      "agencyId": "abc",
+      "agencyName": "Agency 1",
+      "longName": "Intercity Train 2",
+      "mode": "RAIL",
+      "routeId": "1:it2",
+      "shortName": "IC",
+      "sortOrder": 10
+    },
+    {
+      "agencyId": "abc",
+      "agencyName": "Acclaimed agency 1",
+      "longName": "Express route X",
+      "mode": "BUS",
+      "routeId": "2:erx",
+      "shortName": "30X",
+      "sortOrder": 10
+    }
+  ],
+  "otp2Routes": [
+    {
+      "longName": "Across town",
+      "mode": "BUS",
+      "shortName": "10",
+      "sortOrder": 10
+    },
+    {
+      "longName": "Around town",
+      "mode": "BUS",
+      "shortName": "20",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Around another town",
+      "shortName": "3",
+      "sortOrder": null,
+      "type": 3
+    },
+    {
+      "longName": "Loop route",
+      "mode": "BUS",
+      "shortName": "2",
+      "sortOrder": -999
+    },
+    {
+      "longName": "A-line",
+      "mode": "BUS",
+      "shortName": "A",
+      "sortOrder": -999
+    },
+    {
+      "longName": "B-line",
+      "mode": "BUS",
+      "shortName": "B"
+    },
+    {
+      "longName": "A meandering route",
+      "mode": "BUS"
+    },
+    {
+      "longName": "Zig-zagging route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Variation of express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Local route",
+      "mode": "BUS",
+      "shortName": "6",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Intercity Train",
+      "mode": "RAIL",
+      "shortName": "IC",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Yellow line Subway",
+      "mode": "SUBWAY",
+      "shortName": "Yellow",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Xpress route C",
+      "mode": "BUS",
+      "shortName": "30C",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Express route X",
+      "mode": "BUS",
+      "shortName": "30X",
+      "sortOrder": 2
+    },
+    {
+      "agency": {
+        "name": "Agency 1",
+        "id": "abc"
+      },
+      "longName": "Intercity Train 2",
+      "mode": "RAIL",
+      "routeId": "1:it2",
+      "shortName": "IC",
+      "sortOrder": 2
+    },
+    {
+      "agency": {
+        "name": "Acclaimed agency 1",
+        "id": "abc"
+      },
+      "longName": "Express route X",
+      "mode": "BUS",
+      "routeId": "2:erx",
+      "shortName": "30X",
+      "sortOrder": 2
+    }
+  ]
 }

package/esm/itinerary.js

@@ -71,8 +71,6 @@ export function legDropoffRequiresAdvanceBooking(leg) {
 export function isFlex(leg) {
   return isReservationRequired(leg) || isCoordinationRequired(leg) || legDropoffRequiresAdvanceBooking(leg) || isAdvanceBookingRequired(leg === null || leg === void 0 ? void 0 : leg.pickupBookingInfo) || legContainsGeometry(leg);
 }
-
-// alpha-only comment
 export function isRideshareLeg(leg) {
   var _leg$rideHailingEstim;
   return !!((_leg$rideHailingEstim = leg.rideHailingEstimate) !== null && _leg$rideHailingEstim !== void 0 && (_leg$rideHailingEstim = _leg$rideHailingEstim.provider) !== null && _leg$rideHailingEstim !== void 0 && _leg$rideHailingEstim.id);
@@ -186,6 +184,7 @@ export function toSentenceCase(str) {
  * Derive the company string based on mode and network associated with leg.
  */
 export function getCompanyFromLeg(leg) {
+  var _from$vehicleRentalSt;
   if (!leg) return null;
   var from = leg.from,
     mode = leg.mode,
@@ -205,6 +204,9 @@ export function getCompanyFromLeg(leg) {
   if (from.rentalVehicle) {
     return from.rentalVehicle.network;
   }
+  if ((_from$vehicleRentalSt = from.vehicleRentalStation) !== null && _from$vehicleRentalSt !== void 0 && _from$vehicleRentalSt.rentalNetwork) {
+    return from.vehicleRentalStation.rentalNetwork.networkId;
+  }
   if ((mode === "MICROMOBILITY" || mode === "SCOOTER") && rentedVehicle && from.networks) {
     return from.networks[0];
   }