@opentripplanner/core-utils 12.0.2 → 13.0.0-alpha.2

package/lib/itinerary.js

@@ -1,228 +1,195 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTransitModes = getTransitModes;
-exports.isTransitLeg = isTransitLeg;
-exports.isTransit = isTransit;
-exports.isReservationRequired = isReservationRequired;
-exports.isCoordinationRequired = isCoordinationRequired;
+exports.calculateEmissions = calculateEmissions;
+exports.calculatePhysicalActivity = calculatePhysicalActivity;
+exports.calculateTncFares = calculateTncFares;
 exports.containsGeometry = containsGeometry;
+exports.convertGraphQLResponseToLegacy = void 0;
 exports.endsWithGeometry = endsWithGeometry;
-exports.startsWithGeometry = startsWithGeometry;
-exports.legContainsGeometry = legContainsGeometry;
+exports.getCompaniesLabelFromNetworks = getCompaniesLabelFromNetworks;
+exports.getCompanyForNetwork = getCompanyForNetwork;
+exports.getCompanyFromLeg = getCompanyFromLeg;
+exports.getDisplayedStopId = getDisplayedStopId;
+exports.getElevationProfile = getElevationProfile;
+exports.getItineraryBounds = getItineraryBounds;
+exports.getItineraryCost = getItineraryCost;
+exports.getLegBounds = getLegBounds;
+exports.getLegCost = getLegCost;
+exports.getLegRouteShortName = exports.getLegRouteName = exports.getLegRouteLongName = void 0;
+exports.getMapColor = getMapColor;
+exports.getTNCLocation = getTNCLocation;
+exports.getTextWidth = getTextWidth;
+exports.getTransitModes = getTransitModes;
+exports.hasBike = hasBike;
+exports.hasCar = hasCar;
+exports.hasHail = hasHail;
+exports.hasMicromobility = hasMicromobility;
+exports.hasRental = hasRental;
+exports.hasTransit = hasTransit;
+exports.isAccessMode = isAccessMode;
 exports.isAdvanceBookingRequired = isAdvanceBookingRequired;
-exports.legDropoffRequiresAdvanceBooking = legDropoffRequiresAdvanceBooking;
-exports.isFlex = isFlex;
-exports.isRideshareLeg = isRideshareLeg;
-exports.isWalk = isWalk;
 exports.isBicycle = isBicycle;
 exports.isBicycleRent = isBicycleRent;
 exports.isCar = isCar;
+exports.isCoordinationRequired = isCoordinationRequired;
+exports.isFlex = isFlex;
 exports.isMicromobility = isMicromobility;
-exports.isAccessMode = isAccessMode;
-exports.hasTransit = hasTransit;
-exports.hasCar = hasCar;
-exports.hasBike = hasBike;
-exports.hasMicromobility = hasMicromobility;
-exports.hasHail = hasHail;
-exports.hasRental = hasRental;
-exports.getMapColor = getMapColor;
-exports.toSentenceCase = toSentenceCase;
-exports.getCompanyFromLeg = getCompanyFromLeg;
-exports.getItineraryBounds = getItineraryBounds;
-exports.getLegBounds = getLegBounds;
-exports.legLocationAtDistance = legLocationAtDistance;
+exports.isReservationRequired = isReservationRequired;
+exports.isRideshareLeg = isRideshareLeg;
+exports.isTransit = isTransit;
+exports.isTransitLeg = isTransitLeg;
+exports.isWalk = isWalk;
+exports.legContainsGeometry = legContainsGeometry;
+exports.legDropoffRequiresAdvanceBooking = legDropoffRequiresAdvanceBooking;
 exports.legElevationAtDistance = legElevationAtDistance;
+exports.legLocationAtDistance = legLocationAtDistance;
 exports.mapOldElevationComponentToNew = mapOldElevationComponentToNew;
-exports.getElevationProfile = getElevationProfile;
-exports.getTextWidth = getTextWidth;
-exports.getCompanyForNetwork = getCompanyForNetwork;
-exports.getCompaniesLabelFromNetworks = getCompaniesLabelFromNetworks;
-exports.getTNCLocation = getTNCLocation;
-exports.calculatePhysicalActivity = calculatePhysicalActivity;
-exports.calculateTncFares = calculateTncFares;
-exports.calculateEmissions = calculateEmissions;
-exports.getDisplayedStopId = getDisplayedStopId;
-exports.getLegCost = getLegCost;
-exports.getItineraryCost = getItineraryCost;
-exports.getLegRouteName = exports.getLegRouteLongName = exports.getLegRouteShortName = exports.convertGraphQLResponseToLegacy = exports.transitModes = void 0;
-
+exports.startsWithGeometry = startsWithGeometry;
+exports.toSentenceCase = toSentenceCase;
+exports.transitModes = void 0;
 var _polyline = _interopRequireDefault(require("@mapbox/polyline"));
