From 355882a0472a6c25de18a6f65e6df15588a33f27 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Thu, 13 Nov 2025 15:40:57 -0500
Subject: [PATCH 1/9] fix(util/viewer): Use last stop if no pattern headsign.

---
 __tests__/util/viewer.js | 11 +++++++++++
 lib/util/viewer.js       | 26 +++++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/__tests__/util/viewer.js b/__tests__/util/viewer.js
index 500e5d4d8..39bfac1c7 100644
--- a/__tests__/util/viewer.js
+++ b/__tests__/util/viewer.js
@@ -25,5 +25,16 @@ describe('util > viewer', () => {
         'Sesame Street'
       )
     })
+
+    it('should use the last stop name of a pattern if no headsign is provided', () => {
+      const stopNames = ['First stop', 'Second stop', 'Last stop']
+      const pattern = {
+        // If no headsigns are provided in feed, OTP might use the route short name as pattern name/description.
+        desc: '49',
+        name: '49',
+        stops: stopNames.map((s) => ({ name: s }))
+      }
+      expect(extractHeadsignFromPattern(pattern, '49')).toBe('Last stop')
+    })
   })
 })
diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index ff589872e..7ddf622eb 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -68,11 +68,13 @@ export function routeIsValid(route, routeId) {
  * @returns                  headsign of pattern
  */
 export function extractHeadsignFromPattern(pattern, routeShortName = null) {
-  let headsign = pattern.headsign
+  const { desc, headsign: originalHeadsign, stops } = pattern
+
+  let headsign = originalHeadsign
   // In case stop time headsign is blank, extract headsign from the pattern 'desc' attribute
   // (format: '49 to <Destination> (<destid>)[ from <Origin> (<originid)]').
   if (isBlank(headsign)) {
-    const matches = pattern?.desc?.match(/(?: to )(.*?)(?: \()/)
+    const matches = desc?.match(/(?: to )(.*?)(?: \()/)
     if (matches) {
       headsign = matches[1]
     }
@@ -80,7 +82,7 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
 
   // If that regex didn't work, try the old regex
   if (isBlank(headsign)) {
-    const matches = pattern?.desc?.match(/ to ([^(from)]+) \(.+\)/)
+    const matches = desc?.match(/ to ([^(from)]+) \(.+\)/)
     if (matches) {
       headsign = matches[1]
     }
@@ -91,21 +93,23 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
    * see https://github.com/opentripplanner/OpenTripPlanner/blob/7ce72cf554e6cf469d683869db5684eae3ce86f8/src/main/java/org/opentripplanner/graph_builder/module/TripPatternNamer.java#L72-L183
    * In this case, we need to rely on the routeShortName to determine what to remove
    */
-  if (isBlank(headsign) && routeShortName) {
-    const matches = pattern?.desc?.match(/^[^(]*$/)
+  const descNotSameAsRouteShortName =
+    routeShortName && desc !== `${routeShortName}`
+  if (isBlank(headsign) && descNotSameAsRouteShortName) {
+    const matches = desc?.match(/^[^(]*$/)
     if (matches) {
       headsign = matches[0].replace(`${routeShortName} `, '')
     }
   }
 
-  // If the headsign is still blank, show the description
-  if (isBlank(headsign)) {
-    headsign = pattern?.desc || ''
+  // If the headsign is still blank, show the description if different than the route short name.
+  if (isBlank(headsign) && descNotSameAsRouteShortName) {
+    headsign = desc || ''
   }
 
-  // If we still don't have a headsign, maybe the long name will work?
-  if (isBlank(headsign)) {
-    headsign = pattern?.route?.longName || ''
+  if (isBlank(headsign) && stops.length) {
+    const lastStop = stops[stops.length - 1]
+    headsign = lastStop.name
   }
 
   return headsign

From 97b203bb0a551525e256c2ca3b47d43ad977fa48 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Thu, 13 Nov 2025 16:38:06 -0500
Subject: [PATCH 2/9] test(util/viewer): Add test, tweak comment

---
 __tests__/util/viewer.js | 10 +++++++++-
 lib/util/viewer.js       |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/__tests__/util/viewer.js b/__tests__/util/viewer.js
index 39bfac1c7..422770eb3 100644
--- a/__tests__/util/viewer.js
+++ b/__tests__/util/viewer.js
@@ -26,12 +26,20 @@ describe('util > viewer', () => {
       )
     })
 
+    it('should use the description provided if it is not the same as the route short name', () => {
+      const pattern = {
+        desc: 'Southbound Express'
+      }
+      expect(extractHeadsignFromPattern(pattern, '49')).toBe(
+        'Southbound Express'
+      )
+    })
+
     it('should use the last stop name of a pattern if no headsign is provided', () => {
       const stopNames = ['First stop', 'Second stop', 'Last stop']
       const pattern = {
         // If no headsigns are provided in feed, OTP might use the route short name as pattern name/description.
         desc: '49',
-        name: '49',
         stops: stopNames.map((s) => ({ name: s }))
       }
       expect(extractHeadsignFromPattern(pattern, '49')).toBe('Last stop')
diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index 7ddf622eb..d0f7ce6ab 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -107,6 +107,7 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
     headsign = desc || ''
   }
 
+  // If nothing else works, use the name of the last stop in the pattern.
   if (isBlank(headsign) && stops.length) {
     const lastStop = stops[stops.length - 1]
     headsign = lastStop.name

From f478770b3c76b2186bed56b3e9e61d781f08340a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Thu, 13 Nov 2025 17:10:52 -0500
Subject: [PATCH 3/9] improvement(RouteDetail): Remove dropdown if single
 pattern.

---
 lib/components/viewers/route-details.tsx | 52 +++++++++++++++---------
 lib/components/viewers/styled.ts         | 15 ++++++-
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/lib/components/viewers/route-details.tsx b/lib/components/viewers/route-details.tsx
index 6218e04dc..bcd9e0d89 100644
--- a/lib/components/viewers/route-details.tsx
+++ b/lib/components/viewers/route-details.tsx
@@ -22,6 +22,7 @@ import OperatorLogo from '../util/operator-logo'
 
 import {
   Container,
+  HeadsignLabel,
   HeadsignSelectLabel,
   LogoLinkContainer,
   PatternContainer,
@@ -147,26 +148,37 @@ class RouteDetails extends Component<Props> {
       <Container backgroundColor={backgroundColor} full={pattern != null}>
         {headsigns && headsigns.length > 0 && (
           <PatternContainer className="pattern-picker">
-            <HeadsignSelectLabel htmlFor="headsign-selector-label">
-              <FormattedMessage id="components.RouteDetails.stopsTo" />
-            </HeadsignSelectLabel>
-            <PatternSelectDropdown
-              id="headsign-selector"
-              label={patternSelectLabel}
-              style={{ color: 'black' }}
-              text={patternSelectName}
-            >
-              {headsigns.map((h: PatternSummary) => (
-                <li key={h.id}>
-                  <PatternSelectButton
-                    onClick={() => this._headSignButtonClicked(h.id)}
-                    value={h.id}
-                  >
-                    <span>{h.headsign}</span>
-                  </PatternSelectButton>
-                </li>
-              ))}
-            </PatternSelectDropdown>
+            {headsigns.length > 1 ? (
+              <>
+                <HeadsignSelectLabel htmlFor="headsign-selector-label">
+                  <FormattedMessage id="components.RouteDetails.stopsTo" />
+                </HeadsignSelectLabel>
+                <PatternSelectDropdown
+                  id="headsign-selector"
+                  label={patternSelectLabel}
+                  style={{ color: 'black' }}
+                  text={patternSelectName}
+                >
+                  {headsigns.map((h: PatternSummary) => (
+                    <li key={h.id}>
+                      <PatternSelectButton
+                        onClick={() => this._headSignButtonClicked(h.id)}
+                        value={h.id}
+                      >
+                        <span>{h.headsign}</span>
+                      </PatternSelectButton>
+                    </li>
+                  ))}
+                </PatternSelectDropdown>
+              </>
+            ) : (
+              <>
+                <HeadsignLabel>
+                  <FormattedMessage id="components.RouteDetails.stopsTo" />
+                </HeadsignLabel>
+                <span>{patternSelectName}</span>
+              </>
+            )}
           </PatternContainer>
         )}
         {pattern && (
diff --git a/lib/components/viewers/styled.ts b/lib/components/viewers/styled.ts
index b2843e72f..93361891f 100644
--- a/lib/components/viewers/styled.ts
+++ b/lib/components/viewers/styled.ts
@@ -1,4 +1,4 @@
-import styled from 'styled-components'
+import styled, { css } from 'styled-components'
 
 import { getBaseColor, grey } from '../util/colors'
 
@@ -43,11 +43,22 @@ export const LogoLinkContainer = styled.div<{
     }
   }
 `
-export const HeadsignSelectLabel = styled.label`
+
+const headsignStyle = css`
   font-size: 18px;
   margin-bottom: 0;
 `
 
+export const HeadsignSelectLabel = styled.label`
+  ${headsignStyle}
+`
+
+export const HeadsignLabel = styled.span`
+  ${headsignStyle}
+  font-weight: bold;
+  width: auto !important;
+`
+
 export const PatternContainer = styled.div`
   align-items: center;
   background-color: inherit;

From 8ed1ac04fd0505b7d200854dd33ea9fb89621d9e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Thu, 13 Nov 2025 17:15:30 -0500
Subject: [PATCH 4/9] style(util/viewer): Move import, remove eslint exceptions

---
 lib/util/viewer.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index d0f7ce6ab..1b5f78c3e 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -1,10 +1,8 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/no-use-before-define */
 import { getMostReadableTextColor } from '@opentripplanner/core-utils/lib/route'
+import { isTransitLeg } from '@opentripplanner/core-utils/lib/itinerary'
 import tinycolor from 'tinycolor2'
 
 import { DARK_TEXT_GREY } from '../components/util/colors'
-import { isTransitLeg } from '@opentripplanner/core-utils/lib/itinerary'
 
 import { checkForRouteModeOverride } from './config'
 import { getOperatorAndRoute } from './state'

From a5d8bf0f15c6db1fb8a720a19a34462807615c84 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Thu, 13 Nov 2025 17:27:24 -0500
Subject: [PATCH 5/9] improvement(util/viewer): Remove leading 'to ' text.

---
 __tests__/util/viewer.js | 7 +++++++
 lib/util/viewer.js       | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/__tests__/util/viewer.js b/__tests__/util/viewer.js
index 422770eb3..82189882b 100644
--- a/__tests__/util/viewer.js
+++ b/__tests__/util/viewer.js
@@ -10,6 +10,13 @@ describe('util > viewer', () => {
       expect(extractHeadsignFromPattern(pattern)).toBe('Sesame Street')
     })
 
+    it('should remove leading "To " text in a headsign (English only)', () => {
+      const pattern = {
+        headsign: 'To Angle Lake'
+      }
+      expect(extractHeadsignFromPattern(pattern)).toBe('Angle Lake')
+    })
+
     it('should extract headsign from pattern description if no headsign present', () => {
       const pattern = {
         desc: '49 to Sesame Street (70:3562) from Airport Station'
diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index 1b5f78c3e..37e5bd451 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -69,6 +69,15 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
   const { desc, headsign: originalHeadsign, stops } = pattern
 
   let headsign = originalHeadsign
+
+  // Remove leading "To " text from headsign (English-specific)
+  if (
+    !isBlank(headsign) &&
+    (headsign.startsWith('To ') || headsign.startsWith('to '))
+  ) {
+    headsign = headsign.substring(3)
+  }
+
   // In case stop time headsign is blank, extract headsign from the pattern 'desc' attribute
   // (format: '49 to <Destination> (<destid>)[ from <Origin> (<originid)]').
   if (isBlank(headsign)) {

From 7921901c0b621f18896c14c2afce3ffb62583e84 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Fri, 14 Nov 2025 07:56:54 -0500
Subject: [PATCH 6/9] refactor(util/viewer): Reduce extract headsign complexity

---
 lib/util/viewer.js | 84 ++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 51 deletions(-)

diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index 37e5bd451..fc030c9cc 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -66,61 +66,43 @@ export function routeIsValid(route, routeId) {
  * @returns                  headsign of pattern
  */
 export function extractHeadsignFromPattern(pattern, routeShortName = null) {
-  const { desc, headsign: originalHeadsign, stops } = pattern
+  const { desc, headsign, stops } = pattern
+  const descNotRouteShortName = routeShortName && desc !== `${routeShortName}`
 
-  let headsign = originalHeadsign
-
-  // Remove leading "To " text from headsign (English-specific)
-  if (
-    !isBlank(headsign) &&
-    (headsign.startsWith('To ') || headsign.startsWith('to '))
-  ) {
-    headsign = headsign.substring(3)
-  }
-
-  // In case stop time headsign is blank, extract headsign from the pattern 'desc' attribute
-  // (format: '49 to <Destination> (<destid>)[ from <Origin> (<originid)]').
-  if (isBlank(headsign)) {
-    const matches = desc?.match(/(?: to )(.*?)(?: \()/)
-    if (matches) {
-      headsign = matches[1]
-    }
-  }
-
-  // If that regex didn't work, try the old regex
-  if (isBlank(headsign)) {
-    const matches = desc?.match(/ to ([^(from)]+) \(.+\)/)
-    if (matches) {
-      headsign = matches[1]
+  if (!isBlank(headsign)) {
+    if (headsign.startsWith('To ') || headsign.startsWith('to ')) {
+      // Remove leading "To " text from headsign (English-specific)
+      return headsign.substring(3)
     }
-  }
-
-  /**
-   * In some cases the string generated by OTP doesn't include a " "
-   * see https://github.com/opentripplanner/OpenTripPlanner/blob/7ce72cf554e6cf469d683869db5684eae3ce86f8/src/main/java/org/opentripplanner/graph_builder/module/TripPatternNamer.java#L72-L183
-   * In this case, we need to rely on the routeShortName to determine what to remove
-   */
-  const descNotSameAsRouteShortName =
-    routeShortName && desc !== `${routeShortName}`
-  if (isBlank(headsign) && descNotSameAsRouteShortName) {
-    const matches = desc?.match(/^[^(]*$/)
-    if (matches) {
-      headsign = matches[0].replace(`${routeShortName} `, '')
+    return headsign
+  } else {
+    // In case the headsign is blank, extract headsign from the pattern 'desc' attribute
+    // by attempting the logic below in order:
+    const attempts = [
+      // (format: '49 to <Destination> (<destid>)[ from <Origin> (<originid)]').
+      (d) => d?.match(/(?: to )(.*?)(?: \()/)?.[1],
+      // If that regex didn't work, try the old regex
+      (d) => d?.match(/ to ([^(from)]+) \(.+\)/)?.[1],
+      // In some cases the string generated by OTP doesn't include a " "
+      // see https://github.com/opentripplanner/OpenTripPlanner/blob/7ce72cf554e6cf469d683869db5684eae3ce86f8/src/main/java/org/opentripplanner/graph_builder/module/TripPatternNamer.java#L72-L183
+      // In this case, we need to rely on the routeShortName to determine what to remove
+      (d) =>
+        descNotRouteShortName &&
+        d?.match(/^[^(]*$/)?.[0]?.replace(`${routeShortName} `, ''),
+      // If the headsign is still blank, use the description, if different than the route short name.
+      (d) => descNotRouteShortName && d,
+      // If nothing else works, use the name of the last stop in the pattern.
+      () => stops?.[stops.length - 1]?.name
+    ]
+
+    for (let i = 0; i < attempts.length; i++) {
+      const newHeadsign = attempts[i](desc)
+      if (!isBlank(newHeadsign)) {
+        return newHeadsign
+      }
     }
+    return ''
   }
-
-  // If the headsign is still blank, show the description if different than the route short name.
-  if (isBlank(headsign) && descNotSameAsRouteShortName) {
-    headsign = desc || ''
-  }
-
-  // If nothing else works, use the name of the last stop in the pattern.
-  if (isBlank(headsign) && stops.length) {
-    const lastStop = stops[stops.length - 1]
-    headsign = lastStop.name
-  }
-
-  return headsign
 }
 
 /**

From b13ee2d7b6e6dfd72fdc3a53af5f6e21341644d1 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Fri, 14 Nov 2025 07:57:30 -0500
Subject: [PATCH 7/9] test(NearbyView): Update snapshot

---
 .../viewers/__snapshots__/nearby-view.js.snap | 228 +++++++++---------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
index d0e320c37..923b2c419 100644
--- a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
+++ b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
@@ -12905,7 +12905,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -12991,7 +12991,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -13140,10 +13140,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -13154,7 +13154,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -13166,7 +13166,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -13302,10 +13302,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -13316,7 +13316,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -13328,7 +13328,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -13731,7 +13731,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -13817,7 +13817,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -13966,10 +13966,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -13980,7 +13980,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -13992,7 +13992,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -14487,7 +14487,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -14573,7 +14573,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -14722,10 +14722,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -14736,7 +14736,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -14748,7 +14748,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -19723,7 +19723,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -19809,7 +19809,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -20422,7 +20422,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -20508,7 +20508,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -20924,7 +20924,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -21010,7 +21010,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -30593,7 +30593,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -30679,7 +30679,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -30828,10 +30828,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -30842,7 +30842,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -30854,7 +30854,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -30990,10 +30990,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -31004,7 +31004,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -31016,7 +31016,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -31432,7 +31432,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -31518,7 +31518,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -31667,10 +31667,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -31681,7 +31681,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -31693,7 +31693,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -31986,10 +31986,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -32000,7 +32000,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -32012,7 +32012,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -32193,7 +32193,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -32279,7 +32279,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -32892,7 +32892,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -32978,7 +32978,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -39988,7 +39988,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -40074,7 +40074,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -40223,10 +40223,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -40237,7 +40237,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -40249,7 +40249,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -40809,7 +40809,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -40895,7 +40895,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -41508,7 +41508,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -41594,7 +41594,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -48938,7 +48938,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -49024,7 +49024,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -49173,10 +49173,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -49187,7 +49187,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -49199,7 +49199,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -49335,10 +49335,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -49349,7 +49349,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -49361,7 +49361,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -49497,10 +49497,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -49511,7 +49511,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -49523,7 +49523,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -57261,7 +57261,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -57347,7 +57347,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -58012,7 +58012,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -58098,7 +58098,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -58247,10 +58247,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -58261,7 +58261,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -58273,7 +58273,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -58768,7 +58768,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -58854,7 +58854,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -59584,7 +59584,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -59670,7 +59670,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -60335,7 +60335,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -60421,7 +60421,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -61060,7 +61060,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -61146,7 +61146,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -69018,7 +69018,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -69104,7 +69104,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -69253,10 +69253,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -69267,7 +69267,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -69279,7 +69279,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -69415,10 +69415,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -69429,7 +69429,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -69441,7 +69441,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -69844,7 +69844,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -69930,7 +69930,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -70079,10 +70079,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -70093,7 +70093,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -70105,7 +70105,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"
@@ -70600,7 +70600,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       className="pattern-row-item"
                                     >
                                       <li
-                                        className="sc-bAffKu gvThCO pattern-row-item"
+                                        className="sc-jYCGPb jQbndK pattern-row-item"
                                       >
                                         <div
                                           className="header stop-view"
@@ -70686,7 +70686,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             className="departure-times"
                                           >
                                             <ol
-                                              className="sc-jYCGPb dDLykO departure-times"
+                                              className="sc-bxnjHY eMTbHw departure-times"
                                             >
                                               <p
                                                 aria-hidden={true}
@@ -70835,10 +70835,10 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         >
                                                           <Styled(Rss)>
                                                             <Rss
-                                                              className="sc-bxnjHY bDQXdg"
+                                                              className="sc-jVKKMF eNIEqQ"
                                                             >
                                                               <StyledIconBase
-                                                                className="sc-bxnjHY bDQXdg"
+                                                                className="sc-jVKKMF eNIEqQ"
                                                                 iconAttrs={
                                                                   Object {
                                                                     "fill": "currentColor",
@@ -70849,7 +70849,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 iconViewBox="0 0 448 512"
                                                               >
                                                                 <ForwardRef
-                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                  className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                   iconAttrs={
                                                                     Object {
                                                                       "fill": "currentColor",
@@ -70861,7 +70861,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                                 >
                                                                   <svg
                                                                     aria-hidden="true"
-                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-bxnjHY bDQXdg"
+                                                                    className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-jVKKMF eNIEqQ"
                                                                     fill="currentColor"
                                                                     focusable="false"
                                                                     viewBox="0 0 448 512"

From 52b7a44f9b444310749d8d819b2dc7a6322c6921 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Fri, 14 Nov 2025 17:14:02 -0500
Subject: [PATCH 8/9] refactor(util/viewer): Apply review feedback

---
 lib/util/viewer.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index fc030c9cc..3eb9a1161 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -70,7 +70,7 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
   const descNotRouteShortName = routeShortName && desc !== `${routeShortName}`
 
   if (!isBlank(headsign)) {
-    if (headsign.startsWith('To ') || headsign.startsWith('to ')) {
+    if (headsign.toLowerCase().startsWith('to ')) {
       // Remove leading "To " text from headsign (English-specific)
       return headsign.substring(3)
     }
@@ -79,7 +79,8 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
     // In case the headsign is blank, extract headsign from the pattern 'desc' attribute
     // by attempting the logic below in order:
     const attempts = [
-      // (format: '49 to <Destination> (<destid>)[ from <Origin> (<originid)]').
+      // This attempt and the next are aimed at pattern descriptions of the form:
+      // '49 to <Destination> (<destid>)[ from <Origin> (<originid)]'
       (d) => d?.match(/(?: to )(.*?)(?: \()/)?.[1],
       // If that regex didn't work, try the old regex
       (d) => d?.match(/ to ([^(from)]+) \(.+\)/)?.[1],
@@ -89,7 +90,7 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
       (d) =>
         descNotRouteShortName &&
         d?.match(/^[^(]*$/)?.[0]?.replace(`${routeShortName} `, ''),
-      // If the headsign is still blank, use the description, if different than the route short name.
+      // If the headsign is still blank, use the description, if different than routeShortName.
       (d) => descNotRouteShortName && d,
       // If nothing else works, use the name of the last stop in the pattern.
       () => stops?.[stops.length - 1]?.name

From 0deb98a47707c1b0d6a5a7b2ed2e9f59ddb1d6bf Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <binh.dam@arcadis.com>
Date: Tue, 18 Nov 2025 12:06:41 -0500
Subject: [PATCH 9/9] improvement(util/viewer): Handle more headsign prefixes

---
 __tests__/util/viewer.js | 17 +++++++++++------
 lib/util/viewer.js       | 11 ++++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/__tests__/util/viewer.js b/__tests__/util/viewer.js
index 82189882b..f736b758a 100644
--- a/__tests__/util/viewer.js
+++ b/__tests__/util/viewer.js
@@ -10,12 +10,17 @@ describe('util > viewer', () => {
       expect(extractHeadsignFromPattern(pattern)).toBe('Sesame Street')
     })
 
-    it('should remove leading "To " text in a headsign (English only)', () => {
-      const pattern = {
-        headsign: 'To Angle Lake'
-      }
-      expect(extractHeadsignFromPattern(pattern)).toBe('Angle Lake')
-    })
+    const prefixes = ['To', 'Toward', 'Towards']
+    prefixes
+      .flatMap((prefix) => [prefix, prefix.toLowerCase()])
+      .forEach((prefix) => {
+        it(`should remove leading "${prefix} " text in a headsign (English only)`, () => {
+          const pattern = {
+            headsign: `${prefix} Angle Lake`
+          }
+          expect(extractHeadsignFromPattern(pattern)).toBe('Angle Lake')
+        })
+      })
 
     it('should extract headsign from pattern description if no headsign present', () => {
       const pattern = {
diff --git a/lib/util/viewer.js b/lib/util/viewer.js
index 3eb9a1161..f8efde7cc 100644
--- a/lib/util/viewer.js
+++ b/lib/util/viewer.js
@@ -70,9 +70,14 @@ export function extractHeadsignFromPattern(pattern, routeShortName = null) {
   const descNotRouteShortName = routeShortName && desc !== `${routeShortName}`
 
   if (!isBlank(headsign)) {
-    if (headsign.toLowerCase().startsWith('to ')) {
-      // Remove leading "To " text from headsign (English-specific)
-      return headsign.substring(3)
+    const prefixes = ['to ', 'toward ', 'towards ']
+    const headsignLower = headsign.toLowerCase()
+    // Find and remove leading prefix text from headsign (English-specific).
+    const matchingPrefix = prefixes.find((prefix) =>
+      headsignLower.startsWith(prefix)
+    )
+    if (matchingPrefix) {
+      return headsign.substring(matchingPrefix.length)
     }
     return headsign
   } else {