Merge pull request #1473 from opentripplanner/trip-in-past-error

add optional trip-in-past error

Author: miles-grant-ibigroup

example/example-config.yml

@@ -438,6 +438,8 @@ itinerary:
   displayA11yError: false
   # Whether to add OTP_RR_MICROBILITY_SUBJECT_TO_CHANGE error to all searches that include micromobiity rental.
   displayMicromobilityRentalError: false
+  # Whether to add a OTP_RR_TRIP_IN_PAST error to all itineraries which have an itinerary that ends in the past
+  displayTripInPastError: true
   # Whether to display itinerary info in the side of the preview or next to the departure times
   showInlineItinerarySummary: false
   # Whether to sync the sort type with the depart/arrive time in the date/time modal

i18n/en-US.yml

@@ -437,6 +437,9 @@ components:
         A transit connection was found, but it was outside the search window,
         try adjusting your search window, using the vehicle types you selected.
       header: No transit connection in search window
+    OTP_RR_TRIP_IN_PAST:
+      body: One or more of these itineraries ends in the past.
+      header: Trip has already occurred
     OUTSIDE_BOUNDS:
       body: >-
         {inputFields} {inputFieldsCount, plural, =0 {} one {location is} other

i18n/fr.yml

@@ -450,6 +450,9 @@ components:
         Une desserte en transports a été trouvée mais ne correspond pas à vos
         critères. Veuillez ajuster votre recherche.
       header: Aucune desserte selon vos critères
+    OTP_RR_TRIP_IN_PAST:
+      body: L'heure d'arrivée d'un ou de plusieurs itinéraires est déjà passée.
+      header: Trajet déjà terminé
     OUTSIDE_BOUNDS:
       body: >-
         {inputFieldsCount, plural, =0 {} one {Votre {inputFields} n'est} other

i18n/i18n-exceptions.json

@@ -10,6 +10,7 @@
       "storeTripHistory"
     ],
     "components.OTP2ErrorRenderer.*.body": [
+      "OTP_RR_TRIP_IN_PAST",
       "LOCATION_NOT_FOUND",
       "NO_STOPS_IN_RANGE",
       "NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW",
@@ -21,6 +22,7 @@
       "WALKING_BETTER_THAN_TRANSIT"
     ],
     "components.OTP2ErrorRenderer.*.header": [
+      "OTP_RR_TRIP_IN_PAST",
       "LOCATION_NOT_FOUND",
       "NO_STOPS_IN_RANGE",
       "NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW",
@@ -54,5 +56,7 @@
       "legally-blind"
     ]
   },
-  "ignoredIds": ["otpUi.TripDetails.title"]
+  "ignoredIds": [
+    "otpUi.TripDetails.title"
+  ]
 }

lib/actions/apiV2.js

@@ -1270,8 +1270,11 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                 }
                 // Add configurable errors, if they're turned on.
                 const state = getState()
-                const { displayA11yError, displayMicromobilityRentalError } =
-                  state.otp.config?.itinerary
+                const {
+                  displayA11yError,
+                  displayMicromobilityRentalError,
+                  displayTripInPastError
+                } = state.otp.config?.itinerary
                 if (displayA11yError) {
                   if (
                     withCollapsedShortNames.find(
@@ -1294,6 +1297,17 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                     })
                   }
                 }
+                if (displayTripInPastError !== false) {
+                  if (
+                    response.data.plan.itineraries.some(
+                      (itin) => itin.endTime < Date.now()
+                    )
+                  ) {
+                    response.data.plan.routingErrors.push({
+                      code: 'OTP_RR_TRIP_IN_PAST'
+                    })
+                  }
+                }
               }
 
               return {