-
 var _along = _interopRequireDefault(require("@turf/along"));
-
 // All OTP transit modes
-const transitModes = ["TRAM", "TROLLEYBUS", "BUS", "SUBWAY", "FERRY", "RAIL", "GONDOLA"];
+const transitModes = exports.transitModes = ["TRAM", "TROLLEYBUS", "BUS", "SUBWAY", "FERRY", "RAIL", "GONDOLA"];
+
 /**
  * @param  {config} config OTP-RR configuration object
  * @return {Array}  List of all transit modes defined in config; otherwise default mode list
  */
 
-exports.transitModes = transitModes;
-
 function getTransitModes(config) {
   if (!config || !config.modes || !config.modes.transitModes) return transitModes;
   return config.modes.transitModes.map(tm => typeof tm !== "string" ? tm.mode : tm);
 }
-
 function isTransitLeg(leg) {
   return leg.transitLeg;
 }
-
 function isTransit(mode) {
   return transitModes.includes(mode) || mode === "TRANSIT";
 }
+
 /**
  * Returns true if the leg pickup rules enabled which require
  * calling ahead for the service to run. "mustPhone" is the only
  * property which encodes this info.
  */
-
-
 function isReservationRequired(leg) {
-  return (leg === null || leg === void 0 ? void 0 : leg.boardRule) === "mustPhone" || (leg === null || leg === void 0 ? void 0 : leg.alightRule) === "mustPhone";
+  return leg?.boardRule === "mustPhone" || leg?.alightRule === "mustPhone";
 }
 /**
  * Returns true if a user must ask the driver to let the user off
  * or if the user must flag the driver down for pickup.
  * "coordinateWithDriver" in board/alight rule encodes this info.
  */
-
-
 function isCoordinationRequired(leg) {
-  return (leg === null || leg === void 0 ? void 0 : leg.boardRule) === "coordinateWithDriver" || (leg === null || leg === void 0 ? void 0 : leg.alightRule) === "coordinateWithDriver";
+  return leg?.boardRule === "coordinateWithDriver" || leg?.alightRule === "coordinateWithDriver";
 }
-
 function containsGeometry(place) {
-  var _place$stop, _place$stop2;
-
-  return (place === null || place === void 0 ? void 0 : (_place$stop = place.stop) === null || _place$stop === void 0 ? void 0 : _place$stop.geometries) !== null && (place === null || place === void 0 ? void 0 : (_place$stop2 = place.stop) === null || _place$stop2 === void 0 ? void 0 : _place$stop2.geometries) !== undefined;
+  return place?.stop?.geometries !== null && place?.stop?.geometries !== undefined;
 }
-
 function endsWithGeometry(leg) {
-  return containsGeometry(leg === null || leg === void 0 ? void 0 : leg.to);
+  return containsGeometry(leg?.to);
 }
-
 function startsWithGeometry(leg) {
-  return containsGeometry(leg === null || leg === void 0 ? void 0 : leg.from);
+  return containsGeometry(leg?.from);
 }
-
 function legContainsGeometry(leg) {
   return endsWithGeometry(leg) || startsWithGeometry(leg);
 }
-
 function isAdvanceBookingRequired(info) {
-  var _info$latestBookingTi;
-
-  return (info === null || info === void 0 ? void 0 : (_info$latestBookingTi = info.latestBookingTime) === null || _info$latestBookingTi === void 0 ? void 0 : _info$latestBookingTi.daysPrior) > 0;
+  return info?.latestBookingTime?.daysPrior > 0;
 }
-
 function legDropoffRequiresAdvanceBooking(leg) {
-  return isAdvanceBookingRequired(leg === null || leg === void 0 ? void 0 : leg.dropOffBookingInfo);
+  return isAdvanceBookingRequired(leg?.dropOffBookingInfo);
 }
+
 /**
  * The two rules checked by the above two functions are the only values
  * returned by OTP when a leg is a flex leg.
  */
