Merge branch 'dev' into clear-location-mobile-view

opentripplanner · Dec 15, 2023 · 233d9bf · 233d9bf
2 parents 4d188f3 + e2736b3
commit 233d9bf
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/example-config.yml b/example-config.yml
@@ -367,6 +367,8 @@ itinerary:
   showScheduleDeviation: true
   # Shows the duration of a leg below the leg in the metro itinerary summary
   showLegDurations: false
+  # Whether to add a OTP_RR_A11Y_ROUTING_ENABLED error to all itineraries with accessibility scores
+  displayA11yError: false
   # The sort option to use by default
   # Available sort options: 'BEST', 'DURATION', 'ARRIVALTIME', 'WALKTIME', 'COST', 'DEPARTURETIME'
   # defaultSort: "BEST" # Default

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
@@ -1011,6 +1011,24 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                   response.data?.plan?.routingErrors.filter(
                     (re) => re?.code !== 'NO_TRANSIT_CONNECTION'
                   )
+
+                // Add accessibility error, if it is turned on
+                const state = getState()
+                const { displayA11yError } = state.otp.config?.itinerary
+                if (displayA11yError) {
+                  if (
+                    response.data.plan.itineraries.find(
+                      (itin) => !!itin?.accessibilityScore
+                    )
+                  ) {
+                    if (!response.data.plan?.routingErrors) {
+                      response.data.plan.routingErrors = []
+                    }
+                    response.data.plan.routingErrors.push({
+                      code: 'OTP_RR_A11Y_ROUTING_ENABLED'
+                    })
+                  }
+                }
               }
 
               return {

diff --git a/lib/components/narrative/metro/metro-error-renderer.tsx b/lib/components/narrative/metro/metro-error-renderer.tsx
@@ -6,6 +6,7 @@ import styled from 'styled-components'
 
 import { AppReduxState } from '../../../util/state-types'
 import { Icon } from '../../util/styledIcon'
+import { LinkOpensNewWindow } from '../../util/externalLink'
 
 type Error = Record<string, string[]>
 
@@ -81,7 +82,17 @@ const ErrorRenderer = ({
                 id={`components.OTP2ErrorRenderer.${error}.body`}
                 values={{
                   inputFields: intl.formatList(localizedInputFieldList),
-                  inputFieldsCount: localizedInputFieldList.length
+                  inputFieldsCount: localizedInputFieldList.length,
+                  link: (contents: JSX.Element) => (
+                    <LinkOpensNewWindow
+                      contents={contents}
+                      inline
+                      style={{ color: 'inherit' }}
+                      url={intl.formatMessage({
+                        id: `components.OTP2ErrorRenderer.${error}.link`
+                      })}
+                    />
+                  )
                 }}
               />
             </p>