@opentripplanner/core-utils 4.4.1 → 4.7.0

package/src/map.js

@@ -1,6 +1,6 @@
 import moment from "moment";
 
-import { getPlaceName, isTransit, toSentenceCase } from "./itinerary";
+import { getPlaceName, isTransit, isFlex, toSentenceCase } from "./itinerary";
 
 export function latlngToString(latlng) {
   return (
@@ -181,9 +181,16 @@ export function itineraryToTransitive(itin, companies, getRouteLabel) {
       });
       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 &&
@@ -208,7 +215,13 @@ export function itineraryToTransitive(itin, companies, getRouteLabel) {
       pattern.stops.push({ stop_id: leg.from.stopId });
 
       // add intermediate stops to stops dictionary and pattern object
-      if (leg.intermediateStops) {
+      // 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,
@@ -234,7 +247,8 @@ export function itineraryToTransitive(itin, companies, getRouteLabel) {
       pattern.stops.push({
         stop_id: leg.to.stopId,
         geometry:
-          hasInterStopGeometry &&
+          // Some legs don't have intermediateStopGeometry, but do have valid legGeometry
+          (hasInterStopGeometry || hasLegGeometry) &&
           (hasIntermediateStopGeometry
             ? leg.interStopGeometry[leg.interStopGeometry.length - 1].points
             : leg.legGeometry.points)
@@ -260,12 +274,13 @@ export function itineraryToTransitive(itin, companies, getRouteLabel) {
 
       // add the pattern reference to the journey object
       journey.segments.push({
+        arc: isFlex(leg),
         type: "TRANSIT",
         patterns: [
           {
             pattern_id: ptnId,
             from_stop_index: 0,
-            to_stop_index: leg.intermediateStops
+            to_stop_index: hasIntermediateStopGeometry
               ? leg.intermediateStops.length + 2 - 1
               : 1
           }

package/src/query.js

@@ -163,13 +163,32 @@ function isParamApplicable(paramInfo, query, config) {
   return true;
 }
 
+/**
+ * Helper method which replaces OTP flex modes with single FLEX mode that's
+ * more useful and easier to work with.
+ */
+export function reduceOtpFlexModes(modes) {
+  return modes.reduce((prev, cur) => {
+    const newModes = prev;
+    // Add the current mode if it is not a flex mode
+    if (!cur.includes("FLEX")) {
+      newModes.push(cur);
+      // If it is a flex mode, do not add it but rather add the custom flex mode
+      // if not already present
+    } else if (!newModes.includes("FLEX")) {
+      newModes.push("FLEX");
+    }
+    return newModes;
+  }, []);
+}
+
 /**
  * Determines whether the specified query differs from the default query, i.e.,
  * whether the user has modified any trip options (including mode) from their
  * default values.
  */
 export function isNotDefaultQuery(query, config) {
-  const activeModes = query.mode.split(",").sort();
+  const activeModes = reduceOtpFlexModes(query.mode.split(",").sort());
   if (
     activeModes.length !== 2 ||
     activeModes[0] !== "TRANSIT" ||
@@ -444,5 +463,12 @@ export function getRoutingParams(config, currentQuery, ignoreRealtimeUpdates) {
     params.mode += ",WALK";
   }
 
+  // Replace FLEX placeholder with OTP flex modes
+  if (params.mode) {
+    // Ensure query is in reduced format to avoid replacing twice
+    const mode = reduceOtpFlexModes(params.mode.split(",")).join(",");
+    params.mode = mode.replace("FLEX", "FLEX_EGRESS,FLEX_ACCESS,FLEX_DIRECT");
+  }
+
   return params;
 }

package/src/types.js

@@ -246,7 +246,7 @@ export const legType = PropTypes.shape({
   duration: PropTypes.number.isRequired,
   endTime: PropTypes.number.isRequired,
   from: placeType.isRequired,
-  hailedCar: PropTypes.bool.isRequired,
+  hailedCar: PropTypes.bool,
   headsign: PropTypes.string,
   interlineWithPreviousLeg: PropTypes.bool.isRequired,
   intermediateStops: PropTypes.arrayOf(placeType).isRequired,