replace with acceptableValidModeCombos

Author: amy-corson-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
+  acceptableValidModeCombos: [ 
+    ['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
@@ -363,9 +375,6 @@ itinerary:
   # Filters out trips returned by OTP by default, unless specifically requested.
   # e.g. filters out walk-only itineraries if user has not explicitly asked for them.
   strictItineraryFiltering: false
-  # Whether to filter out itineraries that do not match our list of valid mode combinations
-  # (e.g. "WALK" + "DRIVE")
-  strictValidCombos: false
   # Whether to render route names and colors in the blocks inside
   # the batch ui rows
   renderRouteNamesInBlocks: true

Diff for: lib/actions/apiV2.js

@@ -73,17 +73,6 @@ const { randId } = coreUtils.storage
 
 const LIGHT_GRAY = '666666'
 
-const VALID_COMBOS = [
-  ['WALK'],
-  ['WALK', 'PERSONAL'],
-  ['WALK', 'TRANSIT', 'SHARED'],
-  ['WALK', 'SHARED'],
-  ['WALK', 'TRANSIT'],
-  ['WALK', 'TRANSIT', 'PERSONAL'],
-  ['WALK', 'TRANSIT', 'CAR'],
-  ['CAR']
-]
-
 function formatRecentPlace(place) {
   return convertToPlace({
     ...place,
@@ -993,7 +982,8 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       {}
 
     const strictModes = !!config?.itinerary?.strictItineraryFiltering
-    const strictValidCombos = !!config?.itinerary?.strictValidCombos
+    const acceptableValidModeCombos =
+      config?.itinerary?.acceptableValidModeCombos
 
     // Filter mode definitions based on active mode keys
     const activeModeButtons = config.modes?.modeButtons.filter((mb) =>
@@ -1126,15 +1116,16 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                     activeModeStrings.includes(SIMPLIFICATIONS[leg.mode])
                   )
                 )
-                // If "strictValidCombos" is enabled, filter out itineraries that do not match our list of valid mode combinations
+                // If "acceptableValidModeCombos" is provided, filter out itineraries that do not match our list of valid mode combinations
                 // (e.g. "WALK" + "DRIVE")
-                // TODO: Remove this and VALID_COMBOS once we switch to planConnection API
-                if (strictValidCombos) {
+                // TODO: Remove this once we switch to planConnection API
+                if (acceptableValidModeCombos?.length > 0) {
+                  console.log(!!acceptableValidModeCombos)
                   filteredItineraries = filteredItineraries.filter((itin) => {
                     const modeCombo = Array.from(
                       new Set(itin.legs.map((leg) => SIMPLIFICATIONS[leg.mode]))
                     )
-                    return !!VALID_COMBOS.find(
+                    return !!acceptableValidModeCombos.find(
                       (vc) =>
                         modeCombo.every((m) => vc.includes(m)) &&
                         vc.every((m) => modeCombo.includes(m))