Merge pull request #5712 from HSLdevcom/AB#44-next

AB#238 - Add least transfer filtering for flex

Author: sharhio

app/component/itinerary/CallAgencyLeg.js

@@ -35,7 +35,7 @@ const CallAgencyLeg = (
       withBar
       isTransitLeg
       text={leg.route && leg.route.shortName}
-      appendClass={isLocalCallAgency(leg.route, config) ? 'call-local' : ''}
+      appendClass={isLocalCallAgency(leg, config) ? 'call-local' : ''}
     />
   );
   return (

app/component/itinerary/Itinerary.js

@@ -127,7 +127,7 @@ export function RouteLeg(
       occupancyStatus={getOccupancyStatus()}
       duration={Math.floor(leg.duration / 60)}
       shortenLongText={shortenLabels}
-      appendClass={isLocalCallAgency(leg.route, config) ? 'call-local' : ''}
+      appendClass={isLocalCallAgency(leg, config) ? 'call-local' : ''}
     />
   );
   return (
@@ -195,7 +195,7 @@ export const ModeLeg = (
       vertical
       withBar
       icon={networkIcon || icon}
-      appendClass={isLocalCallAgency(leg.route, config) ? 'call-local' : ''}
+      appendClass={isLocalCallAgency(leg, config) ? 'call-local' : ''}
       {...getLegBadgeProps(leg, config)}
     />
   );
@@ -631,9 +631,7 @@ const Itinerary = (
   const iconLegsInPixels = (24 * onlyIconLegs) / normalLegs;
   // the leftover percentage from only showing icons added to each 'normal' leg
   const iconLegsInPercents = onlyIconLegsLength / normalLegs;
-  const hasCallAgencyLeg = itinerary.legs.some(leg =>
-    isCallAgencyLeg(leg.route),
-  );
+  const hasCallAgencyLeg = itinerary.legs.some(leg => isCallAgencyLeg(leg));
   let firstDeparture;
   if (hasCallAgencyLeg) {
     firstLegStartTime = (
@@ -820,7 +818,6 @@ const Itinerary = (
       </div>
     );
   }
-
   const co2summary = (
     <div className="sr-only">
       <FormattedMessage

app/component/itinerary/ItineraryDetails.js

@@ -200,7 +200,7 @@ function ItineraryDetails(
       callAgencyInfo &&
       itinerary.legs.some(
         leg =>
-          isCallAgencyLeg(leg.route) &&
+          isCallAgencyLeg(leg) &&
           !config.flex.internalAgencies.includes(leg.route.agency.gtfsId),
       )
     ) {

app/component/itinerary/ItineraryPage.js

@@ -1305,7 +1305,7 @@ export default function ItineraryPage(props, context) {
       : props.mapLayerOptions;
 
     const flexLeg = planEdges?.[activeIndex]?.node.legs.find(leg =>
-      isCallAgencyLeg(leg.route),
+      isCallAgencyLeg(leg),
     );
     const updatedMapLayers = { ...props.mapLayers };
     const flexRouteGtfsId = flexLeg?.route?.gtfsId.split(':')[0];

app/component/itinerary/ItineraryPageUtils.js

@@ -11,7 +11,12 @@ import {
 import { PlannerMessageType, ExtendedRouteTypes } from '../../constants';
 import { addAnalyticsEvent } from '../../util/analyticsUtils';
 import { boundWithMinimumArea } from '../../util/geo-utils';
-import { compressLegs, getTotalBikingDistance } from '../../util/legUtils';
+import {
+  compressLegs,
+  getTotalBikingDistance,
+  getTotalTransitLegsInExternalFlexTransitItinerary,
+  getTotalTransitLegsInInternalFlexTransitItinerary,
+} from '../../util/legUtils';
 import { getMapLayerOptions } from '../../util/mapLayerUtils';
 import { getDefaultSettings, getSettings } from '../../util/planParamUtil';
 import { getStartTimeWithColon } from '../../util/timeUtils';
@@ -373,6 +378,7 @@ export function scooterEdges(edges, allowDirectScooterJourneys) {
 
   return filteredEdges;
 }
+
 /** Filters away itineraries that are not flex */
 export function flexEdges(edges) {
   if (!edges) {
@@ -409,9 +415,6 @@ export function filterItineraries(edges, modes) {
   );
 }
 
-/**
- * Filters itineraries that are not the right route type
- */
 export function filterItinerariesByRouteType(
   edges,
   types,
@@ -429,6 +432,28 @@ export function filterItinerariesByRouteType(
   );
 }
 
+/**
+ * This function filters away itineraries that have a greater count than the
+ * itinerary with the lowest count. The count is determined by the countFunction.
+ */
+export function filterItinerariesKeepOnlyLeastCount(edges, countFunction) {
+  if (!edges || edges.length === 0) {
+    return [];
+  }
+
+  let leastAmountOfTransitLegs = countFunction(edges[0].node);
+  edges.forEach(edge => {
+    const amountOfTransitLegs = countFunction(edge.node);
+    if (leastAmountOfTransitLegs > amountOfTransitLegs) {
+      leastAmountOfTransitLegs = amountOfTransitLegs;
+    }
+  });
+
+  return edges.filter(
+    edge => countFunction(edge.node) === leastAmountOfTransitLegs,
+  );
+}
+
 /**
  * Pick combination of itineraries for bike and transit
  */
@@ -564,10 +589,13 @@ export function mergeExternalTransitPlan(
   allowedExternalFlexRouteTypes,
   includeTaxiSuggestions,
 ) {
-  const externalTransitEdges = filterItinerariesByRouteType(
-    externalPlan.edges,
-    allowedExternalFlexRouteTypes,
-    includeTaxiSuggestions,
+  const externalTransitEdges = filterItinerariesKeepOnlyLeastCount(
+    filterItinerariesByRouteType(
+      externalPlan.edges,
+      allowedExternalFlexRouteTypes,
+      includeTaxiSuggestions,
+    ),
+    getTotalTransitLegsInExternalFlexTransitItinerary,
   );
   return sortAndMergePlans(externalTransitEdges, transitPlan, arriveBy);
 }
@@ -595,7 +623,10 @@ export function mergeFlexPlan(
   arriveBy,
   maxAdditionalEdges = 1,
 ) {
-  const edges = flexEdges(flexPlan.edges);
+  const edges = filterItinerariesKeepOnlyLeastCount(
+    flexEdges(flexPlan.edges),
+    getTotalTransitLegsInInternalFlexTransitItinerary,
+  );
   return sortAndMergePlans(edges, plan, arriveBy, maxAdditionalEdges);
 }
 

app/component/itinerary/LegInfo.js

@@ -62,7 +62,7 @@ export default function LegInfo(
         withBar
         fadeLong
         isTransitLeg={isTransitLeg}
-        appendClass={isLocalCallAgency(leg.route, config) ? 'call-local' : ''}
+        appendClass={isLocalCallAgency(leg, config) ? 'call-local' : ''}
       />
     </span>
   );

app/component/itinerary/TransitLeg.js

@@ -505,7 +505,7 @@ class TransitLeg extends React.Component {
           }
           viaType={leg.from.viaLocationType}
           isStop={!!leg.from.stop}
-          appendClass={isLocalCallAgency(leg.route, config) ? 'call-local' : ''}
+          appendClass={isLocalCallAgency(leg, config) ? 'call-local' : ''}
         />
         <div
           style={{

app/component/itinerary/WalkLeg.js

@@ -27,6 +27,7 @@ import { displayDistance } from '../../util/geo-utils';
 import { durationToString } from '../../util/timeUtils';
 import { splitStringToAddressAndPlace } from '../../util/otpStrings';
 import VehicleRentalLeg from './VehicleRentalLeg';
+import { useConfigContext } from '../../configurations/ConfigContext';
 import IndoorInfo from './IndoorInfo';
 import {
   subwayTransferUsesSameStation,
@@ -38,7 +39,6 @@ import {
 } from '../../util/indoorUtils';
 import IndoorStep from './IndoorStep';
 import { IndoorLegType } from '../../constants';
-import { useConfigContext } from '../../configurations/ConfigContext';
 
 function WalkLeg(
   {
@@ -54,13 +54,13 @@ function WalkLeg(
   },
   { intl },
 ) {
+  const config = useConfigContext();
+  const { colors, emphasizeDistance } = config;
   // If there is only one indoor routing step, always show it.
   const [showIntermediateSteps, setShowIntermediateSteps] = useState(
     getIndoorStepsWithVerticalTransportation(previousLeg, leg, nextLeg)
       .length === 1,
   );
-  const config = useConfigContext();
-  const { colors, emphasizeDistance } = config;
   const distance = displayDistance(
     parseInt(leg.mode !== 'WALK' ? 0 : leg.distance, 10),
     config,
@@ -154,7 +154,7 @@ function WalkLeg(
         />
       </span>
       <div className="small-2 columns itinerary-time-column" aria-hidden="true">
-        {previousLeg && isCallAgencyLeg(previousLeg.route) && (
+        {previousLeg && isCallAgencyLeg(previousLeg) && (
           <FormattedMessage id="estimate" />
         )}
         <div className="itinerary-time-column-time">

app/component/itinerary/navigator/NaviCardExtension.js

@@ -45,10 +45,10 @@ const NaviCardExtension = (
   const { code, platformCode, zoneId, vehicleMode } = stop || {};
   const [place, address] = name?.split(/, (.+)/) || [];
 
-  const isLocalCall = isLocalCallAgency(nextLeg?.route, config);
+  const isLocalCall = isLocalCallAgency(nextLeg, config);
   const appendClass = isLocalCall ? 'call-local' : '';
   const callAgencyDestination =
-    nextLeg && (isLocalCall || isCallAgencyLeg(nextLeg.route));
+    nextLeg && (isLocalCall || isCallAgencyLeg(nextLeg));
 
   let destination = {};
   if (stop && !callAgencyDestination) {

app/component/itinerary/navigator/NaviInstructions.js

@@ -55,9 +55,7 @@ export default function NaviInstructions(
     time,
     config,
   );
-  const appendClass = isLocalCallAgency(nextLeg?.route, config)
-    ? 'call-local'
-    : '';
+  const appendClass = isLocalCallAgency(nextLeg, config) ? 'call-local' : '';
   if (legType === LEGTYPE.MOVE) {
     return (
       <>