Merge branch 'dev' into allow-more-styling

opentripplanner · Jul 1, 2024 · 31a7b04 · 31a7b04
2 parents 07a5da1 + a4efecf
commit 31a7b04
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/example-config.yml b/example-config.yml
@@ -670,4 +670,7 @@ itinerary:
 ### Setting this to true will use the route viewer sort algorithm on routes
 #   useRouteViewSort: false
 ### Setting this to false will hide the shadowey dot that appears when dragging the map
-#   showShadowDotOnMapDrag: false
+#   showShadowDotOnMapDrag: false
+### In routes, this will always show the routeLongName before the headsign
+### !!! WARNING: in some feeds, this may show the long name twice. In some feeds, this may cause layout issues !!!
+#     alwaysShowLongName: false
diff --git a/lib/components/viewers/nearby/stop.tsx b/lib/components/viewers/nearby/stop.tsx
@@ -38,9 +38,19 @@ const Stop = ({
   const patternRows = (stopData.stoptimesForPatterns || [])
     ?.reduce<PatternStopTime[]>((acc, cur) => {
       const currentHeadsign = extractHeadsignFromPattern(cur.pattern)
-      const dupe = acc.findIndex(
-        (p) => extractHeadsignFromPattern(p.pattern) === currentHeadsign
-      )
+      const dupe = acc.findIndex((p) => {
+        // TODO: use OTP_generated ids
+        let sameRoute = false
+        if (p.pattern.route?.shortName && cur.pattern.route?.shortName) {
+          sameRoute =
+            p.pattern.route?.shortName === cur.pattern.route?.shortName
+        } else if (p.pattern.route?.longName && cur.pattern.route?.longName) {
+          sameRoute = p.pattern.route?.longName === cur.pattern.route?.longName
+        }
+        return (
+          extractHeadsignFromPattern(p.pattern) === currentHeadsign && sameRoute
+        )
+      })
       if (dupe === -1) {
         acc.push(cur)
       } else {
@@ -62,6 +72,7 @@ const Stop = ({
       )
       return (
         <PatternRow
+          alwaysShowLongName={nearbyViewConfig?.alwaysShowLongName}
           homeTimezone={homeTimezone}
           key={index}
           pattern={st.pattern}

diff --git a/lib/components/viewers/pattern-row.tsx b/lib/components/viewers/pattern-row.tsx
@@ -22,6 +22,7 @@ import { NextTripPreview, PatternRowItem } from './styled'
 import StopTimeCell from './stop-time-cell'
 
 type Props = {
+  alwaysShowLongName?: boolean
   homeTimezone?: string
   pattern: Pattern
   roundedTop?: boolean
@@ -58,6 +59,7 @@ const renderDay = (homeTimezone: string, day: number): JSX.Element => {
  * viewer.
  */
 const PatternRow = ({
+  alwaysShowLongName,
   homeTimezone,
   pattern,
   roundedTop = true,
@@ -101,6 +103,11 @@ const PatternRow = ({
             />
           </span>
           <span style={{ wordBreak: 'break-word' }} title={pattern.headsign}>
+            {alwaysShowLongName && !!pattern.route.longName && (
+              <strong style={{ display: 'block' }}>
+                {pattern.route.longName}
+              </strong>
+            )}
             {extractHeadsignFromPattern(pattern) ||
               (pattern.route.longName !== routeName && pattern.route.longName)}
           </span>

diff --git a/lib/util/config-types.ts b/lib/util/config-types.ts
@@ -69,6 +69,7 @@ export type BugsnagConfig = ApiKeyConfig
 export type MapillaryConfig = ApiKeyConfig
 
 export type NearbyViewConfig = {
+  alwaysShowLongName?: boolean
   hideEmptyStops?: boolean
   radius?: number
   showShadowDotOnMapDrag?: boolean