Merge branch 'dev' into nearby-view-increase-override-possibilities

__tests__/test-utils/mock-data/fileMock.js

@@ -0,0 +1,2 @@
+const mockImg = ''
+export default mockImg

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)

lib/components/map/default-map.tsx

@@ -405,6 +405,7 @@ class DefaultMap extends Component {
                   vectorTilesEndpoint,
                   setLocation,
                   setViewedStop,
+                  null,
                   config.companies
                 )
               default:

lib/components/map/point-popup.tsx

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux'
-import { FocusTrapWrapper } from '@opentripplanner/map-popup/lib'
+import { FocusTrapWrapper } from '@opentripplanner/building-blocks'
 import { Popup } from '@opentripplanner/base-map'
 import { Search } from '@styled-icons/fa-solid/Search'
 import { useIntl, WrappedComponentProps } from 'react-intl'

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
   }
 }
 

lib/util/config-types.ts

@@ -73,6 +73,7 @@ export type NearbyViewConfig = {
   hideEmptyStops?: boolean
   radius?: number
   showShadowDotOnMapDrag?: boolean
+  useArrivalTime?: boolean
   useRouteViewSort?: boolean
 }
 

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) {

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.12",
-    "@opentripplanner/park-and-ride-overlay": "^2.0.8",
-    "@opentripplanner/printable-itinerary": "^2.0.21",
-    "@opentripplanner/route-viewer-overlay": "^2.0.15",
-    "@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/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/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"