Merge branch 'dev' into fix-recent-trips-actions

Author: binh-dam-ibigroup

Diff for: example-config.yml

@@ -348,6 +348,18 @@ routingTypes:
 
 # Itinerary options
 itinerary:
+  # Provides an array of valid mode combinations that returned itineraries will be filtered against
+  # If left blank, all itineraries deemed valid by OTP will be returned
+  validModeCombinations: [ 
+    ['WALK'],
+    ['WALK', 'PERSONAL'],
+    ['WALK', 'TRANSIT', 'SHARED'],
+    ['WALK', 'SHARED'],
+    ['WALK', 'TRANSIT'],
+    ['WALK', 'TRANSIT', 'PERSONAL'],
+    ['WALK', 'TRANSIT', 'CAR'],
+    ['CAR'] 
+  ]
   # Show fares for each transit leg (false if omitted).
   # (Requires using LineItinerary.)
   showRouteFares: false

Diff for: lib/actions/api-utils.ts

@@ -0,0 +1,4 @@
+import { TransportMode } from '@opentripplanner/types'
+
+export const countFlexModes = (modes: TransportMode[]): number =>
+  modes.filter((m) => m.mode === 'FLEX').length

Diff for: lib/actions/apiV2.js

@@ -37,6 +37,7 @@ import {
 import { isLastStop } from '../util/stop-times'
 
 import { addToRecentSearches, rememberPlace } from './user'
+import { countFlexModes } from './api-utils'
 import {
   createQueryAction,
   fetchingStopTimesForStop,
@@ -982,6 +983,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       {}
 
     const strictModes = !!config?.itinerary?.strictItineraryFiltering
+    const validModeCombinations = config?.itinerary?.validModeCombinations
 
     // Filter mode definitions based on active mode keys
     const activeModeButtons = config.modes?.modeButtons.filter((mb) =>
@@ -1038,7 +1040,16 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
     // Generate combinations if the modes for query are not specified in the query
     // FIXME: BICYCLE_RENT does not appear in this list unless TRANSIT is also enabled.
     // This is likely due to the fact that BICYCLE_RENT is treated as a transit submode.
-    const combinations = modes ? [baseQuery] : generateCombinations(baseQuery)
+    let combinations = modes ? [baseQuery] : generateCombinations(baseQuery)
+
+    // Pre-planConnection API hack: FLEX should always be bundled together.
+    // The real solution is to change how we generate mode selections, but for now
+    // this removes superfluous flex requests.
+    combinations = combinations.filter((c) => {
+      const flexCount = countFlexModes(c.modes)
+      // We need either all 3 flex modes or none! Anything in-between is invalid
+      return flexCount === 0 || flexCount === 3
+    })
 
     if (combinations.length === 0) {
       return RoutingQueryCallResult.INVALID_MODE_SELECTION
@@ -1114,6 +1125,22 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                     activeModeStrings.includes(SIMPLIFICATIONS[leg.mode])
                   )
                 )
+                // If "acceptableValidModeCombos" is provided, filter out itineraries that do not match our list of valid mode combinations
+                // (e.g. "WALK" + "DRIVE")
+                // TODO: Remove this once we switch to planConnection API
+                if (validModeCombinations?.length > 0) {
+                  filteredItineraries = filteredItineraries.filter((itin) => {
+                    const modeCombo = Array.from(
+                      new Set(itin.legs.map((leg) => SIMPLIFICATIONS[leg.mode]))
+                    )
+                    return validModeCombinations.find(
+                      (vc) =>
+                        modeCombo.length === vc.length &&
+                        vc.every((m) => modeCombo.includes(m))
+                    )
+                  })
+                }
+
                 // ... Otherwise return all itineraries.
               }
 

Diff for: lib/components/narrative/line-itin/realtime-time-column.tsx

@@ -33,7 +33,8 @@ function RealtimeTimeColumn({ isDestination, leg }: Props): ReactElement {
   }
 
   const timeMillis = isDestination ? leg.endTime : leg.startTime
-  const isRealtimeTransitLeg = isTransitLeg(leg) && leg.realTime
+  const isRealtimeTransitLeg =
+    !isDestination && isTransitLeg(leg) && leg.realTime
 
   // For non-transit legs show only the scheduled time.
   if (!isTransitLeg(leg)) {

Diff for: lib/components/util/company-icon-internal.tsx

@@ -12,7 +12,7 @@ const CompanyIcon = ({
   fallbackContent = null,
   ...otherProps
 }: Props): ReactElement | null => {
-  const CompanyIcon = getCompanyIcon ? getCompanyIcon(company) : null
+  const CompanyIcon = getCompanyIcon && company ? getCompanyIcon(company) : null
   return CompanyIcon ? (
     <Suspense fallback={<span>{company}</span>}>
       <CompanyIcon {...otherProps} />

Diff for: lib/components/viewers/nearby/rental-station.tsx

@@ -25,7 +25,7 @@ const RentalStation = ({ companies, fromToSlot, place }: Props) => {
 
   const stationIcon = (
     <CompanyIcon
-      company={company}
+      company={company || ''}
       fallbackContent={<Bicycle />}
       height={22}
       style={{ marginRight: '5px' }}

Diff for: lib/components/viewers/nearby/vehicle-rent.tsx

@@ -97,7 +97,7 @@ const Vehicle = ({
           <IconWithText
             icon={
               <CompanyIcon
-                company={vehicle.network}
+                company={vehicle.network || ''}
                 fallbackContent={getVehicleIcon(formFactor)}
                 height={22}
                 style={{ marginRight: '5px' }}