Merge branch 'dev' into date-restricted-requests

opentripplanner · Sep 25, 2024 · 7453827 · 7453827
2 parents f908764 + 711fac9
commit 7453827
Show file tree

Hide file tree

Showing 6 changed files with 268 additions and 29 deletions.
diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
diff --git a/i18n/en-US.yml b/i18n/en-US.yml
@@ -357,6 +357,7 @@ components:
     distanceAway: "{localizedDistanceString} away"
     error: An error occurred loading nearby amenities.
     header: Nearby View
+    headsign: "{destination}"
     nearbyListIntro: List of {count} nearby entities.
     nothingNearby: There are no places nearby.
     spacesAvailable: "{spacesAvailable} empty spaces available"

diff --git a/i18n/fr.yml b/i18n/fr.yml
@@ -376,6 +376,7 @@ components:
     distanceAway: à {localizedDistanceString}
     error: Erreur lors du chargement des services à proximité.
     header: À proximité
+    headsign: "{destination}"
     nearbyListIntro: Liste de {count} entités à proximité.
     nothingNearby: Aucun lieu à proximité.
     spacesAvailable: "{spacesAvailable} emplacements libres disponibles"

diff --git a/lib/components/map/default-map.tsx b/lib/components/map/default-map.tsx
@@ -267,7 +267,8 @@ class DefaultMap extends Component {
       setLocation,
       setViewedStop,
       vehicleRentalQuery,
-      vehicleRentalStations
+      vehicleRentalStations,
+      viewedRouteStops
     } = this.props
     const { getCustomMapOverlays, getTransitiveRouteLabel, ModeIcon } =
       this.context
@@ -405,7 +406,7 @@ class DefaultMap extends Component {
                   vectorTilesEndpoint,
                   setLocation,
                   setViewedStop,
-                  null,
+                  viewedRouteStops,
                   config.companies
                 )
               default:
@@ -428,6 +429,26 @@ class DefaultMap extends Component {
 
 const mapStateToProps = (state) => {
   const activeSearch = getActiveSearch(state)
+  const viewedRoute = state.otp?.ui?.viewedRoute?.routeId
+  const nearbyViewerActive =
+    state.otp.ui.mainPanelContent === MainPanelContent.NEARBY_VIEW
+
+  const viewedRoutePatterns = Object.entries(
+    state.otp?.transitIndex?.routes?.[viewedRoute]?.patterns || {}
+  )
+  const viewedRouteStops =
+    viewedRoute && !nearbyViewerActive
+      ? // Ensure we don't have duplicates
+        Array.from(
+          new Set(
+            // Generate a list of every stop id the pattern stops at
+            viewedRoutePatterns.reduce((acc, cur) => {
+              // Convert pattern object to list of the pattern's stops
+              return [...cur?.[1]?.stops.map((s) => s.id), ...acc]
+            }, [])
+          )
+        )
+      : null
 
   return {
     bikeRentalStations: state.otp.overlay.bikeRental.stations,
@@ -439,7 +460,8 @@ const mapStateToProps = (state) => {
       state.otp.ui.mainPanelContent === MainPanelContent.NEARBY_VIEW,
     pending: activeSearch ? Boolean(activeSearch.pending) : false,
     query: state.otp.currentQuery,
-    vehicleRentalStations: state.otp.overlay.vehicleRental.stations
+    vehicleRentalStations: state.otp.overlay.vehicleRental.stations,
+    viewedRouteStops
   }
 }
 

diff --git a/lib/components/map/point-popup.tsx b/lib/components/map/point-popup.tsx
@@ -82,7 +82,7 @@ function MapPopup({
       // Override inline style supplied by react-map-gl to accommodate long "plan a trip" translations.
       style={{ maxWidth: '260px', width: '260px' }}
     >
-      <FocusTrapWrapper closePopup={clearMapPopupLocation} id="stop-popup">
+      <FocusTrapWrapper closePopup={clearMapPopupLocation} id="point-popup">
         <PopupTitleWrapper>
           <PopupTitle>
             {typeof popupName === 'string' && popupName.split(',').length > 3

diff --git a/lib/components/viewers/pattern-row.tsx b/lib/components/viewers/pattern-row.tsx
@@ -1,5 +1,6 @@
 import { Calendar } from '@styled-icons/fa-regular'
 import { format, utcToZonedTime } from 'date-fns-tz'
+import { FormattedMessage } from 'react-intl'
 import { getMostReadableTextColor } from '@opentripplanner/core-utils/lib/route'
 import { isSameDay } from 'date-fns'
 import React, { useContext } from 'react'
@@ -108,8 +109,15 @@ const PatternRow = ({
                 {pattern.route.longName}
               </strong>
             )}
-            {extractHeadsignFromPattern(pattern) ||
-              (pattern.route.longName !== routeName && pattern.route.longName)}
+            <FormattedMessage
+              id="components.NearbyView.headsign"
+              values={{
+                destination:
+                  extractHeadsignFromPattern(pattern) ||
+                  (pattern.route.longName !== routeName &&
+                    pattern.route.longName)
+              }}
+            />
           </span>
         </div>
         {/* next departure preview (only shows up to 3 entries) */}