@opentripplanner/core-utils 4.9.0 → 4.11.1

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",
@@ -673,10 +698,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

@@ -65,6 +65,22 @@ function formatDurationLikeMoment(
     }
   );
 }
+
+/**
+ * Breaks up a duration in seconds into hours, minutes, and seconds.
+ * @param {number} seconds The number of seconds to break up
+ * @returns an object with fields with the corresponding, hours, minutes, seconds.
+ */
+export function toHoursMinutesSeconds(seconds) {
+  const hours = Math.floor(seconds / 3600);
+  const minutes = Math.floor((seconds - hours * 3600) / 60);
+  return {
+    hours,
+    minutes,
+    seconds: seconds - hours * 3600 - minutes * 60
+  };
+}
+
 /**
  * @param  {[type]} config the OTP config object found in store
  * @return {string}        the config-defined time formatter or HH:mm (24-hr time)
@@ -93,13 +109,22 @@ 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 });
 }
+
+/**
+ * Offsets a time according to the provided time options
+ * and returns the result.
+ */
+export function offsetTime(ms, options) {
+  return ms + (options?.offset || 0);
+}
+
 /**
  * Formats a time value for display in narrative
  * TODO: internationalization/timezone
@@ -108,7 +133,7 @@ export function formatDurationWithSeconds(seconds, region) {
  */
 export function formatTime(ms, options) {
   return format(
-    ms + (options?.offset || 0),
+    offsetTime(ms, options),
     options?.format || OTP_API_TIME_FORMAT
   );
 }