Merge branch 'dev' into nearby-view-optional-long-name-rendering

opentripplanner · Jun 25, 2024 · e00e7ab · e00e7ab
2 parents d4a0e3d + 3eea5c0
commit e00e7ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
@@ -939,7 +939,8 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       modes,
       numItineraries,
       routingType,
-      time
+      time,
+      unpreferred
     } = currentQuery
     const arriveBy = departArrive === 'ARRIVE'
 
@@ -997,6 +998,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       numItineraries: numItineraries || config?.modes?.numItineraries || 7,
       time,
       to: currentQuery.to,
+      unpreferred,
       // TODO: Does this break everything?
       ...currentQuery
     }

diff --git a/lib/actions/field-trip.js b/lib/actions/field-trip.js
@@ -495,6 +495,9 @@ export function saveRequestTripItineraries(request, outbound, intl) {
 function prepareQueryParams(request, outbound) {
   return async function (dispatch, getState) {
     const { config } = getState().otp
+    const { modules, transitOperators } = config
+    const fieldTripOptions = modules?.find((m) => m.id === 'ft')?.options
+
     const queryParams = {
       date: format(parseDate(request.travelDate), OTP_API_DATE_FORMAT)
     }
@@ -520,6 +523,16 @@ function prepareQueryParams(request, outbound) {
         OTP_API_TIME_FORMAT
       )
     }
+    // Generate banned list from clear list
+    if (fieldTripOptions?.allowedAgencies) {
+      const bannedAgencies = transitOperators
+        .map((to) => to.agencyId)
+        .filter((to) => !fieldTripOptions.allowedAgencies.includes(to))
+
+      queryParams.unpreferred = {
+        agencies: bannedAgencies
+      }
+    }
     const locations = await planParamsToQueryAsync(locationsToGeocode, config)
     return dispatch(setQueryParam({ ...locations, ...queryParams }))
   }