@opentripplanner/core-utils 5.0.1 → 6.0.0

package/src/map.ts

@@ -1,19 +1,5 @@
-import {
-  Company,
-  Itinerary,
-  LatLngArray,
-  Leg,
-  Location,
-  TransitiveData,
-  UserPosition
-} from "@opentripplanner/types";
-import {
-  getPlaceName,
-  isAccessMode,
-  isFlex,
-  isTransit,
-  toSentenceCase
-} from "./itinerary";
+import { LatLngArray, Location, UserPosition } from "@opentripplanner/types";
+import { toSentenceCase } from "./itinerary";
 
 import {
   coordsToString,
@@ -78,255 +64,6 @@ export function matchLatLon(location1: Location, location2: Location): boolean {
   return location1.lat === location2.lat && location1.lon === location2.lon;
 }
 
-/**
- * Converts an OTP itinerary object to a transtive.js itinerary object.
- * @param {*} itin Required OTP itinerary (see @opentripplanner/core-utils/types#itineraryType) to convert.
- * @param {*} companies Optional list of companies, used for labeling vehicle rental locations.
- * @param {*} getRouteLabel Optional function that takes an itinerary leg (see @opentripplanner/core-utils/types#legType)
- *                          and returns a string representing the route label to display for that leg.
- * @returns An itinerary in the transitive.js format.
- */
-export function itineraryToTransitive(
-  itin: Itinerary,
-  companies: Company[],
-  getRouteLabel: (leg: Leg) => string,
-  disableFlexArc: boolean
-): TransitiveData {
-  const tdata = {
-    journeys: [],
-    streetEdges: [],
-    places: [],
-    patterns: [],
-    routes: [],
-    stops: []
-  };
-  const routes = {};
-  const stops = {};
-  let streetEdgeId = 0;
-  let patternId = 0;
-
-  const journey = {
-    journey_id: "itin",
-    // This string is not shown in the UI
-    journey_name: "Iterarary-derived Journey",
-    segments: []
-  };
-
-  // add 'from' and 'to' places to the tdata places array
-  tdata.places.push({
-    place_id: "from",
-    place_lat: itin.legs[0].from.lat,
-    place_lon: itin.legs[0].from.lon
-  });
-  tdata.places.push({
-    place_id: "to",
-    place_lat: itin.legs[itin.legs.length - 1].to.lat,
-    place_lon: itin.legs[itin.legs.length - 1].to.lon
-  });
-
-  itin.legs.forEach((leg, idx) => {
-    if (isAccessMode(leg.mode)) {
-      let fromPlaceId: string;
-      if (leg.from.bikeShareId) {
-        fromPlaceId = `bicycle_rent_station_${leg.from.bikeShareId}`;
-        if (
-          // OTP2 Scooter case
-          leg.mode === "SCOOTER"
-        ) {
-          fromPlaceId = `escooter_rent_station_${leg.from.bikeShareId}`;
-        }
-      } else if (leg.from.vertexType === "VEHICLERENTAL") {
-        // OTP1 Scooter case
-        fromPlaceId = `escooter_rent_station_${leg.from.name}`;
-      } else if (
-        leg.mode === "CAR" &&
-        idx > 0 &&
-        itin.legs[idx - 1].mode === "WALK"
-      ) {
-        // create a special place ID for car legs preceded by walking legs
-        fromPlaceId = `itin_car_${streetEdgeId}_from`;
-      } else if (!fromPlaceId) {
-        fromPlaceId = `itin_street_${streetEdgeId}_from`;
-      }
-
-      let toPlaceId;
-      if (leg.to.bikeShareId) {
-        toPlaceId = `bicycle_rent_station_${leg.to.bikeShareId}`;
-        // OTP2 scooter case
-        // Need to check next leg since this is a "to" place "
-        if (leg.mode === "SCOOTER" || itin.legs?.[idx + 1].mode === "SCOOTER") {
-          toPlaceId = `escooter_rent_station_${leg.to.bikeShareId}`;
-        }
-      } else if (leg.to.vertexType === "VEHICLERENTAL") {
-        toPlaceId = `escooter_rent_station_${leg.to.name}`;
-      } else if (
-        leg.mode === "CAR" &&
-        idx < itin.legs.length - 1 &&
-        itin.legs[idx + 1].mode === "WALK"
-      ) {
-        // create a special place ID for car legs followed by walking legs
-        toPlaceId = `itin_car_${streetEdgeId}_to`;
-      } else if (!toPlaceId) {
-        toPlaceId = `itin_street_${streetEdgeId}_to`;
-      }
-
-      const segment = {
-        arc: false,
-        type: leg.mode,
-        streetEdges: [streetEdgeId],
-        from: { type: "PLACE", place_id: fromPlaceId },
-        to: { type: "PLACE", place_id: toPlaceId }
-      };
-      // For TNC segments, draw using an arc
-      if (leg.mode === "CAR" && leg.hailedCar) segment.arc = true;
-      journey.segments.push(segment);
-
-      tdata.streetEdges.push({
-        edge_id: streetEdgeId,
-        geometry: leg.legGeometry
-      });
-      tdata.places.push({
-        place_id: fromPlaceId,
-        // Do not label the from place in addition to the to place. Otherwise,
-        // in some cases (bike rental station) the label for a single place will
-        // appear twice on the rendered transitive view.
-        // See https://github.com/conveyal/trimet-mod-otp/issues/152
-        // place_name: leg.from.name,
-        place_lat: leg.from.lat,
-        place_lon: leg.from.lon
-      });
-      tdata.places.push({
-        place_id: toPlaceId,
-        // This string is not shown in the UI
-        place_name: getPlaceName(leg.to, companies),
-        place_lat: leg.to.lat,
-        place_lon: leg.to.lon
-      });
-      streetEdgeId++;
-    }
-
-    if (isTransit(leg.mode)) {
-      // Flex routes sometimes have the same from and to IDs, but
-      // these stops still need to be rendered separately!
-      if (leg.from.stopId === leg.to.stopId) {
-        leg.to.stopId = `${leg.to.stopId}_flexed_to`;
-      }
-      // determine if we have valid inter-stop geometry
-      const hasInterStopGeometry = !!leg.interStopGeometry;
-      const hasLegGeometry = !!leg.legGeometry?.points;
-      const hasIntermediateStopGeometry =
-        hasInterStopGeometry &&
-        leg.intermediateStops &&
-        leg.interStopGeometry.length === leg.intermediateStops.length + 1;
-
-      // create leg-specific pattern
-      const ptnId = `ptn_${patternId}`;
-      const pattern = {
-        pattern_id: ptnId,
-        // This string is not shown in the UI
-        pattern_name: `Pattern ${patternId}`,
-        route_id: leg.routeId,
-        stops: []
-      };
-
-      // add 'from' stop to stops dictionary and pattern object
-      stops[leg.from.stopId] = {
-        stop_id: leg.from.stopId,
-        stop_name: leg.from.name,
-        stop_lat: leg.from.lat,
-        stop_lon: leg.from.lon
-      };
-      pattern.stops.push({ stop_id: leg.from.stopId });
-
-      // add intermediate stops to stops dictionary and pattern object
-      // If there is no intermediateStopGeometry, do not add the intermediate stops
-      // as it will be straight lines instead of the nice legGeometry (but only if
-      // the legGeometry exists).
-      if (
-        leg.intermediateStops &&
-        (hasIntermediateStopGeometry || !hasLegGeometry)
-      ) {
-        leg.intermediateStops.forEach((stop, i) => {
-          stops[stop.stopId] = {
-            stop_id: stop.stopId,
-            stop_name: stop.name,
-            stop_lat: stop.lat,
-            stop_lon: stop.lon
-          };
-          pattern.stops.push({
-            stop_id: stop.stopId,
-            geometry:
-              hasIntermediateStopGeometry && leg.interStopGeometry[i].points
-          });
-        });
-      }
-
-      // add 'to' stop to stops dictionary and pattern object
-      stops[leg.to.stopId] = {
-        stop_id: leg.to.stopId,
-        stop_name: leg.to.name,
-        stop_lat: leg.to.lat,
-        stop_lon: leg.to.lon
-      };
-      pattern.stops.push({
-        stop_id: leg.to.stopId,
-        geometry:
-          // Some legs don't have intermediateStopGeometry, but do have valid legGeometry
-          (hasInterStopGeometry || hasLegGeometry) &&
-          (hasIntermediateStopGeometry
-            ? leg.interStopGeometry[leg.interStopGeometry.length - 1].points
-            : leg.legGeometry.points)
-      });
-
-      // add route to the route dictionary
-      // with a custom route label if specified.
-      const routeLabel =
-        typeof getRouteLabel === "function"
-          ? getRouteLabel(leg)
-          : leg.routeShortName;
-      routes[leg.routeId] = {
-        agency_id: leg.agencyId,
-        route_id: leg.routeId,
-        route_short_name: routeLabel || "",
-        route_long_name: leg.routeLongName || "",
-        route_type: leg.routeType,
-        route_color: leg.routeColor
-      };
-
-      // add the pattern to the tdata patterns array
-      tdata.patterns.push(pattern);
-
-      // add the pattern reference to the journey object
-      journey.segments.push({
-        arc:
-          typeof disableFlexArc === "undefined" ? isFlex(leg) : !disableFlexArc,
-        type: "TRANSIT",
-        patterns: [
-          {
-            pattern_id: ptnId,
-            from_stop_index: 0,
-            to_stop_index: hasIntermediateStopGeometry
-              ? leg.intermediateStops.length + 2 - 1
-              : 1
-          }
-        ]
-      });
-
-      patternId++;
-    }
-  });
-
-  // add the routes and stops to the tdata arrays
-  tdata.routes.push(...Object.values(routes));
-  tdata.stops.push(...Object.values(stops));
-
-  // add the journey to the tdata journeys array
-  tdata.journeys.push(journey);
-
-  // console.log('derived tdata', tdata);
-  return tdata;
-}
-
 type TransitivePlaceRaw = {
   place_id: string;
 };

package/src/query-params.js

@@ -394,8 +394,8 @@ const queryParams = [
     name: "walkReluctance",
     routingTypes: ["ITINERARY", "PROFILE"],
     selector: "SLIDER",
-    low: 0.5,
-    high: 20,
+    low: 1,
+    high: 10,
     step: 0.5,
     label: "walk reluctance",
     labelLow: "More Walking",

package/tsconfig.tsbuildinfo

@@ -227,8 +227,8 @@
         "affectsGlobalScope": false
       },
       "./src/map.ts": {
-        "version": "a0e805c7d0db4a9a52d6b2135e414cb146186f16d6da866b8fb0a527cedd573f",
-        "signature": "bfd604d32f4b9db8bfec69a5a12f13afc760d5ad4010667b01c391d69d1a30e6",
+        "version": "56827235c32de3b17b3fe76e381b6780764f101f06bcaac7e6ab9dcc3ab2445e",
+        "signature": "043843512a3bc2d7d5404aab10e63317627a35d3755665eb8631b3998e1517dd",
         "affectsGlobalScope": false
       },
       "./src/route.ts": {
@@ -311,16 +311,16 @@
         "signature": "117ffeecf6c55e25b6446f449ad079029b5e7317399b0a693858faaaea5ca73e",
         "affectsGlobalScope": false
       },
+      "../../node_modules/@types/estree/index.d.ts": {
+        "version": "7d7c8ef7d48a035142c07dae60545ecc0e4af4c337742760cb09726f2f8e31db",
+        "signature": "7d7c8ef7d48a035142c07dae60545ecc0e4af4c337742760cb09726f2f8e31db",
+        "affectsGlobalScope": false
+      },
       "../../node_modules/@types/flat/index.d.ts": {
         "version": "d9890ea8f1da57be3c2e2d3627b787cd4b4a463fd1747c823a0de24b240c8fe5",
         "signature": "d9890ea8f1da57be3c2e2d3627b787cd4b4a463fd1747c823a0de24b240c8fe5",
         "affectsGlobalScope": false
       },
-      "../../node_modules/@types/geojson/index.d.ts": {
-        "version": "8c2e6e491e1a08855b8bf70820184ff66ae0d43f7cf0311fc680e6d860af211c",
-        "signature": "8c2e6e491e1a08855b8bf70820184ff66ae0d43f7cf0311fc680e6d860af211c",
-        "affectsGlobalScope": false
-      },
       "../../node_modules/@types/node/assert/strict.d.ts": {
         "version": "c7bdc99177a2a94d25fb13722adaaf5b3291bf70b4d1b27584ba189dd3889ba3",
         "signature": "c7bdc99177a2a94d25fb13722adaaf5b3291bf70b4d1b27584ba189dd3889ba3",
@@ -581,6 +581,16 @@
         "signature": "30368d3789ec56ef3006c5f2115bd00faa21471aed6cbe6fec54a5683e5497ed",
         "affectsGlobalScope": false
       },
+      "../../node_modules/@types/fs-extra/index.d.ts": {
+        "version": "6435575b4feae200831d37df9f871de6e695c64d3148611fe1b4d714d648ea24",
+        "signature": "6435575b4feae200831d37df9f871de6e695c64d3148611fe1b4d714d648ea24",
+        "affectsGlobalScope": false
+      },
+      "../../node_modules/@types/geojson/index.d.ts": {
+        "version": "8c2e6e491e1a08855b8bf70820184ff66ae0d43f7cf0311fc680e6d860af211c",
+        "signature": "8c2e6e491e1a08855b8bf70820184ff66ae0d43f7cf0311fc680e6d860af211c",
+        "affectsGlobalScope": false
+      },
       "../../node_modules/@types/minimatch/index.d.ts": {
         "version": "95c22bc19835e28e2e524a4bb8898eb5f2107b640d7279a6d3aade261916bbf2",
         "signature": "95c22bc19835e28e2e524a4bb8898eb5f2107b640d7279a6d3aade261916bbf2",
@@ -1146,6 +1156,11 @@
         "signature": "3a1e165b22a1cb8df82c44c9a09502fd2b33f160cd277de2cd3a055d8e5c6b27",
         "affectsGlobalScope": false
       },
+      "../../node_modules/@types/json-stable-stringify/index.d.ts": {
+        "version": "626520302b2c8880e9eaa3a6a12022cc8b577a32e4d903aef85e3dd275063da4",
+        "signature": "626520302b2c8880e9eaa3a6a12022cc8b577a32e4d903aef85e3dd275063da4",
+        "affectsGlobalScope": false
+      },
       "../../node_modules/@types/json5/index.d.ts": {
         "version": "96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538",
         "signature": "96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538",
@@ -1466,10 +1481,20 @@
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
       ],
+      "../../node_modules/@types/estree/index.d.ts": [
+        "../../node_modules/date-fns-tz/typings.d.ts",
+        "../../node_modules/date-fns/typings.d.ts"
+      ],
       "../../node_modules/@types/flat/index.d.ts": [
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
       ],
+      "../../node_modules/@types/fs-extra/index.d.ts": [
+        "../../node_modules/@types/node/fs.d.ts",
+        "../../node_modules/@types/node/index.d.ts",
+        "../../node_modules/date-fns-tz/typings.d.ts",
+        "../../node_modules/date-fns/typings.d.ts"
+      ],
       "../../node_modules/@types/geojson/index.d.ts": [
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
@@ -1721,6 +1746,10 @@
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
       ],
+      "../../node_modules/@types/json-stable-stringify/index.d.ts": [
+        "../../node_modules/date-fns-tz/typings.d.ts",
+        "../../node_modules/date-fns/typings.d.ts"
+      ],
       "../../node_modules/@types/json5/index.d.ts": [
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
@@ -3101,10 +3130,20 @@
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
       ],
+      "../../node_modules/@types/estree/index.d.ts": [
+        "../../node_modules/date-fns-tz/typings.d.ts",
+        "../../node_modules/date-fns/typings.d.ts"
+      ],
       "../../node_modules/@types/flat/index.d.ts": [
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
       ],
+      "../../node_modules/@types/fs-extra/index.d.ts": [
+        "../../node_modules/@types/node/fs.d.ts",
+        "../../node_modules/@types/node/index.d.ts",
+        "../../node_modules/date-fns-tz/typings.d.ts",
+        "../../node_modules/date-fns/typings.d.ts"
+      ],
       "../../node_modules/@types/geojson/index.d.ts": [
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
@@ -3356,6 +3395,10 @@
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
       ],
+      "../../node_modules/@types/json-stable-stringify/index.d.ts": [
+        "../../node_modules/date-fns-tz/typings.d.ts",
+        "../../node_modules/date-fns/typings.d.ts"
+      ],
       "../../node_modules/@types/json5/index.d.ts": [
         "../../node_modules/date-fns-tz/typings.d.ts",
         "../../node_modules/date-fns/typings.d.ts"
@@ -4654,7 +4697,9 @@
       "../../node_modules/@types/color-convert/route.d.ts",
       "../../node_modules/@types/color-name/index.d.ts",
       "../../node_modules/@types/cookie/index.d.ts",
+      "../../node_modules/@types/estree/index.d.ts",
       "../../node_modules/@types/flat/index.d.ts",
+      "../../node_modules/@types/fs-extra/index.d.ts",
       "../../node_modules/@types/geojson/index.d.ts",
       "../../node_modules/@types/glob/index.d.ts",
       "../../node_modules/@types/graceful-fs/index.d.ts",
@@ -4694,6 +4739,7 @@
       "../../node_modules/@types/jest/node_modules/pretty-format/build/types.d.ts",
       "../../node_modules/@types/js-levenshtein/index.d.ts",
       "../../node_modules/@types/json-schema/index.d.ts",
+      "../../node_modules/@types/json-stable-stringify/index.d.ts",
       "../../node_modules/@types/json5/index.d.ts",
       "../../node_modules/@types/mdast/index.d.ts",
       "../../node_modules/@types/minimatch/index.d.ts",