Merge branch 'dev' into realtime-destination

amy-corson-ibigroup · web-flow · commit d0ec6cf204e0 · 2025-03-28T13:25:05.000-05:00
diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
@@ -239,6 +239,7 @@ exports[`components > viewers > nearby view renders nothing on a blank page 1`]
                         onKeyDown={[Function]}
                         placeholder="components.NearbyView.searchNearby"
                         role="combobox"
+                        spellCheck={false}
                         value=""
                       >
                         <input
@@ -257,6 +258,7 @@ exports[`components > viewers > nearby view renders nothing on a blank page 1`]
                           onKeyDown={[Function]}
                           placeholder="components.NearbyView.searchNearby"
                           role="combobox"
+                          spellCheck={false}
                           value=""
                         />
                       </styled__Input>
@@ -4517,6 +4519,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                         onKeyDown={[Function]}
                         placeholder="components.NearbyView.searchNearby"
                         role="combobox"
+                        spellCheck={false}
                         value=""
                       >
                         <input
@@ -4535,6 +4538,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                           onKeyDown={[Function]}
                           placeholder="components.NearbyView.searchNearby"
                           role="combobox"
+                          spellCheck={false}
                           value=""
                         />
                       </styled__Input>
diff --git a/example-config.yml b/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 --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
@@ -982,6 +982,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) =>
@@ -1114,6 +1115,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 --git a/lib/actions/map.js b/lib/actions/map.js
@@ -77,13 +77,30 @@ export function setLocationToCurrent(payload, intl) {
   return function (dispatch, getState) {
     const currentPosition = getState().otp.location.currentPosition
     if (currentPosition.error || !currentPosition.coords) return
-    payload.location = {
+
+    const location = {
       category: 'CURRENT_LOCATION',
       lat: currentPosition.coords.latitude,
       lon: currentPosition.coords.longitude,
       name: intl.formatMessage({ id: 'actions.map.currentLocation' })
     }
-    dispatch(settingLocation(payload))
+
+    // Immediately dispatch with current coordinates for responsiveness
+    dispatch(
+      settingLocation({
+        ...payload,
+        location
+      })
+    )
+
+    // Then use setLocation to handle the reverse geocoding
+    dispatch(
+      setLocation({
+        ...payload,
+        location,
+        reverseGeocode: true
+      })
+    )
   }
 }
 
diff --git a/lib/components/narrative/save-trip-button.tsx b/lib/components/narrative/save-trip-button.tsx
@@ -93,7 +93,7 @@ const SaveTripButton = ({
   }
 
   return (
-    <UnstyledLink className="pull-right" to={CREATE_TRIP_PATH}>
+    <UnstyledLink className="pull-right" id="save-trip" to={CREATE_TRIP_PATH}>
       <IconWithText Icon={PlusCircle}>
         <FormattedMessage id="components.SaveTripButton.saveTripText" />
       </IconWithText>
diff --git a/lib/components/util/company-icon-internal.tsx b/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 --git a/lib/components/viewers/nearby/rental-station.tsx b/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 --git a/lib/components/viewers/nearby/stop.tsx b/lib/components/viewers/nearby/stop.tsx
@@ -42,6 +42,12 @@ export const patternArrayforStops = (
             p.pattern.route?.shortName === cur.pattern.route?.shortName
         } else if (p.pattern.route?.longName && cur.pattern.route?.longName) {
           sameRoute = p.pattern.route?.longName === cur.pattern.route?.longName
+        } else if (
+          p?.stoptimes?.[0]?.headsign &&
+          cur?.stoptimes?.[0]?.headsign
+        ) {
+          sameRoute =
+            p?.stoptimes?.[0]?.headsign === cur?.stoptimes?.[0]?.headsign
         }
         return (
           extractHeadsignFromPattern(p.pattern) === currentHeadsign && sameRoute
diff --git a/lib/components/viewers/nearby/vehicle-rent.tsx b/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' }}
diff --git a/package.json b/package.json
@@ -44,26 +44,26 @@
     "@floating-ui/react": "^0.19.2",
     "@opentripplanner/base-map": "4.0.0",
     "@opentripplanner/building-blocks": "2.1.0",
-    "@opentripplanner/core-utils": "12.0.1",
-    "@opentripplanner/endpoints-overlay": "3.1.0",
-    "@opentripplanner/from-to-location-picker": "3.0.0",
-    "@opentripplanner/geocoder": "^3.0.2",
+    "@opentripplanner/core-utils": "12.0.2",
+    "@opentripplanner/endpoints-overlay": "3.1.1",
+    "@opentripplanner/from-to-location-picker": "3.0.1",
+    "@opentripplanner/geocoder": "^3.0.3",
     "@opentripplanner/humanize-distance": "^1.2.0",
-    "@opentripplanner/icons": "3.0.1",
-    "@opentripplanner/location-field": "3.1.1",
-    "@opentripplanner/itinerary-body": "6.1.1",
+    "@opentripplanner/icons": "3.0.2",
+    "@opentripplanner/itinerary-body": "6.1.3",
+    "@opentripplanner/location-field": "3.1.3",
     "@opentripplanner/location-icon": "^1.4.1",
-    "@opentripplanner/map-popup": "5.1.1",
+    "@opentripplanner/map-popup": "5.1.2",
     "@opentripplanner/otp2-tile-overlay": "2.1.1",
     "@opentripplanner/park-and-ride-overlay": "3.0.0",
-    "@opentripplanner/printable-itinerary": "3.0.0",
-    "@opentripplanner/route-viewer-overlay": "3.0.0",
+    "@opentripplanner/printable-itinerary": "3.0.1",
+    "@opentripplanner/route-viewer-overlay": "3.0.1",
     "@opentripplanner/stop-viewer-overlay": "3.0.0",
     "@opentripplanner/stops-overlay": "6.0.0",
-    "@opentripplanner/transit-vehicle-overlay": "5.0.1",
-    "@opentripplanner/transitive-overlay": "4.0.1",
-    "@opentripplanner/trip-details": "6.0.0",
-    "@opentripplanner/trip-form": "4.1.2",
+    "@opentripplanner/transit-vehicle-overlay": "5.0.2",
+    "@opentripplanner/transitive-overlay": "4.0.3",
+    "@opentripplanner/trip-details": "6.0.1",
+    "@opentripplanner/trip-form": "4.1.3",
     "@opentripplanner/trip-viewer-overlay": "3.0.0",
     "@opentripplanner/vehicle-rental-overlay": "3.0.0",
     "@styled-icons/fa-regular": "^10.34.0",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ const SaveTripButton = ({`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`return (`
`96`		`- <UnstyledLink className="pull-right" to={CREATE_TRIP_PATH}>`
	`96`	`+ <UnstyledLink className="pull-right" id="save-trip" to={CREATE_TRIP_PATH}>`
`97`	`97`	`<IconWithText Icon={PlusCircle}>`
`98`	`98`	`<FormattedMessage id="components.SaveTripButton.saveTripText" />`
`99`	`99`	`</IconWithText>`