-
-
 function isFlex(leg) {
-  return isReservationRequired(leg) || isCoordinationRequired(leg) || legDropoffRequiresAdvanceBooking(leg) || isAdvanceBookingRequired(leg === null || leg === void 0 ? void 0 : leg.pickupBookingInfo) || legContainsGeometry(leg);
+  return isReservationRequired(leg) || isCoordinationRequired(leg) || legDropoffRequiresAdvanceBooking(leg) || isAdvanceBookingRequired(leg?.pickupBookingInfo) || legContainsGeometry(leg);
 }
 
+// alpha-only comment
 function isRideshareLeg(leg) {
-  var _leg$rideHailingEstim, _leg$rideHailingEstim2;
-
-  return !!((_leg$rideHailingEstim = leg.rideHailingEstimate) !== null && _leg$rideHailingEstim !== void 0 && (_leg$rideHailingEstim2 = _leg$rideHailingEstim.provider) !== null && _leg$rideHailingEstim2 !== void 0 && _leg$rideHailingEstim2.id);
+  return !!leg.rideHailingEstimate?.provider?.id;
 }
-
 function isWalk(mode) {
   if (!mode) return false;
   return mode === "WALK";
 }
-
 function isBicycle(mode) {
   if (!mode) return false;
   return mode === "BICYCLE";
 }
-
 function isBicycleRent(mode) {
   if (!mode) return false;
   return mode === "BICYCLE_RENT";
 }
-
 function isCar(mode) {
   if (!mode) return false;
   return mode.startsWith("CAR");
 }
-
 function isMicromobility(mode) {
   if (!mode) return false;
   return mode.startsWith("MICROMOBILITY") || mode.startsWith("SCOOTER");
 }
-
 function isAccessMode(mode) {
   return isWalk(mode) || isBicycle(mode) || isBicycleRent(mode) || isCar(mode) || isMicromobility(mode);
 }
+
 /**
  * @param  {string}  modesStr a comma-separated list of OTP modes
  * @return {boolean} whether any of the modes are transit modes
  */
-
-
 function hasTransit(modesStr) {
   return modesStr.split(",").some(mode => isTransit(mode));
 }
+
 /**
  * @param  {string}  modesStr a comma-separated list of OTP modes
  * @return {boolean} whether any of the modes are car-based modes
  */
-
-
 function hasCar(modesStr) {
   return modesStr.split(",").some(mode => isCar(mode));
 }
+
 /**
  * @param  {string}  modesStr a comma-separated list of OTP modes
  * @return {boolean} whether any of the modes are bicycle-based modes
  */
-
-
 function hasBike(modesStr) {
   return modesStr.split(",").some(mode => isBicycle(mode) || isBicycleRent(mode));
 }
+
 /**
  * @param  {string}  modesStr a comma-separated list of OTP modes
  * @return {boolean} whether any of the modes are micromobility-based modes
  */
-
-
 function hasMicromobility(modesStr) {
   return modesStr.split(",").some(mode => isMicromobility(mode));
 }
+
 /**
  * @param  {string}  modesStr a comma-separated list of OTP modes
  * @return {boolean} whether any of the modes is a hailing mode
  */
-
-
 function hasHail(modesStr) {
   return modesStr.split(",").some(mode => mode.indexOf("_HAIL") > -1);
 }
+
 /**
  * @param  {string}  modesStr a comma-separated list of OTP modes
  * @return {boolean} whether any of the modes is a rental mode
  */
-
-
 function hasRental(modesStr) {
   return modesStr.split(",").some(mode => mode.indexOf("_RENT") > -1);
 }
