@opentripplanner/core-utils 4.11.0 → 4.11.3

package/src/__tests__/__snapshots__/query.js.snap

@@ -42,7 +42,7 @@ Object {
   "maxBikeDistance": 4828,
   "maxBikeTime": 20,
   "maxEScooterDistance": 4828,
-  "maxWalkDistance": 1207,
+  "maxWalkDistance": 1609,
   "maxWalkTime": 15,
   "mode": "WALK,TRANSIT",
   "numItineraries": 3,
@@ -66,7 +66,7 @@ Object {
   "date": "2020-08-24",
   "fromPlace": "Steamer Lane, Santa Cruz, CA, 95060, USA::36.95471026341096,-122.0248185852425",
   "ignoreRealtimeUpdates": false,
-  "maxWalkDistance": 1207,
+  "maxWalkDistance": 1609,
   "mode": "WALK,FLEX_EGRESS,FLEX_ACCESS,FLEX_DIRECT,TRANSIT",
   "numItineraries": 3,
   "optimize": "QUICK",
@@ -100,7 +100,7 @@ Object {
   "date": "2020-08-24",
   "fromPlace": "Steamer Lane, Santa Cruz, CA, 95060, USA::36.95471026341096,-122.0248185852425",
   "ignoreRealtimeUpdates": false,
-  "maxWalkDistance": 1207,
+  "maxWalkDistance": 1609,
   "mode": "FLEX_EGRESS,FLEX_ACCESS,FLEX_DIRECT,WALK,BIKE,WALK,TRANSIT,BUS",
   "numItineraries": 3,
   "optimize": "QUICK",
@@ -157,7 +157,7 @@ Object {
     "Lighthouse Point Park, Santa Cruz, CA, USA::36.95145225211049,-122.02672866668283",
     "Natural Bridges State Beach, 2531 W Cliff Dr, Santa Cruz, CA, 95060, USA::36.95028619314903,-122.05711810284686",
   ],
-  "maxWalkDistance": 1207,
+  "maxWalkDistance": 1609,
   "mode": "WALK,TRANSIT",
   "numItineraries": 3,
   "optimize": "QUICK",
@@ -191,13 +191,32 @@ Object {
 }
 `;
 
+exports[`query getRoutingParams should create routing params for personal micromobility query 2`] = `
+Object {
+  "arriveBy": false,
+  "companies": "FAKECOMPANY",
+  "date": "2020-08-24",
+  "fromPlace": "Steamer Lane, Santa Cruz, CA, 95060, USA::36.95471026341096,-122.0248185852425",
+  "ignoreRealtimeUpdates": false,
+  "maxEScooterDistance": 4828,
+  "maxWalkDistance": 4828,
+  "mode": "SCOOTER,BUS",
+  "numItineraries": 3,
+  "optimize": "QUICK",
+  "otherThanPreferredRoutesPenalty": 900,
+  "showIntermediateStops": true,
+  "time": "21:53",
+  "toPlace": "Municipal Wharf St, Santa Cruz, CA, 95060, USA::36.961843106786766,-122.02402657342725",
+}
+`;
+
 exports[`query getRoutingParams should create routing params for standard flex query 1`] = `
 Object {
   "arriveBy": false,
   "date": "2020-08-24",
   "fromPlace": "Steamer Lane, Santa Cruz, CA, 95060, USA::36.95471026341096,-122.0248185852425",
   "ignoreRealtimeUpdates": false,
-  "maxWalkDistance": 1207,
+  "maxWalkDistance": 1609,
   "mode": "WALK,TRANSIT,FLEX_EGRESS,FLEX_ACCESS,FLEX_DIRECT",
   "numItineraries": 3,
   "optimize": "QUICK",
@@ -230,7 +249,7 @@ Object {
   "date": "2020-08-24",
   "fromPlace": "Steamer Lane, Santa Cruz, CA, 95060, USA::36.95471026341096,-122.0248185852425",
   "ignoreRealtimeUpdates": false,
-  "maxWalkDistance": 1207,
+  "maxWalkDistance": 1609,
   "mode": "WALK,TRANSIT",
   "numItineraries": 3,
   "optimize": "QUICK",

package/src/__tests__/query.js

@@ -80,6 +80,14 @@ describe("query", () => {
           watts: 250
         })
       ).toMatchSnapshot();
+      expect(
+        getRoutingParams(fakeConfig, {
+          ...makeBaseTestQuery(),
+          companies: "FAKECOMPANY",
+          mode: "SCOOTER,BUS",
+          watts: 250
+        })
+      ).toMatchSnapshot();
     });
 
     it("should create routing params for intermediate places query", () => {

package/src/deprecated.js

@@ -1,7 +1,14 @@
 import moment from "moment";
 
-// Need to avoid cyclic dependency resolution
+/**
+ * To disable cyclic dependency resolution we need to require() within methods
+ * This is a good reason to disable this eslint-rule
+ */
 /* eslint-disable global-require */
+
+/**
+ * Generates a warning to tell developer that they are using deprecated methods!
+ */
 export function logDeprecationWarning(method, alternative) {
   console.warn(
     `${method ||
@@ -83,6 +90,7 @@ export function getLegModeLabel(leg) {
         return "Streetcar";
       return "Light Rail";
     case "MICROMOBILITY":
+    case "SCOOTER":
       return "Ride";
     default:
       return require("./itinerary").toSentenceCase(leg.mode);

package/src/itinerary.js

@@ -104,7 +104,7 @@ export function isCar(mode) {
 
 export function isMicromobility(mode) {
   if (!mode) return false;
-  return mode.startsWith("MICROMOBILITY");
+  return mode.startsWith("MICROMOBILITY") || mode.startsWith("SCOOTER");
 }
 
 export function isAccessMode(mode) {
@@ -177,7 +177,7 @@ export function getMapColor(mode) {
   if (mode === "TRAM") return "#800";
   if (mode === "FERRY") return "#008";
   if (mode === "CAR") return "#444";
-  if (mode === "MICROMOBILITY") return "#f5a729";
+  if (mode === "MICROMOBILITY" || mode === "SCOOTER") return "#f5a729";
   return "#aaa";
 }
 
@@ -204,7 +204,11 @@ export function getCompanyFromLeg(leg) {
   if (mode === "BICYCLE" && rentedBike && from.networks) {
     return from.networks[0];
   }
-  if (mode === "MICROMOBILITY" && rentedVehicle && from.networks) {
+  if (
+    (mode === "MICROMOBILITY" || mode === "SCOOTER") &&
+    rentedVehicle &&
+    from.networks
+  ) {
     return from.networks[0];
   }
   return null;

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

@@ -176,7 +176,7 @@ const queryParams = [
       query.mode &&
       hasTransit(query.mode) &&
       query.mode.indexOf("WALK") !== -1,
-    default: 1207, // 3/4 mi.
+    default: 1609, // 1 mi.
     selector: "DROPDOWN",
     label: "Maximum Walk",
     options: [
@@ -278,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",
@@ -298,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",
@@ -405,6 +406,8 @@ const queryParams = [
     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
@@ -558,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)",

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 });