@opentripplanner/core-utils 4.10.0 → 4.11.2

package/src/map.js

@@ -1,4 +1,10 @@
-import { getPlaceName, isTransit, isFlex, toSentenceCase } from "./itinerary";
+import {
+  getPlaceName,
+  isTransit,
+  isFlex,
+  toSentenceCase,
+  isAccessMode
+} from "./itinerary";
 
 import {
   coordsToString,
@@ -102,15 +108,11 @@ export function itineraryToTransitive(
   });
 
   itin.legs.forEach((leg, idx) => {
-    if (
-      leg.mode === "WALK" ||
-      leg.mode === "BICYCLE" ||
-      leg.mode === "CAR" ||
-      leg.mode === "MICROMOBILITY"
-    ) {
+    if (isAccessMode(leg.mode)) {
       let fromPlaceId;
       if (leg.from.bikeShareId) {
         fromPlaceId = `bicycle_rent_station_${leg.from.bikeShareId}`;
+        // TODO: does this need to change to be OTP2 compatible?
       } else if (leg.from.vertexType === "VEHICLERENTAL") {
         fromPlaceId = `escooter_rent_station_${leg.from.name}`;
       } else if (

package/src/profile.js

@@ -28,7 +28,7 @@ export function filterProfileOptions(response) {
 }
 
 function locationString(str) {
-  return str ? str.split(",")[0] : null;
+  return str?.split(",")[0];
 }
 
 function accessToLeg(access, origin, destination) {

package/src/query-params.js

@@ -168,7 +168,14 @@ const queryParams = [
     name: "maxWalkDistance",
     routingTypes: ["ITINERARY"],
     applicable: query =>
-      query.mode && hasTransit(query.mode) && query.mode.indexOf("WALK") !== -1,
+      /* Since this query variable isn't in this list, it's not included in the generated query
+       * It does however allow us to determine if we should show the OTP1 max walk distance
+       * dropdown or the OTP2 walk reluctance slider
+       */
+      !query.otp2 &&
+      query.mode &&
+      hasTransit(query.mode) &&
+      query.mode.indexOf("WALK") !== -1,
     default: 1207, // 3/4 mi.
     selector: "DROPDOWN",
     label: "Maximum Walk",
@@ -271,7 +278,8 @@ const queryParams = [
   {
     /* optimize -- how to optimize a trip (non-bike, non-micromobility trips) */
     name: "optimize",
-    applicable: query => hasTransit(query.mode) && !hasBike(query.mode),
+    applicable: query =>
+      !query.otp2 && hasTransit(query.mode) && !hasBike(query.mode),
     routingTypes: ["ITINERARY"],
     default: "QUICK",
     selector: "DROPDOWN",
@@ -291,7 +299,7 @@ const queryParams = [
   {
     /* optimizeBike -- how to optimize an bike-based trip */
     name: "optimizeBike",
-    applicable: query => hasBike(query.mode),
+    applicable: query => !query.otp2 && hasBike(query.mode),
     routingTypes: ["ITINERARY"],
     default: "SAFE",
     selector: "DROPDOWN",
@@ -390,6 +398,23 @@ const queryParams = [
     ]
   },
 
+  {
+    name: "walkReluctance",
+    routingTypes: ["ITINERARY", "PROFILE"],
+    selector: "SLIDER",
+    low: 0.5,
+    high: 20,
+    step: 0.5,
+    label: "walk reluctance",
+    labelLow: "More Walking",
+    labelHigh: "More Transit",
+    applicable: query =>
+      /* Since this query variable isn't in this list, it's not included in the generated query
+       * It does however allow us to determine if we should show the OTP1 max walk distance
+       * dropdown or the OTP2 walk reluctance slider
+       */
+      !!query.otp2 && query.mode && query.mode.indexOf("WALK") !== -1
+  },
   {
     /* maxBikeTime -- the maximum time the user will spend biking in minutes */
     name: "maxBikeTime",
@@ -536,7 +561,8 @@ const queryParams = [
     applicable: query =>
       query.mode &&
       query.mode.indexOf("MICROMOBILITY") !== -1 &&
-      query.mode.indexOf("MICROMOBILITY_RENT") === -1,
+      query.mode.indexOf("MICROMOBILITY_RENT") === -1 &&
+      query.mode.indexOf("SCOOTER") === -1,
     options: [
       {
         text: "Kid's hoverboard (6mph)",
@@ -673,10 +699,6 @@ const queryParams = [
     name: "maxPreTransitTime",
     routingTypes: ["ITINERARY"]
   },
-  {
-    name: "walkReluctance",
-    routingTypes: ["ITINERARY"]
-  },
   {
     name: "waitReluctance",
     routingTypes: ["ITINERARY"]

package/src/query.js

@@ -21,6 +21,7 @@ export { summarizeQuery };
 export const defaultParams = [
   "wheelchair",
   "maxWalkDistance",
+  "walkReluctance",
   "maxWalkTime",
   "walkSpeed",
   "maxBikeDistance",

package/src/time.js

@@ -109,9 +109,9 @@ export function formatDuration(seconds) {
 
 /**
  * Formats an elapsed time in seconds, minutes, hours duration for display in narrative
- * TODO: internationalization
  * @param {number} seconds duration in seconds
- * @returns {string} formatted text representation
+ * @param {object} region  an object that allows internationalization of the time
+ * @returns {string}       formatted text representation
  */
 export function formatDurationWithSeconds(seconds, region) {
   return formatDurationLikeMoment(seconds, { enabled: true, code: region });