-
 function getMapColor(mode) {
   mode = mode || this.get("mode");
   if (mode === "WALK") return "#444";
@@ -237,20 +204,17 @@ function getMapColor(mode) {
   if (mode === "MICROMOBILITY" || mode === "SCOOTER") return "#f5a729";
   return "#aaa";
 }
-
 function toSentenceCase(str) {
   if (str == null) {
     return "";
   }
-
   str = String(str);
   return str.charAt(0).toUpperCase() + str.substr(1).toLowerCase();
 }
+
 /**
  * Derive the company string based on mode and network associated with leg.
  */
-
-
 function getCompanyFromLeg(leg) {
   if (!leg) return null;
   const {
@@ -261,93 +225,78 @@ function getCompanyFromLeg(leg) {
     rentedVehicle,
     rideHailingEstimate
   } = leg;
-
   if (mode === "CAR" && rentedCar) {
     return from.networks[0];
   }
-
   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 && from.networks) {
     return from.networks[0];
   }
-
   return null;
 }
-
 function getItineraryBounds(itinerary) {
   let coords = [];
   itinerary.legs.forEach(leg => {
     const legCoords = _polyline.default.toGeoJSON(leg.legGeometry.points).coordinates.map(c => [c[1], c[0]]);
-
     coords = [...coords, ...legCoords];
   });
   return coords;
 }
+
 /**
  * Return a coords object that encloses the given leg's geometry.
  */
-
-
 function getLegBounds(leg) {
-  const coords = _polyline.default.toGeoJSON(leg.legGeometry.points).coordinates.map(c => [c[1], c[0]]); // in certain cases, there might be zero-length coordinates in the leg
+  const coords = _polyline.default.toGeoJSON(leg.legGeometry.points).coordinates.map(c => [c[1], c[0]]);
+
+  // in certain cases, there might be zero-length coordinates in the leg
   // geometry. In these cases, build us an array of coordinates using the from
   // and to data of the leg.
-
-
   if (coords.length === 0) {
     coords.push([leg.from.lat, leg.from.lon], [leg.to.lat, leg.to.lon]);
   }
-
   return coords;
 }
-/* Returns an interpolated lat-lon at a specified distance along a leg */
 
+/* Returns an interpolated lat-lon at a specified distance along a leg */
 
 function legLocationAtDistance(leg, distance) {
   if (!leg.legGeometry) return null;
-
   try {
     const line = _polyline.default.toGeoJSON(leg.legGeometry.points);
-
     const pt = (0, _along.default)(line, distance, {
       units: "meters"
     });
-
     if (pt && pt.geometry && pt.geometry.coordinates) {
       return [pt.geometry.coordinates[1], pt.geometry.coordinates[0]];
     }
-  } catch (e) {// FIXME handle error!
+  } catch (e) {
+    // FIXME handle error!
   }
-
   return null;
 }
-/* Returns an interpolated elevation at a specified distance along a leg */
 
+/* Returns an interpolated elevation at a specified distance along a leg */
 
 function legElevationAtDistance(points, distance) {
   // Iterate through the combined elevation profile
-  let traversed = 0; // If first point distance is not zero, insert starting point at zero with
+  let traversed = 0;
+  // If first point distance is not zero, insert starting point at zero with
   // null elevation. Encountering this value should trigger the warning below.
-
   if (points[0][0] > 0) {
     points.unshift([0, null]);
   }
-
   for (let i = 1; i < points.length; i++) {
     const start = points[i - 1];
     const elevDistanceSpan = points[i][0] - start[0];
-
     if (distance >= traversed && distance <= traversed + elevDistanceSpan) {
       // Distance falls within this point and the previous one;
       // compute & return interpolated elevation value
@@ -355,28 +304,24 @@ function legElevationAtDistance(points, distance) {
         console.warn("Elevation value does not exist for distance.", distance, traversed);
         return null;
       }
-
       const pct = (distance - traversed) / elevDistanceSpan;
       const elevSpan = points[i][1] - start[1];
       return start[1] + elevSpan * pct;
     }
-
     traversed += elevDistanceSpan;
   }
-
   console.warn("Elevation value does not exist for distance.", distance, traversed);
   return null;
 }
-
 function mapOldElevationComponentToNew(oldElev) {
   return {
     distance: oldElev.first,
     elevation: oldElev.second
   };
-} // Iterate through the steps, building the array of elevation points and
-// keeping track of the minimum and maximum elevations reached
-
+}
 
