Merge branch 'dev' into consolidate-findStopTimesForStop-query

opentripplanner · Oct 22, 2024 · 28ba62f · 28ba62f
2 parents 2a5e6b9 + cab7c04
commit 28ba62f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/example-config.yml b/example-config.yml
@@ -268,7 +268,11 @@ modes:
       iconName: wheelchair
       type: CHECKBOX # Possible options: CHECKBOX, SUBMODE, SLIDER, DROPDOWN
   transitModes:
-    - mode: BUS
+      # Mode can be a string or an array of strings.
+    - mode: ["TROLLEYBUS", "BUS"]
+      # When mode is an array an overrideMode must be provided.
+      # This specifies the displayed mode used for icon and URL param.
+      overrideMode: BUS
       label: Bus
       # A mode color can be added, used throughout the application,
       # most notably in the enhanced stop viewer bubble

diff --git a/lib/actions/form.js b/lib/actions/form.js
@@ -43,7 +43,7 @@ export function resetForm(full = false) {
       const options = getTripOptionsFromQuery(defaultQuery)
       // Default mode is currently WALK,TRANSIT. We need to update this value
       // here to match the list of modes, otherwise the form will break.
-      options.mode = ['WALK', ...transitModes.map((m) => m.mode)].join(',')
+      options.mode = ['WALK', ...transitModes.flatMap((m) => m.mode)].join(',')
       dispatch(settingQueryParam(options))
     }
     if (full) {

diff --git a/lib/components/form/advanced-settings-panel.tsx b/lib/components/form/advanced-settings-panel.tsx
@@ -177,6 +177,15 @@ const AdvancedSettingsPanel = ({
     )
   )
 
+  const handleModeButtonToggle = setModeButton(
+    enabledModeButtons,
+    onSettingsUpdate(setQueryParam)
+  )
+
+  const handleAllSubmodesDisabled = (modeButton: ModeButtonDefinition) => {
+    handleModeButtonToggle(modeButton.key, false)
+  }
+
   const onSaveAndReturnClick = useCallback(async () => {
     await setCloseAdvancedSettingsWithDelay()
     setClosingBySave(true)
@@ -221,11 +230,9 @@ const AdvancedSettingsPanel = ({
           id: 'components.BatchSearchScreen.submodeSelectorLabel'
         })}
         modeButtons={processedModeButtons}
+        onAllSubmodesDisabled={handleAllSubmodesDisabled}
         onSettingsUpdate={onSettingsUpdate(setQueryParam)}
-        onToggleModeButton={setModeButton(
-          enabledModeButtons,
-          onSettingsUpdate(setQueryParam)
-        )}
+        onToggleModeButton={handleModeButtonToggle}
       />
       {saveAndReturnButton && (
         <ReturnToTripPlanButton

diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
@@ -135,10 +135,18 @@ export function getInitialState(userDefinedConfig) {
 
   const transitModeSettings = config?.modes?.transitModes.map((transitMode) => {
     const { mode, overrideMode } = transitMode
+    if (Array.isArray(mode) && !overrideMode) {
+      console.warn(
+        `Mode ${mode} is an array, but no overrideMode is specified.`
+      )
+    }
     const displayedMode = overrideMode || mode
+    const addTransportModes = Array.isArray(mode)
+      ? mode.map((m) => ({ mode: m }))
+      : { mode }
     return {
       // This is the mode that gets added to the actual query to OTP
-      addTransportMode: { mode },
+      addTransportMode: addTransportModes,
       applicableMode: 'TRANSIT',
       default: true,
       iconName: displayedMode.toLowerCase(),

diff --git a/lib/util/config-types.ts b/lib/util/config-types.ts
@@ -323,7 +323,7 @@ export interface GeocoderConfig extends GeocoderConfigOtpUI {
 export interface TransitModeConfig {
   color?: string
   label?: string
-  mode: string
+  mode: string | string[]
   showWheelchairSetting?: boolean
 }