diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
index 5d8edb4b2..3d4a9501a 100644
--- a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
+++ b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
@@ -11862,6 +11862,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -12023,6 +12024,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -12184,6 +12186,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -12678,6 +12681,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -12839,6 +12843,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -12995,6 +13000,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -13424,6 +13430,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -13585,6 +13592,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -13741,6 +13749,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -18233,6 +18242,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -18389,6 +18399,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -18545,6 +18556,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -18922,6 +18934,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -19416,6 +19429,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -19572,6 +19586,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -19728,6 +19743,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -28361,6 +28377,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -28522,6 +28539,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -28683,6 +28701,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -29190,6 +29209,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -29351,6 +29371,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -29507,6 +29528,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -29941,6 +29963,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -30097,6 +30120,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -30253,6 +30277,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -30630,6 +30655,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -37282,6 +37308,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -37443,6 +37470,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -37599,6 +37627,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -38093,6 +38122,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -38249,6 +38279,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -38405,6 +38436,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -38782,6 +38814,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -45612,6 +45645,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -45773,6 +45807,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -45934,6 +45969,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -53211,6 +53247,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -53367,6 +53404,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -53523,6 +53561,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -53952,6 +53991,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -54113,6 +54153,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -54269,6 +54310,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -54698,6 +54740,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -54854,6 +54897,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -55010,6 +55054,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -55504,6 +55549,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -55660,6 +55706,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -55816,6 +55863,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -56245,6 +56293,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -56401,6 +56450,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -56557,6 +56607,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -56960,6 +57011,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -57116,6 +57168,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -57272,6 +57325,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -64271,6 +64325,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -64432,6 +64487,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -64593,6 +64649,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -65087,6 +65144,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -65248,6 +65306,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -65404,6 +65463,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -65833,6 +65893,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -65994,6 +66055,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
@@ -66150,6 +66212,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         },
                                                       }
                                                     }
+                                                    useArrivalTime={false}
                                                   >
                                                     <div
                                                       className="percy-hide"
diff --git a/__tests__/test-utils/mock-data/fileMock.js b/__tests__/test-utils/mock-data/fileMock.js
new file mode 100644
index 000000000..bc57af729
--- /dev/null
+++ b/__tests__/test-utils/mock-data/fileMock.js
@@ -0,0 +1,2 @@
+const mockImg = ''
+export default mockImg
diff --git a/example-config.yml b/example-config.yml
index d132b835e..c24e1265d 100644
--- a/example-config.yml
+++ b/example-config.yml
@@ -677,6 +677,8 @@ itinerary:
 # sessionTimeoutSeconds: 180
 
 # nearbyView:
+### Setting to use arrival time instead of departure time in the nearby view.
+#   useArrivalTime: true
 ### Setting to hide stops with no depatures in the nearby view.
 #   hideEmptyStops: true
 ### What radius should the nearby query get results within? (in meters)
diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
index b8206e056..b7854c456 100644
--- a/lib/actions/apiV2.js
+++ b/lib/actions/apiV2.js
@@ -439,6 +439,7 @@ export const fetchNearby = (position, radius) => {
                 stoptimesForPatterns {
                   pattern {
                     headsign
+                    desc: name
                     route {
                       agency {
                         name
diff --git a/lib/actions/field-trip.js b/lib/actions/field-trip.js
index c9f085e52..316978475 100644
--- a/lib/actions/field-trip.js
+++ b/lib/actions/field-trip.js
@@ -535,7 +535,10 @@ function prepareQueryParams(request, outbound) {
     }
     const hasExistingLocations = currentQuery.from || currentQuery.to
     const locations =
-      !hasExistingLocations || window.confirm('Overwrite existing locations?')
+      !hasExistingLocations ||
+      window.confirm(
+        'Use custom set locations? Pressing "Cancel" will use the locations you have typed in. Pressing "OK" will use the locations currently saved to the field trip'
+      )
         ? await planParamsToQueryAsync(locationsToGeocode, config)
         : { from: currentQuery.from, to: currentQuery.to }
     return dispatch(setQueryParam({ ...locations, ...queryParams }))
diff --git a/lib/components/viewers/stop-time-cell.tsx b/lib/components/viewers/stop-time-cell.tsx
index d1867c3c2..fb103897d 100644
--- a/lib/components/viewers/stop-time-cell.tsx
+++ b/lib/components/viewers/stop-time-cell.tsx
@@ -36,6 +36,8 @@ type Props = {
   onlyShowCountdownForRealtime?: boolean
   /** A stopTime object as received from a transit index API */
   stopTime: Time
+  /** Whether to use arrival time instead of departure time */
+  useArrivalTime?: boolean
 }
 
 /**
@@ -46,7 +48,8 @@ type Props = {
 const StopTimeCell = ({
   homeTimezone = getUserTimezone(),
   onlyShowCountdownForRealtime,
-  stopTime
+  stopTime,
+  useArrivalTime
 }: Props): JSX.Element => {
   const intl = useIntl()
 
@@ -72,7 +75,7 @@ const StopTimeCell = ({
   // Determine whether to show departure as countdown (e.g. "5 min") or as HH:mm
   // time, using realtime updates if available.
   const secondsUntilDeparture = Math.round(
-    getSecondsUntilDeparture(stopTime, false)
+    getSecondsUntilDeparture(stopTime, false, useArrivalTime)
   )
   // Determine if vehicle arrives after midnight in order to advance the day of
   // the week when showing arrival time/day.
@@ -151,7 +154,8 @@ const StopTimeCell = ({
 const mapStateToProps = (state: AppReduxState) => {
   return {
     onlyShowCountdownForRealtime:
-      state.otp.config?.itinerary?.onlyShowCountdownForRealtime || false
+      state.otp.config?.itinerary?.onlyShowCountdownForRealtime || false,
+    useArrivalTime: state.otp.config?.nearbyView?.useArrivalTime || false
   }
 }
 
diff --git a/lib/util/config-types.ts b/lib/util/config-types.ts
index 18e27ca37..a11c51d50 100644
--- a/lib/util/config-types.ts
+++ b/lib/util/config-types.ts
@@ -73,6 +73,7 @@ export type NearbyViewConfig = {
   hideEmptyStops?: boolean
   radius?: number
   showShadowDotOnMapDrag?: boolean
+  useArrivalTime?: boolean
   useRouteViewSort?: boolean
 }
 
diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index 9aabdacc2..faa994560 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -13,12 +13,23 @@ import { isBlank } from './ui'
  * Computes the seconds until departure for a given stop time,
  * based either on the scheduled or the realtime departure time.
  */
-export function getSecondsUntilDeparture(stopTime, useSchedule) {
-  const departureTime = useSchedule
-    ? stopTime.scheduledDeparture
-    : stopTime.realtimeDeparture
+export function getSecondsUntilDeparture(
+  stopTime,
+  useSchedule,
+  useArrivalTime
+) {
+  let time
+  if (useSchedule) {
+    time = useArrivalTime
+      ? stopTime.scheduledArrival
+      : stopTime.scheduledDeparture
+  } else {
+    time = useArrivalTime
+      ? stopTime.realtimeArrival
+      : stopTime.realtimeDeparture
+  }
 
-  return departureTime + stopTime.serviceDay - Date.now() / 1000
+  return time + stopTime.serviceDay - Date.now() / 1000
 }
 
 export function getRouteIdForPattern(pattern) {
diff --git a/package.json b/package.json
index 2fa85704f..5b4a1881e 100644
--- a/package.json
+++ b/package.json
@@ -42,30 +42,30 @@
     "@bugsnag/js": "^7.17.0",
     "@bugsnag/plugin-react": "^7.17.0",
     "@floating-ui/react": "^0.19.2",
-    "@opentripplanner/base-map": "^3.2.0",
-    "@opentripplanner/building-blocks": "^1.1.0",
-    "@opentripplanner/core-utils": "^11.4.3",
-    "@opentripplanner/endpoints-overlay": "^2.1.1",
-    "@opentripplanner/from-to-location-picker": "^2.1.13",
-    "@opentripplanner/geocoder": "^3.0.1",
+    "@opentripplanner/base-map": "^3.2.2",
+    "@opentripplanner/building-blocks": "^1.2.3",
+    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/endpoints-overlay": "^2.1.4",
+    "@opentripplanner/from-to-location-picker": "^2.1.14",
+    "@opentripplanner/geocoder": "^3.0.2",
     "@opentripplanner/humanize-distance": "^1.2.0",
-    "@opentripplanner/icons": "^2.0.11",
-    "@opentripplanner/itinerary-body": "^5.3.5",
-    "@opentripplanner/location-field": "^2.0.22",
+    "@opentripplanner/icons": "^2.0.13",
+    "@opentripplanner/itinerary-body": "^5.3.7",
+    "@opentripplanner/location-field": "^2.0.24",
     "@opentripplanner/location-icon": "^1.4.1",
-    "@opentripplanner/map-popup": "^3.1.1",
-    "@opentripplanner/otp2-tile-overlay": "^1.0.16",
+    "@opentripplanner/map-popup": "^4.0.2",
+    "@opentripplanner/otp2-tile-overlay": "^1.0.17",
+    "@opentripplanner/park-and-ride-overlay": "^2.0.9",
+    "@opentripplanner/printable-itinerary": "^2.0.23",
     "@opentripplanner/route-viewer-overlay": "^2.0.17",
-    "@opentripplanner/park-and-ride-overlay": "^2.0.8",
-    "@opentripplanner/printable-itinerary": "^2.0.21",
-    "@opentripplanner/stop-viewer-overlay": "^2.0.8",
-    "@opentripplanner/stops-overlay": "^5.3.0",
-    "@opentripplanner/transit-vehicle-overlay": "^4.0.11",
-    "@opentripplanner/transitive-overlay": "3.0.15",
-    "@opentripplanner/trip-details": "^5.0.13",
-    "@opentripplanner/trip-form": "^3.6.2",
-    "@opentripplanner/trip-viewer-overlay": "^2.0.8",
-    "@opentripplanner/vehicle-rental-overlay": "^2.1.7",
+    "@opentripplanner/stop-viewer-overlay": "^2.0.10",
+    "@opentripplanner/stops-overlay": "^5.3.3",
+    "@opentripplanner/transit-vehicle-overlay": "^4.0.13",
+    "@opentripplanner/transitive-overlay": "3.0.22",
+    "@opentripplanner/trip-details": "^5.0.15",
+    "@opentripplanner/trip-form": "^3.6.4",
+    "@opentripplanner/trip-viewer-overlay": "^2.0.10",
+    "@opentripplanner/vehicle-rental-overlay": "^2.1.9",
     "@styled-icons/fa-regular": "^10.34.0",
     "@styled-icons/fa-solid": "^10.34.0",
     "@turf/centroid": "^6.5.0",
@@ -214,7 +214,8 @@
   "jest": {
     "moduleNameMapper": {
       "i18n/(.*)\\.yml$": "<rootDir>__tests__/test-utils/mock-data/empty-yml.js",
-      "modeSettings.yml$": "<rootDir>__tests__/test-utils/mock-data/empty-yml.js"
+      "modeSettings.yml$": "<rootDir>__tests__/test-utils/mock-data/empty-yml.js",
+      "\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>__tests__/test-utils/mock-data/fileMock.js"
     },
     "transform": {
       "\\.[jt]sx?$": "babel-jest"
diff --git a/yarn.lock b/yarn.lock
index b677a8213..e9bae79d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2382,17 +2382,6 @@
   integrity sha512-RDxZBAFMtqs1ZPnbUu1e7ohPNfoNhTiep4fErY7tZs995BeHu369Vsh5woMIaFbllRWEZBfvTCS4hvDnMPiHrA==
   dependencies:
     "@octokit/openapi-types" "^10.0.0"
-
-"@opentripplanner/base-map@^3.0.14", "@opentripplanner/base-map@^3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.2.2.tgz#6dc15f3af0bfe483ffea220dcd2220272fa31040"
-  integrity sha512-Neg+rvAr9lWx+8V8/4ZlPE+l91wxM0fbbsM5vp45L1zCRE4WszD7XtmLocnNMyuYzo3xEijoKF+ICiENsOM9bg==
-  dependencies:
-    "@opentripplanner/building-blocks" "^1.2.2"
-    mapbox-gl "npm:empty-npm-package@1.0.0"
-    maplibre-gl "^2.1.9"
-    react-map-gl "^7.0.15"
-
 "@opentripplanner/base-map@^3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.2.0.tgz#db4410319d9614077ec925d739165a998c4a2485"
@@ -2403,15 +2392,25 @@
     maplibre-gl "^2.1.9"
     react-map-gl "^7.0.15"
 
-"@opentripplanner/building-blocks@^1.1.0", "@opentripplanner/building-blocks@^1.2.2":
+"@opentripplanner/base-map@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.2.2.tgz#6dc15f3af0bfe483ffea220dcd2220272fa31040"
+  integrity sha512-Neg+rvAr9lWx+8V8/4ZlPE+l91wxM0fbbsM5vp45L1zCRE4WszD7XtmLocnNMyuYzo3xEijoKF+ICiENsOM9bg==
+  dependencies:
+    "@opentripplanner/building-blocks" "^1.2.2"
+    mapbox-gl "npm:empty-npm-package@1.0.0"
+    maplibre-gl "^2.1.9"
+    react-map-gl "^7.0.15"
+
+"@opentripplanner/building-blocks@^1.2.2", "@opentripplanner/building-blocks@^1.2.3":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@opentripplanner/building-blocks/-/building-blocks-1.2.3.tgz#404e8f9038867d66d55f51adf8855b1326c51ed5"
   integrity sha512-I0AxiZrTZu+e7+av4u0tHW2ijqpxH0AkLHrhf75BHf1Ep2FOGxaul/v+8UT18mNYiM5eHNstOX3XiXaDjtCUaw==
 
-"@opentripplanner/core-utils@^11.0.2", "@opentripplanner/core-utils@^11.4.3", "@opentripplanner/core-utils@^11.4.4":
-  version "11.4.4"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.4.tgz#11c1be91a5e90afda4fc265831c761d3e044d933"
-  integrity sha512-WKhOuG7Q+Yxdm+P5MPmJyXndx+JUtGn44GTeilOnUqDdO8lTLTvqqt0hYeEWjA77jWP0u8tG7fAAsft8IZn2cg==
+"@opentripplanner/core-utils@^11.4.0":
+  version "11.4.2"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.2.tgz#cc6034fb80ccda44e50f7f0a1e80a7bad8387f84"
+  integrity sha512-EVYVN73Cgf9IC+uya49843MFJnVkmv0nHAjsQwmPGSx/w5fY49X4fSpDprL7Bn+MTzk58U2udDsn6OzKmV0JdA==
   dependencies:
     "@conveyal/lonlat" "^1.4.1"
     "@mapbox/polyline" "^1.1.0"
@@ -2426,14 +2425,14 @@
     lodash.isequal "^4.5.0"
     qs "^6.9.1"
 
-"@opentripplanner/core-utils@^11.4.0":
-  version "11.4.2"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.2.tgz#cc6034fb80ccda44e50f7f0a1e80a7bad8387f84"
-  integrity sha512-EVYVN73Cgf9IC+uya49843MFJnVkmv0nHAjsQwmPGSx/w5fY49X4fSpDprL7Bn+MTzk58U2udDsn6OzKmV0JdA==
+"@opentripplanner/core-utils@^11.4.4":
+  version "11.4.5"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.5.tgz#f568f5f60f153f0bd74fe47ed3134851067b0064"
+  integrity sha512-uYaVqZXZoRRVks05KdGMTIeGEC7ItKJvexZqKsEbZMjnnMphHRndv4aSDXM19iL7ynoau7JXjYfYEny1HDp7ig==
   dependencies:
     "@conveyal/lonlat" "^1.4.1"
     "@mapbox/polyline" "^1.1.0"
-    "@opentripplanner/geocoder" "^3.0.0"
+    "@opentripplanner/geocoder" "^3.0.2"
     "@styled-icons/foundation" "^10.34.0"
     "@turf/along" "^6.0.1"
     chroma-js "^2.4.2"
@@ -2444,7 +2443,7 @@
     lodash.isequal "^4.5.0"
     qs "^6.9.1"
 
-"@opentripplanner/endpoints-overlay@^2.1.1":
+"@opentripplanner/endpoints-overlay@^2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.1.4.tgz#f81088bce83236344dfa4a51b2efe00092a5c87a"
   integrity sha512-VLRZArhoRQ38aafc/w986Uv1lnq/WLJOgBqnpvuUbLhLR/qHU9h5X3wg3jgwf2GA0BIn03Z99VJbCkGfkyd0LA==
@@ -2483,7 +2482,8 @@
     isomorphic-mapzen-search "^1.6.1"
     lodash.memoize "^4.1.2"
 
-"@opentripplanner/geocoder@^3.0.1", "@opentripplanner/geocoder@^3.0.2":
+
+"@opentripplanner/geocoder@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@opentripplanner/geocoder/-/geocoder-3.0.2.tgz#2c7618947d1d9b082bd39d037327c9cf23282782"
   integrity sha512-pl7tCiodex0hXWKLH3WE+I+HzoSgOOWp9kR3xMcuRiE5g6k2JXNneoD/ZfSS1n6Oorxcjv3U2DbMSXT2j/39dQ==
@@ -2499,7 +2499,7 @@
   resolved "https://registry.yarnpkg.com/@opentripplanner/humanize-distance/-/humanize-distance-1.2.0.tgz#71cf5d5d1b756adef15300edbba0995ccd4b35ee"
   integrity sha512-x0QRXMDhypFeazZ6r6vzrdU8vhiV56nZ/WX6zUbxpgp6T9Oclw0gwR2Zdw6DZiiFpSYVNeVNxVzZwsu6NRGjcA==
 
-"@opentripplanner/icons@^2.0.11", "@opentripplanner/icons@^2.0.12":
+"@opentripplanner/icons@^2.0.12", "@opentripplanner/icons@^2.0.13":
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/@opentripplanner/icons/-/icons-2.0.13.tgz#45c4c16d8f208cff73811941f2def0fa23f87780"
   integrity sha512-1oEPCmFuyS88bJZ2U9eFlEw2kQ0ZZW+wOI1dggr0omJDD6L+nVNQJ6TUtosNHYL1S35Jpx4aSQEG3iwwlXOHMg==
@@ -2507,7 +2507,7 @@
     "@opentripplanner/core-utils" "^11.4.4"
     prop-types "^15.7.2"
 
-"@opentripplanner/itinerary-body@^5.0.2", "@opentripplanner/itinerary-body@^5.3.5", "@opentripplanner/itinerary-body@^5.3.6":
+"@opentripplanner/itinerary-body@^5.3.6", "@opentripplanner/itinerary-body@^5.3.7":
   version "5.3.7"
   resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.3.7.tgz#e32437f804defc19aef23685e45c0a363ac8bc31"
   integrity sha512-ZnbxI78WsY6/Ynl3QY026JqimGG+gqXcN8ZEXY/BPMrNhSul27HgFFT2Flo37Fnc5gN2+jE8LsR1yxq05H3kvQ==
@@ -2525,7 +2525,7 @@
     react-resize-detector "^4.2.1"
     string-similarity "^4.0.4"
 
-"@opentripplanner/location-field@^2.0.22":
+"@opentripplanner/location-field@^2.0.24":
   version "2.0.24"
   resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.24.tgz#32e7109142bd754d28bd28ebbdf68d4e5ef4c812"
   integrity sha512-fOAyanDnLLHC39kHG6kMSY6i09n4l0KSVQACFoosGZgUcJmz5CUCMl0/x3RszIwh3g2wqxKh6fagh4V56YEpfQ==
@@ -2555,19 +2555,10 @@
     "@opentripplanner/from-to-location-picker" "^2.1.12"
     flat "^5.0.2"
 
-"@opentripplanner/map-popup@^3.1.1":
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-3.1.3.tgz#70f0afde138642a60678f3c486ed48d2fe580790"
-  integrity sha512-IuWl+K/SP+WuzyYk9lDHTOFJi0irV3jayamKcGllEplnOe2wa4SxaKsvZxT+A+f/E0/rD2r3Jk7eUWnba5LVzw==
-  dependencies:
-    "@opentripplanner/core-utils" "^11.4.3"
-    "@opentripplanner/from-to-location-picker" "^2.1.13"
-    flat "^5.0.2"
-
-"@opentripplanner/map-popup@^4.0.0":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-4.0.1.tgz#18d40f339b09e2ebd5f722a0734cc259013b3400"
-  integrity sha512-FDgYkS0AvUCH4Em9kiZsMLhg6zvd1NKXXpNLVBPt3Xerq0weLpLZPP96TeP3JlXVMJ2wkMCr4AKtZ/9103HYTA==
+"@opentripplanner/map-popup@^4.0.0", "@opentripplanner/map-popup@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-4.0.2.tgz#367ab7ce69d16d319988bb48d8f6d2db762623c7"
+  integrity sha512-RlHv9GE3Bk3++PwBcaPcALr6rZ+2AxY6Uj6W71AnLqz+wbeQO5rM3eEP99r0Sg1K3pAY0hXljBkVwKiUWhwxbQ==
   dependencies:
     "@opentripplanner/base-map" "^3.2.2"
     "@opentripplanner/building-blocks" "^1.2.2"
@@ -2575,14 +2566,14 @@
     "@opentripplanner/from-to-location-picker" "^2.1.14"
     flat "^5.0.2"
 
-"@opentripplanner/otp2-tile-overlay@^1.0.16":
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/otp2-tile-overlay/-/otp2-tile-overlay-1.0.16.tgz#4259b775b14078a697818e88ec61e19175232a61"
-  integrity sha512-BqWynzopdVrorQ75rn3zFTu40oOR/Y2sDE8jwip04KYqn3gJwgYzdi6q3saGKm4An49gVVxcxQTlk+fLizSmAQ==
+"@opentripplanner/otp2-tile-overlay@^1.0.17":
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/otp2-tile-overlay/-/otp2-tile-overlay-1.0.17.tgz#0e63bcb956778bbab6bd42d282aa9f5416881b74"
+  integrity sha512-mgMHprVVOXdzgU0D/50be57TeuEp1RP+b7xH/3Xt+rj0mF1PY+5GgLMuEul+1WqbzFwAefrmi9KRMs3MYJArrg==
   dependencies:
     "@opentripplanner/map-popup" "^4.0.0"
 
-"@opentripplanner/park-and-ride-overlay@^2.0.8":
+"@opentripplanner/park-and-ride-overlay@^2.0.9":
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/@opentripplanner/park-and-ride-overlay/-/park-and-ride-overlay-2.0.9.tgz#0efe2bf8a7595b56c4da6396e89db5f04e4b3ec8"
   integrity sha512-ekf6kcCgMVTzXDMY3Ed8qclaL3YY2/1BrArdpRY8DxciGWmE1HKOW90Vf1aP18aLrwcW9kpvv1Kdbl60tY6mCQ==
@@ -2590,14 +2581,14 @@
     "@opentripplanner/base-map" "^3.2.0"
     "@opentripplanner/from-to-location-picker" "^2.1.13"
 
-"@opentripplanner/printable-itinerary@^2.0.21":
+"@opentripplanner/printable-itinerary@^2.0.23":
   version "2.0.23"
   resolved "https://registry.yarnpkg.com/@opentripplanner/printable-itinerary/-/printable-itinerary-2.0.23.tgz#31f11e0e22bb9f223c4c1d8fa97c6eea18496cfa"
   integrity sha512-Cb5SX7ts0rX0P1XSStjqbTITP5ueWlDe1b7U4KMaRNqEOaK2tELEyb/qZGo9kMpXTT/17jmEQZsKHQj43C5Eyg==
   dependencies:
     "@opentripplanner/core-utils" "^11.4.4"
     "@opentripplanner/itinerary-body" "^5.3.6"
-
+ 
 "@opentripplanner/route-viewer-overlay@^2.0.17":
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/@opentripplanner/route-viewer-overlay/-/route-viewer-overlay-2.0.17.tgz#f34686fd965cf39650a10f64df599e7aca468415"
@@ -2619,7 +2610,8 @@
     glob-promise "^4.2.2"
     js-yaml "^4.1.0"
 
-"@opentripplanner/stop-viewer-overlay@^2.0.8":
+
+"@opentripplanner/stop-viewer-overlay@^2.0.10":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@opentripplanner/stop-viewer-overlay/-/stop-viewer-overlay-2.0.10.tgz#0749fe7ffb28dac7a6925ed7c663e2fdd5156f3b"
   integrity sha512-rFmaqQ7uJ+ZE80O6fveiNxlEVSJW5PwFSMh1B9pN0HaVTB1U27+yKbIMMuP7GtWve31mPy+PaWYXDW3hMlsi8A==
@@ -2627,7 +2619,7 @@
     "@opentripplanner/base-map" "^3.2.2"
     "@opentripplanner/core-utils" "^11.4.4"
 
-"@opentripplanner/stops-overlay@^5.3.0":
+"@opentripplanner/stops-overlay@^5.3.3":
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/@opentripplanner/stops-overlay/-/stops-overlay-5.3.3.tgz#711dd9316de93ac6c959dc3191d31884dc0a9589"
   integrity sha512-GYADErZLIG3KPJ4OiigWkyHaGrWJ/wiCenH0RTbQ5J0XbYrenUIlWBsI5kpQNZPGBXocvF77sOTOUM8gex1AUA==
@@ -2637,7 +2629,7 @@
     "@opentripplanner/map-popup" "^4.0.0"
     flat "^5.0.2"
 
-"@opentripplanner/transit-vehicle-overlay@^4.0.11":
+"@opentripplanner/transit-vehicle-overlay@^4.0.13":
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/@opentripplanner/transit-vehicle-overlay/-/transit-vehicle-overlay-4.0.13.tgz#6f66c7c6a27d2473353b7c8c14acc8c540fb01ad"
   integrity sha512-Sh3c3+q2dIhFZP5uyhPboyLSsTv8unVsPYKjFWVJaK19z6wN8KqFVmSqWysrcEnooRJd+D4+4erQiUbabomDLQ==
@@ -2647,15 +2639,15 @@
     "@opentripplanner/icons" "^2.0.12"
     flat "^5.0.2"
 
-"@opentripplanner/transitive-overlay@3.0.15":
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/transitive-overlay/-/transitive-overlay-3.0.15.tgz#5ae65111f2977a8bcb4a09127c9db3460ba2c2cb"
-  integrity sha512-1A28QWt87iJmzT9xC9Fxz/jq9Hd38oj+Ur9n4f2vIfQ+WMgkY6CGOsz60+CWq2yN+9tXY7Pj1g5I5klT/F43rw==
+"@opentripplanner/transitive-overlay@3.0.22":
+  version "3.0.22"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/transitive-overlay/-/transitive-overlay-3.0.22.tgz#631096b12e08671e5da05ffe1c0a0e01331750a4"
+  integrity sha512-Ix3+2qz1+iSbeLnMfd4tU+0AUU1LDjq4y8cTzfKHayqHe0pzHpYY9Ib2zrXbvog7Mav/Jozn2ycL27R4UgzQaA==
   dependencies:
     "@mapbox/polyline" "^1.1.1"
-    "@opentripplanner/base-map" "^3.0.14"
-    "@opentripplanner/core-utils" "^11.0.2"
-    "@opentripplanner/itinerary-body" "^5.0.2"
+    "@opentripplanner/base-map" "^3.2.2"
+    "@opentripplanner/core-utils" "^11.4.4"
+    "@opentripplanner/itinerary-body" "^5.3.6"
     "@turf/bbox" "^6.5.0"
     "@turf/bearing" "^6.5.0"
     "@turf/destination" "^6.5.0"
@@ -2664,7 +2656,7 @@
     "@turf/midpoint" "^6.5.0"
     lodash.isequal "^4.5.0"
 
-"@opentripplanner/trip-details@^5.0.13":
+"@opentripplanner/trip-details@^5.0.15":
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.15.tgz#73cfd7427aed49af53fec4ded9de7d17b0ed5377"
   integrity sha512-1OfCEju90PXGH9DVy2dbBk8Jz8/8zSJ35/OCgodenGT3FyokQPoJsQhPjr6MPIIYMTyAdUSDT9C372thA+rU2Q==
@@ -2674,7 +2666,7 @@
     flat "^5.0.2"
     react-animate-height "^3.0.4"
 
-"@opentripplanner/trip-form@^3.6.2":
+"@opentripplanner/trip-form@^3.6.4":
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.6.4.tgz#e741bb190dbea845c826d0021618daf568cc3df7"
   integrity sha512-wnoJyI8jR3DbtTmg//FWWy+yhd6Yej843XxSnnGCuBhZjUnvC9aYffKa/FI1W9s8Xw+tJ7DsZ9wADiSOWEjmwA==
@@ -2690,7 +2682,7 @@
     react-indiana-drag-scroll "^2.0.1"
     react-inlinesvg "^2.3.0"
 
-"@opentripplanner/trip-viewer-overlay@^2.0.8":
+"@opentripplanner/trip-viewer-overlay@^2.0.10":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@opentripplanner/trip-viewer-overlay/-/trip-viewer-overlay-2.0.10.tgz#2c0809b2d54da4d57d0a0683a4739e29cb13a326"
   integrity sha512-7M9l7fF8shtD/566bci+zEkPncf/L+ZWIYAl5gnIgrBxwLagN/+E2zkoDebYamGFGb236FXpvTS30i1BJzhcPA==
@@ -2704,7 +2696,7 @@
   resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.5.2.tgz#1373d738479568d880a3b13670b0ec53a1a75bd5"
   integrity sha512-2qDcKOrsLoXdwjRAdi4xcdDUsZGTnwBM+vfEf8TTuuWSnA+WYav3ldlMB4sugxIdLaVKXlOfe3F5lCEh9jAHWA==
 
-"@opentripplanner/vehicle-rental-overlay@^2.1.7":
+"@opentripplanner/vehicle-rental-overlay@^2.1.9":
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/@opentripplanner/vehicle-rental-overlay/-/vehicle-rental-overlay-2.1.9.tgz#c373e1400874a00f473be0f029b28e0944652c88"
   integrity sha512-VYWqnuk5j1yHF/zH5NEqDIVjsSbIsIgiCK6SaYtQHOBwszWauIubpqviTBASAcY72JfKE36AQfGjPuYILd9oTw==