+// Iterate through the steps, building the array of elevation points and
+// keeping track of the minimum and maximum elevations reached
 function getElevationProfile(steps, unitConversion = 1) {
   let minElev = 100000;
   let maxElev = -100000;
@@ -386,39 +331,32 @@ function getElevationProfile(steps, unitConversion = 1) {
   let previous = null;
   const points = [];
   steps.forEach(step => {
-    var _step$elevation;
-
     // Support for old REST response data (in step.elevation)
-    const stepElevationProfile = step.elevationProfile || Array.isArray(step.elevation) && ((_step$elevation = step.elevation) === null || _step$elevation === void 0 ? void 0 : _step$elevation.map(mapOldElevationComponentToNew));
-
+    const stepElevationProfile = step.elevationProfile || Array.isArray(step.elevation) && step.elevation?.map(mapOldElevationComponentToNew);
     if (!stepElevationProfile || stepElevationProfile.length === 0) {
       traversed += step.distance;
       return;
     }
-
     for (let i = 0; i < stepElevationProfile.length; i++) {
       const elev = stepElevationProfile[i];
-
       if (previous) {
         const diff = (elev.elevation - previous.elevation) * unitConversion;
         if (diff > 0) gain += diff;else loss += diff;
       }
-
-      if (i === 0 && elev.distance !== 0) {// console.warn(`No elevation data available for step ${stepIndex}-${i} at beginning of segment`, elev)
+      if (i === 0 && elev.distance !== 0) {
+        // console.warn(`No elevation data available for step ${stepIndex}-${i} at beginning of segment`, elev)
       }
-
       const convertedElevation = elev.elevation * unitConversion;
       if (convertedElevation < minElev) minElev = convertedElevation;
       if (convertedElevation > maxElev) maxElev = convertedElevation;
-      points.push([traversed + elev.distance, elev.elevation]); // Insert "filler" point if the last point in elevation profile does not
+      points.push([traversed + elev.distance, elev.elevation]);
+      // Insert "filler" point if the last point in elevation profile does not
       // reach the full distance of the step.
-
-      if (i === stepElevationProfile.length - 1 && elev.distance !== step.distance) {// points.push([traversed + step.distance, elev.second])
+      if (i === stepElevationProfile.length - 1 && elev.distance !== step.distance) {
+        // points.push([traversed + step.distance, elev.second])
       }
-
       previous = elev;
     }
-
     traversed += step.distance;
   });
   return {
@@ -430,6 +368,7 @@ function getElevationProfile(steps, unitConversion = 1) {
     loss
   };
 }
+
 /**
  * Uses canvas.measureText to compute and return the width of the given text of given font in pixels.
  *
@@ -438,10 +377,9 @@ function getElevationProfile(steps, unitConversion = 1) {
  *
  * @see https://stackoverflow.com/questions/118241/calculate-text-width-with-javascript/21015393#21015393
  */
-
-
 function getTextWidth(text, font = "22px Arial") {
   // Create custom type for function including reused canvas object
+
   // reuse canvas object for better performance
   const canvas = getTextWidth.canvas || (getTextWidth.canvas = document.createElement("canvas"));
   const context = canvas.getContext("2d");
@@ -449,21 +387,19 @@ function getTextWidth(text, font = "22px Arial") {
   const metrics = context.measureText(text);
   return metrics.width;
 }
+
 /**
  * Get the configured company object for the given network string if the company
  * has been defined in the provided companies array config.
  */
-
-
 function getCompanyForNetwork(networkString, companies = []) {
   const company = companies.find(co => co.id === networkString);
-
   if (!company) {
     console.warn(`No company found in config.yml that matches rented vehicle network: ${networkString}`, companies);
   }
-
   return company;
 }
+
 /**
  * Get a string label to display from a list of vehicle rental networks.
  *
@@ -471,17 +407,13 @@ function getCompanyForNetwork(networkString, companies = []) {
  * @param  {Array<object>}  [companies=[]] An optional list of the companies config.
  * @return {string}  A label for use in presentation on a website.
  */
-
-
 function getCompaniesLabelFromNetworks(networks, companies = []) {
   return (Array.isArray(networks) ? networks : [networks]).map(network => getCompanyForNetwork(network, companies)).filter(co => !!co).map(co => co.label).join("/");
 }
-
 function getTNCLocation(leg, type) {
   const location = leg[type];
   return `${location.lat.toFixed(5)},${location.lon.toFixed(5)}`;
 }
-
 function calculatePhysicalActivity(itinerary) {
   let walkDuration = 0;
   let bikeDuration = 0;
@@ -496,13 +428,12 @@ function calculatePhysicalActivity(itinerary) {
     walkDuration
   };
 }
+
 /**
  * For an itinerary, calculates the TNC fares and returns an object with
  * these values and currency info.
  * It is assumed that the same currency is used for all TNC legs.
  */
-
-
 function calculateTncFares(itinerary) {
   return itinerary.legs.filter(leg => leg.mode === "CAR" && leg.rideHailingEstimate).reduce(({
     maxTNCFare,
@@ -526,6 +457,7 @@ function calculateTncFares(itinerary) {
     minTNCFare: 0
   });
 }
+
 /**
  * Sources:
  * - https://www.itf-oecd.org/sites/default/files/docs/environmental-performance-new-mobility.pdf
@@ -533,8 +465,6 @@ function calculateTncFares(itinerary) {
  * - https://www.itf-oecd.org/sites/default/files/life-cycle-assessment-calculations-2020.xlsx
  * Other values extrapolated.
  */
-
-
 const CARBON_INTENSITY_DEFAULTS = {
   walk: 0.026,
   bicycle: 0.017,
@@ -553,55 +483,48 @@ const CARBON_INTENSITY_DEFAULTS = {
   airplane: 0.382,
   micromobility: 0.095
 };
+
 /**
  * @param {itinerary} itinerary OTP trip itinierary, only legs is required.
  * @param {carbonIntensity} carbonIntensity carbon intensity by mode in grams/meter
  * @param {units} units units to be used in return value
  * @return Amount of carbon in chosen unit
  */
-
-function calculateEmissions( // This type makes all the properties from Itinerary optional except legs.
+function calculateEmissions(
+// This type makes all the properties from Itinerary optional except legs.
 itinerary, carbonIntensity = {}, units) {
-  var _itinerary$legs;
-
   // Apply defaults for any values that we don't have.
-  const carbonIntensityWithDefaults = { ...CARBON_INTENSITY_DEFAULTS,
+  const carbonIntensityWithDefaults = {
+    ...CARBON_INTENSITY_DEFAULTS,
     ...carbonIntensity
-  }; // Distance is in meters, totalCarbon is in grams
+  };
 
-  const totalCarbon = (itinerary === null || itinerary === void 0 ? void 0 : (_itinerary$legs = itinerary.legs) === null || _itinerary$legs === void 0 ? void 0 : _itinerary$legs.reduce((total, leg) => {
+  // Distance is in meters, totalCarbon is in grams
+  const totalCarbon = itinerary?.legs?.reduce((total, leg) => {
     return (leg.distance * carbonIntensityWithDefaults[leg.mode.toLowerCase()] || 0) + total;
-  }, 0)) || 0;
-
+  }, 0) || 0;
   switch (units) {
     case "ounce":
       return totalCarbon / 28.35;
-
     case "kilogram":
       return totalCarbon / 1000;
-
     case "pound":
       return totalCarbon / 454;
-
     case "gram":
     default:
       return totalCarbon;
   }
 }
+
 /**
  * Returns the user-facing stop id to display for a stop or place, using the following priority:
  * 1. stop code,
  * 2. stop id without the agency id portion, if stop id contains an agency portion,
  * 3. stop id, whether null or not (this is the fallback case).
  */
-
-
 function getDisplayedStopId(placeOrStop) {
-  var _stopId;
-
   let stopId;
   let stopCode;
-
   if ("stopId" in placeOrStop) {
     ({
       stopCode,
@@ -613,9 +536,9 @@ function getDisplayedStopId(placeOrStop) {
       id: stopId
     } = placeOrStop);
   }
-
-  return stopCode || ((_stopId = stopId) === null || _stopId === void 0 ? void 0 : _stopId.split(":")[1]) || stopId;
+  return stopCode || stopId?.split(":")[1] || stopId;
 }
+
 /**
  * Extracts useful data from the fare products on a leg, such as the leg cost and transfer info.
  * @param leg Leg with fare products (must have used getLegsWithFares)
@@ -623,8 +546,6 @@ function getDisplayedStopId(placeOrStop) {
  * @param container Fare container (cash, electronic)
  * @returns Object containing price as well as the transfer discount amount, if a transfer was used.
  */
-
-
 function getLegCost(leg, mediumId, riderCategoryId) {
   if (!leg.fareProducts) return {
     price: undefined
@@ -635,16 +556,18 @@ function getLegCost(leg, mediumId, riderCategoryId) {
     // riderCategory and medium can be specifically defined as null to handle
     // generic GTFS based fares from OTP when there is no fare model
     return (product.riderCategory === null ? null : product.riderCategory.id) === riderCategoryId && (product.medium === null ? null : product.medium.id) === mediumId;
-  }); // Custom fare models return "rideCost", generic GTFS fares return "regular"
+  });
 
+  // Custom fare models return "rideCost", generic GTFS fares return "regular"
   const totalCostProduct = relevantFareProducts.find(fp => fp.product.name === "rideCost" || fp.product.name === "regular");
   const transferFareProduct = relevantFareProducts.find(fp => fp.product.name === "transfer");
   return {
-    price: totalCostProduct === null || totalCostProduct === void 0 ? void 0 : totalCostProduct.product.price,
-    transferAmount: transferFareProduct === null || transferFareProduct === void 0 ? void 0 : transferFareProduct.product.price,
-    productUseId: totalCostProduct === null || totalCostProduct === void 0 ? void 0 : totalCostProduct.id
+    price: totalCostProduct?.product.price,
+    transferAmount: transferFareProduct?.product.price,
+    productUseId: totalCostProduct?.id
   };
 }
+
 /**
  * Returns the total itinerary cost for a given set of legs.
  * @param legs Itinerary legs with fare products (must have used getLegsWithFares)
@@ -652,16 +575,13 @@ function getLegCost(leg, mediumId, riderCategoryId) {
  * @param container Fare container (cash, electronic)
  * @returns Money object for the total itinerary cost.
  */
-
-
 function getItineraryCost(legs, mediumId, riderCategoryId) {
-  const legCosts = legs // Only legs with fares (no walking legs)
-  .filter(leg => {
-    var _leg$fareProducts;
-
-    return ((_leg$fareProducts = leg.fareProducts) === null || _leg$fareProducts === void 0 ? void 0 : _leg$fareProducts.length) > 0;
-  }) // Get the leg cost object of each leg
-  .map(leg => getLegCost(leg, mediumId, riderCategoryId)).filter(cost => cost.price !== undefined) // Filter out duplicate use IDs
+  const legCosts = legs
+  // Only legs with fares (no walking legs)
+  .filter(leg => leg.fareProducts?.length > 0)
+  // Get the leg cost object of each leg
+  .map(leg => getLegCost(leg, mediumId, riderCategoryId)).filter(cost => cost.price !== undefined)
+  // Filter out duplicate use IDs
   // One fare product can be used on multiple legs,
   // and we don't want to count it more than once.
   .reduce((prev, cur) => {
@@ -671,111 +591,95 @@ function getItineraryCost(legs, mediumId, riderCategoryId) {
         price: cur.price
       });
     }
-
     return prev;
   }, []).map(productUse => productUse.price);
-  if (legCosts.length === 0) return undefined; // Calculate the total
-
+  if (legCosts.length === 0) return undefined;
+  // Calculate the total
   return legCosts.reduce((prev, cur) => {
     var _prev$currency;
-
     return {
-      amount: prev.amount + (cur === null || cur === void 0 ? void 0 : cur.amount) || 0,
-      currency: (_prev$currency = prev.currency) !== null && _prev$currency !== void 0 ? _prev$currency : cur === null || cur === void 0 ? void 0 : cur.currency
+      amount: prev.amount + cur?.amount || 0,
+      currency: (_prev$currency = prev.currency) !== null && _prev$currency !== void 0 ? _prev$currency : cur?.currency
     };
   }, {
     amount: 0,
     currency: null
   });
 }
-
 const pickupDropoffTypeToOtp1 = otp2Type => {
   switch (otp2Type) {
     case "COORDINATE_WITH_DRIVER":
       return "coordinateWithDriver";
-
     case "CALL_AGENCY":
       return "mustPhone";
-
     case "SCHEDULED":
       return "scheduled";
-
     case "NONE":
       return "none";
-
     default:
       return null;
   }
 };
+const convertGraphQLResponseToLegacy = leg => ({
+  ...leg,
+  agencyBrandingUrl: leg.agency?.url,
+  agencyId: leg.agency?.id,
+  agencyName: leg.agency?.name,
+  agencyUrl: leg.agency?.url,
+  alightRule: pickupDropoffTypeToOtp1(leg.dropoffType),
+  boardRule: pickupDropoffTypeToOtp1(leg.pickupType),
+  dropOffBookingInfo: {
+    latestBookingTime: leg.dropOffBookingInfo
+  },
+  from: {
+    ...leg.from,
+    stopCode: leg.from.stop?.code,
+    stopId: leg.from.stop?.gtfsId
+  },
+  route: leg.route?.shortName,
+  routeColor: leg.route?.color,
+  routeId: leg.route?.gtfsId,
+  routeLongName: leg.route?.longName,
+  routeShortName: leg.route?.shortName,
+  routeTextColor: leg.route?.textColor,
+  to: {
+    ...leg.to,
+    stopCode: leg.to.stop?.code,
+    stopId: leg.to.stop?.gtfsId
+  },
+  tripHeadsign: leg.trip?.tripHeadsign,
+  tripId: leg.trip?.gtfsId
+});
 
-const convertGraphQLResponseToLegacy = leg => {
-  var _leg$agency, _leg$agency2, _leg$agency3, _leg$agency4, _leg$from$stop, _leg$from$stop2, _leg$route, _leg$route2, _leg$route3, _leg$route4, _leg$route5, _leg$route6, _leg$to$stop, _leg$to$stop2, _leg$trip, _leg$trip2;
-
-  return { ...leg,
-    agencyBrandingUrl: (_leg$agency = leg.agency) === null || _leg$agency === void 0 ? void 0 : _leg$agency.url,
-    agencyId: (_leg$agency2 = leg.agency) === null || _leg$agency2 === void 0 ? void 0 : _leg$agency2.id,
-    agencyName: (_leg$agency3 = leg.agency) === null || _leg$agency3 === void 0 ? void 0 : _leg$agency3.name,
-    agencyUrl: (_leg$agency4 = leg.agency) === null || _leg$agency4 === void 0 ? void 0 : _leg$agency4.url,
-    alightRule: pickupDropoffTypeToOtp1(leg.dropoffType),
-    boardRule: pickupDropoffTypeToOtp1(leg.pickupType),
-    dropOffBookingInfo: {
-      latestBookingTime: leg.dropOffBookingInfo
-    },
-    from: { ...leg.from,
-      stopCode: (_leg$from$stop = leg.from.stop) === null || _leg$from$stop === void 0 ? void 0 : _leg$from$stop.code,
-      stopId: (_leg$from$stop2 = leg.from.stop) === null || _leg$from$stop2 === void 0 ? void 0 : _leg$from$stop2.gtfsId
-    },
-    route: (_leg$route = leg.route) === null || _leg$route === void 0 ? void 0 : _leg$route.shortName,
-    routeColor: (_leg$route2 = leg.route) === null || _leg$route2 === void 0 ? void 0 : _leg$route2.color,
-    routeId: (_leg$route3 = leg.route) === null || _leg$route3 === void 0 ? void 0 : _leg$route3.gtfsId,
-    routeLongName: (_leg$route4 = leg.route) === null || _leg$route4 === void 0 ? void 0 : _leg$route4.longName,
-    routeShortName: (_leg$route5 = leg.route) === null || _leg$route5 === void 0 ? void 0 : _leg$route5.shortName,
-    routeTextColor: (_leg$route6 = leg.route) === null || _leg$route6 === void 0 ? void 0 : _leg$route6.textColor,
-    to: { ...leg.to,
-      stopCode: (_leg$to$stop = leg.to.stop) === null || _leg$to$stop === void 0 ? void 0 : _leg$to$stop.code,
-      stopId: (_leg$to$stop2 = leg.to.stop) === null || _leg$to$stop2 === void 0 ? void 0 : _leg$to$stop2.gtfsId
-    },
-    tripHeadsign: (_leg$trip = leg.trip) === null || _leg$trip === void 0 ? void 0 : _leg$trip.tripHeadsign,
-    tripId: (_leg$trip2 = leg.trip) === null || _leg$trip2 === void 0 ? void 0 : _leg$trip2.gtfsId
-  };
-};
 /** Extracts the route number for a leg returned from OTP1 or OTP2. */
-
-
 exports.convertGraphQLResponseToLegacy = convertGraphQLResponseToLegacy;
-
 const getLegRouteShortName = leg => {
   const {
     route,
     routeShortName
-  } = leg; // typeof route === "object" denotes newer OTP2 responses. routeShortName and route as string is OTP1.
-
-  return typeof route === "object" ? route === null || route === void 0 ? void 0 : route.shortName : routeShortName || route;
+  } = leg;
+  // typeof route === "object" denotes newer OTP2 responses. routeShortName and route as string is OTP1.
+  return typeof route === "object" ? route?.shortName : routeShortName || route;
 };
-/** Extract the route long name for a leg returned from OTP1 or OTP2. */
-
 
+/** Extract the route long name for a leg returned from OTP1 or OTP2. */
 exports.getLegRouteShortName = getLegRouteShortName;
-
 const getLegRouteLongName = leg => {
   const {
     route,
     routeLongName
-  } = leg; // typeof route === "object" denotes newer OTP2 responses. routeLongName is OTP1.
-
-  return typeof route === "object" ? route === null || route === void 0 ? void 0 : route.longName : routeLongName;
+  } = leg;
+  // typeof route === "object" denotes newer OTP2 responses. routeLongName is OTP1.
+  return typeof route === "object" ? route?.longName : routeLongName;
 };
+
 /**
  * Returns the route short name, or the route long name if no short name is provided.
  * This is happens with Seattle area streetcars and ferries.
  */
-
-
 exports.getLegRouteLongName = getLegRouteLongName;
-
 const getLegRouteName = leg => {
   return getLegRouteShortName(leg) || getLegRouteLongName(leg);
 };
-
 exports.getLegRouteName = getLegRouteName;
 //# sourceMappingURL=itinerary.js.map