From addd376a65d630d1ca90ffc3dbf244923a5cb4a8 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 9 Aug 2023 15:50:57 -0500
Subject: [PATCH 01/42] refactor(route-viewer): identify route btns for AT

---
 i18n/en-US.yml                     |  1 +
 lib/components/viewers/RouteRow.js | 99 +++++++++++++++---------------
 2 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/i18n/en-US.yml b/i18n/en-US.yml
index aeb3e14b7..eb07890d1 100644
--- a/i18n/en-US.yml
+++ b/i18n/en-US.yml
@@ -481,6 +481,7 @@ components:
     modeFilter: Mode Filter
     noFilteredRoutesFound: No routes match your filter!
     openPatternViewer: View route details
+    selected: Route selected
     shortTitle: View Routes
     stopsInDirectionOfTravel: "Stops in this direction of travel:"
     title: Route Viewer
diff --git a/lib/components/viewers/RouteRow.js b/lib/components/viewers/RouteRow.js
index 41dbd0bd7..bf2b436dd 100644
--- a/lib/components/viewers/RouteRow.js
+++ b/lib/components/viewers/RouteRow.js
@@ -9,6 +9,7 @@ import { ComponentContext } from '../../util/contexts'
 import { getFormattedMode } from '../../util/i18n'
 import { getModeFromRoute } from '../../util/viewer'
 import { Icon } from '../util/styledIcon'
+import InvisibleA11yLabel from '../util/invisible-a11y-label'
 import OperatorLogo from '../util/operator-logo'
 
 import RouteName from './route-name'
@@ -17,19 +18,18 @@ export const StyledRouteRow = styled.li`
   align-items: center;
   background-color: transparent;
   display: flex;
-  gap: 7px;
   justify-content: space-between;
   list-style: none;
   margin: 5px 0;
-  padding: 5px;
+  min-height: 50px;
   position: relative;
 `
 // Route Row Button sits invisible on top of the route name and info.
 export const RouteRowButton = styled(Button)`
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
+  align-items: center;
+  display: flex;
+  min-height: 50px;
+  padding: 5px;
   transition: all ease-out 0.1s;
   width: 100%;
 
@@ -45,15 +45,6 @@ export const RouteRowButton = styled(Button)`
     z-index: -4;
   }
 
-  &:active,
-  &.btn-default:active:focus {
-    background-color: transparent !important;
-  }
-
-  &:active:before,
-  &.btn-default:active:focus:before {
-    background-color: #eee;
-    transition: all ease-out 0.1s;
   }
 `
 
@@ -69,11 +60,11 @@ export const ModeIconElement = styled.span`
 
 const RouteDetailsContainer = styled.div`
   align-items: center;
-  display: grid;
-  grid-template-columns: repeat(4, auto);
+  display: flex;
   gap: 12px;
-  justify-items: center;
   margin-left: 5px;
+  // Make sure route details always leaves enough room for pattern button
+  max-width: 87%;
 `
 
 const PatternButton = styled.button`
@@ -83,15 +74,16 @@ const PatternButton = styled.button`
   color: #004f96;
   height: 40px;
   margin-right: 8px;
-  min-width: 40px;
-  opacity: ${(props) => (props.display ? '80%' : 0)};
-  position: relative;
+  position: absolute;
+  right: 5px;
   transition: all ease-out 0.1s;
   z-index: ${(props) => (props.display ? 2 : -2)};
+  width: 40px;
 
   svg {
-    margin-top: -3px;
     height: 22px !important;
+    margin-top: -3px;
+    opacity: ${(props) => (props.display ? '80%' : 0)};
     width: 22px !important;
   }
 
@@ -101,7 +93,7 @@ const PatternButton = styled.button`
   }
 
   &:hover {
-    background: #eee;
+    background: #fff;
     transition: all ease-out 0.1s;
   }
 `
@@ -172,42 +164,51 @@ export class RouteRow extends PureComponent {
 
     return (
       <StyledRouteRow ref={this.activeRef}>
-        <RouteDetailsContainer>
-          <OperatorLogo operator={operator} />
-          {route.mode && (
-            <ModeIconElement>
-              <ModeIcon
-                aria-label={getFormattedMode(
-                  getModeFromRoute(route).toLowerCase(),
-                  intl
-                )}
-                height={28}
-                leg={{
-                  routeLongName: route?.longName,
-                  routeShortName: route?.shortName
-                }}
-                mode={getModeFromRoute(route)}
-                role="image"
-                width={28}
-              />
-            </ModeIconElement>
-          )}
-          <RouteName route={route} RouteRenderer={RouteRenderer} />
-        </RouteDetailsContainer>
         <RouteRowButton
-          aria-label={routeMapToggleText}
           className="clear-button-formatting"
           onClick={this._onClick}
           onFocus={this._onFocusOrEnter}
           onMouseEnter={this._onFocusOrEnter}
           onTouchStart={this._onFocusOrEnter}
           patternActive={isActive}
-          title={routeMapToggleText}
-        />
+        >
+          <InvisibleA11yLabel>
+            {isActive &&
+              intl.formatMessage({
+                description: 'Identifies that route is active on map',
+                id: 'components.RouteViewer.selected'
+              })}
+          </InvisibleA11yLabel>
+          <RouteDetailsContainer>
+            <OperatorLogo operator={operator} />
+            {route.mode && (
+              <ModeIconElement>
+                <ModeIcon
+                  aria-label={getFormattedMode(
+                    getModeFromRoute(route).toLowerCase(),
+                    intl
+                  )}
+                  height={28}
+                  leg={{
+                    routeLongName: route?.longName,
+                    routeShortName: route?.shortName
+                  }}
+                  mode={getModeFromRoute(route)}
+                  role="img"
+                  width={28}
+                />
+              </ModeIconElement>
+            )}
+            <RouteName route={route} RouteRenderer={RouteRenderer} />
+          </RouteDetailsContainer>
+          <InvisibleA11yLabel>({routeMapToggleText})</InvisibleA11yLabel>
+        </RouteRowButton>
         <PatternButton
           aria-label={patternViewerButtonText}
           display={isActive}
-          id={`open-route-button-${route.shortName || route.longName}`}
+          id={`open-route-button-${route.shortName || route.longName}-${
+            operator.name
+          }`}
           onClick={this._patternButtonClicked}
           // Cannot keyboard navigate to the button unless it is visible
           tabIndex={isActive ? 0 : -1}

From 676f1db665068d62b5d2349b96031622a404ff4e Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 10 Aug 2023 15:47:44 -0400
Subject: [PATCH 02/42] refactor: begin shift from walk reluctance slider to
 dropdown

---
 .../form/call-taker/advanced-options.js       | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/components/form/call-taker/advanced-options.js b/lib/components/form/call-taker/advanced-options.js
index 450c8c67f..dcf81ee32 100644
--- a/lib/components/form/call-taker/advanced-options.js
+++ b/lib/components/form/call-taker/advanced-options.js
@@ -2,9 +2,13 @@
 // FIXME: Remove the following eslint rule exception.
 /* eslint-disable jsx-a11y/label-has-for */
 import * as TripFormClasses from '@opentripplanner/trip-form/lib/styled'
+import {
+  DropdownSelector,
+  SliderSelector,
+  SubmodeSelector
+} from '@opentripplanner/trip-form'
 import { FormattedMessage, injectIntl } from 'react-intl'
 import { hasBike } from '@opentripplanner/core-utils/lib/itinerary'
-import { SliderSelector, SubmodeSelector } from '@opentripplanner/trip-form'
 import isEmpty from 'lodash.isempty'
 import React, { Component, lazy, Suspense } from 'react'
 import styled from 'styled-components'
@@ -155,9 +159,9 @@ class AdvancedOptions extends Component {
     })
   }
 
-  _setWaklTolerance = ({ walkTolerance }) => {
+  _setWalkTolerance = ({ walkReluctance }) => {
     this.props.setUrlSearch({
-      walkTolerance
+      walkReluctance
     })
   }
 
@@ -224,17 +228,19 @@ class AdvancedOptions extends Component {
             justifyContent: 'space-between'
           }}
         >
-          <SliderSelector
+          <DropdownSelector
             label={intl.formatMessage({
               id: 'components.AdvancedOptions.walkTolerance'
             })}
-            max={5}
-            min={0}
-            name="walkTolerance"
-            onChange={this._setWaklTolerance}
-            step={1}
-            style={{ display: 'block', marginRight: '10px', width: '150px' }}
-            value={this.props.modeSettingValues.walkTolerance}
+            name="walkReluctance"
+            onChange={this._setWalkTolerance}
+            options={[
+              { text: 'Avoid Walking', value: 15 },
+              { text: 'Normal Walking', value: 3 },
+              { text: 'Prefer walking', value: 1 }
+            ]}
+            style={{ display: 'block' }}
+            value={this.props.modeSettingValues.walkReluctance}
           />
 
           {hasBike(currentModes?.map((m) => m.mode).join(',') || '') ? (

From a721df410c66ddc6bca8b1658d88154e6a2ecaff Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Tue, 15 Aug 2023 10:29:35 -0500
Subject: [PATCH 03/42] feat: reset focus to top on each account step

---
 lib/components/user/sequential-pane-display.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/components/user/sequential-pane-display.tsx b/lib/components/user/sequential-pane-display.tsx
index 1939d67af..adf171e21 100644
--- a/lib/components/user/sequential-pane-display.tsx
+++ b/lib/components/user/sequential-pane-display.tsx
@@ -50,6 +50,12 @@ class SequentialPaneDisplay<T> extends Component<Props<T>> {
     routeTo(`${parentPath}/${nextId}`)
   }
 
+  h1Ref = React.createRef<HTMLHeadingElement>()
+
+  _handleFocus = () => {
+    this.h1Ref?.current?.focus()
+  }
+
   _handleToNextPane = async (e: MouseEvent<Button>) => {
     const { activePane, activePaneIndex, panes } = this.props
     const { invalid, invalidMessage } = activePane
@@ -70,6 +76,7 @@ class SequentialPaneDisplay<T> extends Component<Props<T>> {
         this._routeTo(nextId)
       }
     }
+    this._handleFocus()
   }
 
   _handleToPrevPane = () => {
@@ -78,6 +85,11 @@ class SequentialPaneDisplay<T> extends Component<Props<T>> {
       const prevId = panes[activePaneIndex - 1].id
       prevId && this._routeTo(prevId)
     }
+    this._handleFocus()
+  }
+
+  componentDidMount(): void {
+    this._handleFocus()
   }
 
   render() {
@@ -86,7 +98,7 @@ class SequentialPaneDisplay<T> extends Component<Props<T>> {
 
     return (
       <>
-        <h1>
+        <h1 aria-live="assertive" ref={this.h1Ref} tabIndex={-1}>
           <StepNumber>
             <FormattedMessage
               id="components.SequentialPaneDisplay.stepNumber"

From 638496002b716f8d199ae115bd56a122f175a677 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Tue, 15 Aug 2023 17:35:08 -0500
Subject: [PATCH 04/42] refactor: address PR feedback

---
 lib/components/viewers/RouteRow.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/components/viewers/RouteRow.js b/lib/components/viewers/RouteRow.js
index bf2b436dd..0827bf539 100644
--- a/lib/components/viewers/RouteRow.js
+++ b/lib/components/viewers/RouteRow.js
@@ -30,6 +30,8 @@ export const RouteRowButton = styled(Button)`
   display: flex;
   min-height: 50px;
   padding: 5px;
+  // Make sure route details always leaves enough room for pattern button
+  padding-right: 55px;
   transition: all ease-out 0.1s;
   width: 100%;
 
@@ -63,8 +65,7 @@ const RouteDetailsContainer = styled.div`
   display: flex;
   gap: 12px;
   margin-left: 5px;
-  // Make sure route details always leaves enough room for pattern button
-  max-width: 87%;
+  overflow: hidden;
 `
 
 const PatternButton = styled.button`

From 865becfc193681477669da87330c8446c3c747f3 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Tue, 15 Aug 2023 17:43:46 -0500
Subject: [PATCH 05/42] refactor: replace invisible text with aria-pressed

---
 i18n/en-US.yml                     | 1 -
 lib/components/viewers/RouteRow.js | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/i18n/en-US.yml b/i18n/en-US.yml
index eb07890d1..aeb3e14b7 100644
--- a/i18n/en-US.yml
+++ b/i18n/en-US.yml
@@ -481,7 +481,6 @@ components:
     modeFilter: Mode Filter
     noFilteredRoutesFound: No routes match your filter!
     openPatternViewer: View route details
-    selected: Route selected
     shortTitle: View Routes
     stopsInDirectionOfTravel: "Stops in this direction of travel:"
     title: Route Viewer
diff --git a/lib/components/viewers/RouteRow.js b/lib/components/viewers/RouteRow.js
index 0827bf539..e31c0faac 100644
--- a/lib/components/viewers/RouteRow.js
+++ b/lib/components/viewers/RouteRow.js
@@ -166,6 +166,7 @@ export class RouteRow extends PureComponent {
     return (
       <StyledRouteRow ref={this.activeRef}>
         <RouteRowButton
+          aria-pressed={isActive || false}
           className="clear-button-formatting"
           onClick={this._onClick}
           onFocus={this._onFocusOrEnter}
@@ -173,13 +174,6 @@ export class RouteRow extends PureComponent {
           onTouchStart={this._onFocusOrEnter}
           patternActive={isActive}
         >
-          <InvisibleA11yLabel>
-            {isActive &&
-              intl.formatMessage({
-                description: 'Identifies that route is active on map',
-                id: 'components.RouteViewer.selected'
-              })}
-          </InvisibleA11yLabel>
           <RouteDetailsContainer>
             <OperatorLogo operator={operator} />
             {route.mode && (

From 51ca633c5bff37b0f5890348bea6882d98a41a29 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 18 Aug 2023 14:10:02 -0400
Subject: [PATCH 06/42] fix(narrative-itineraries): Make sure leg
 alernateRoutes available on earliest itin.

---
 .../narrative/narrative-itineraries.js        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index 2f37581e1..aa78d24a1 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -44,11 +44,16 @@ import NarrativeItinerariesErrors from './narrative-itineraries-errors'
 import NarrativeItinerariesHeader from './narrative-itineraries-header'
 
 function doMergeItineraries(itineraries) {
-  const mergedItineraries = itineraries
-    .reduce((prev, cur, curIndex) => {
+  // Order itineraries by start time.
+  // This is because alternate routes are only added to the first non-duplicate itinerary,
+  // and we show alternate routes for the first (i.e. earliest) non-duplicate itinerary found.
+  const sortedItineraries = sortStartTimes([...itineraries])
+  const mergedItineraries = sortedItineraries
+    .reduce((prev, cur) => {
       const updatedItineraries = clone(prev)
       const updatedItinerary = clone(cur)
-      updatedItinerary.index = curIndex
+      // Sorting itineraries above requires to find the index in the original array.
+      updatedItinerary.index = itineraries.indexOf(cur)
 
       const duplicateIndex = updatedItineraries.findIndex((itin) =>
         itinerariesAreEqual(itin, cur)
@@ -91,15 +96,16 @@ function doMergeItineraries(itineraries) {
         // This map catches those and stores the alternate routes so they can be displayed
         duplicateItin.legs = duplicateItin.legs.map((leg, index) => {
           const newLeg = clone(leg)
-          if (leg?.routeId !== cur.legs[index]?.routeId) {
+          const curLeg = cur.legs[index]
+          const curLegRouteId = curLeg?.routeId
+          if (curLegRouteId && leg?.routeId && leg?.routeId !== curLegRouteId) {
             if (!newLeg.alternateRoutes) {
               newLeg.alternateRoutes = {}
             }
-            const { routeId } = cur.legs?.[index]
-            newLeg.alternateRoutes[routeId] = {
+            newLeg.alternateRoutes[curLegRouteId] = {
               // We save the entire leg to the alternateRoutes object so in
               // the future, we can draw the leg on the map as an alternate route
-              ...cur.legs?.[index]
+              ...curLeg
             }
           }
           return newLeg

From fb7f0be2473dc59455c098887d0d4fc3ca8ddd60 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 18 Aug 2023 14:33:58 -0400
Subject: [PATCH 07/42] fix(create-otp-reducer): Unset the visible itin when
 setting the active itin.

---
 lib/reducers/create-otp-reducer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index bc866f3ea..7b5f1f8e3 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -464,7 +464,8 @@ function createOtpReducer(config) {
               [state.activeSearchId]: {
                 activeItinerary: { $set: action.payload.index },
                 activeLeg: { $set: null },
-                activeStep: { $set: null }
+                activeStep: { $set: null },
+                visibleItinerary: { $set: null }
               }
             }
           })

From 52ed414b5a4ad0d3033d566bfacc03336fdf3974 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 18 Aug 2023 14:34:50 -0400
Subject: [PATCH 08/42] refactor(metro-itinerary): Remove unused import.

---
 lib/components/narrative/metro/metro-itinerary.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx
index e86a593e3..274b8816c 100644
--- a/lib/components/narrative/metro/metro-itinerary.tsx
+++ b/lib/components/narrative/metro/metro-itinerary.tsx
@@ -28,7 +28,7 @@ import ItineraryBody from '../line-itin/connected-itinerary-body'
 import NarrativeItinerary from '../narrative-itinerary'
 import SimpleRealtimeAnnotation from '../simple-realtime-annotation'
 
-import { getFirstTransitLegStop, getFlexAttirbutes } from './attribute-utils'
+import { getFlexAttirbutes } from './attribute-utils'
 import DepartureTimesList, {
   SetActiveItineraryHandler
 } from './departure-times-list'

From a2f2dc42ff084146b973429cc79ebe771053f25d Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:05:36 -0400
Subject: [PATCH 09/42] refactor(lib/util): Strengthen getItineraryView tests.

---
 __tests__/util/ui.ts | 3 +++
 lib/util/ui.ts       | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/__tests__/util/ui.ts b/__tests__/util/ui.ts
index 172c1b36e..0dfadfbf1 100644
--- a/__tests__/util/ui.ts
+++ b/__tests__/util/ui.ts
@@ -4,6 +4,9 @@ describe('util > ui', () => {
   describe('getItineraryView', () => {
     it('returns a list mode by default or ui_activeItinerary is -1', () => {
       expect(getItineraryView({})).toBe(ItineraryView.LIST)
+      expect(getItineraryView({ ui_activeItinerary: null })).toBe(
+        ItineraryView.LIST
+      )
       expect(getItineraryView({ ui_activeItinerary: -1 })).toBe(
         ItineraryView.LIST
       )
diff --git a/lib/util/ui.ts b/lib/util/ui.ts
index ba7dff093..b438374bd 100644
--- a/lib/util/ui.ts
+++ b/lib/util/ui.ts
@@ -102,7 +102,8 @@ export function getItineraryView({
 }: UrlParams): ItineraryView {
   return (
     ui_itineraryView ||
-    (ui_activeItinerary !== undefined &&
+    (ui_activeItinerary !== null &&
+      ui_activeItinerary !== undefined &&
       `${ui_activeItinerary}` !== '-1' &&
       ItineraryView.FULL) ||
     ItineraryView.LIST

From aa3ddaf86d5fdcd19fa92a7a2df8f47ee474c2a8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:18:26 -0400
Subject: [PATCH 10/42] fix(actions/util): Treat ui_activeItinerary null same
 as -1 in back navigation.

---
 lib/actions/ui.js | 10 ++++++++--
 lib/util/ui.ts    | 14 ++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/actions/ui.js b/lib/actions/ui.js
index 28c03e244..4df30e074 100644
--- a/lib/actions/ui.js
+++ b/lib/actions/ui.js
@@ -10,7 +10,11 @@ import {
   loadLocaleData
 } from '../util/i18n'
 import { getModesForActiveAgencyFilter, getUiUrlParams } from '../util/state'
-import { getPathFromParts, ItineraryView } from '../util/ui'
+import {
+  getPathFromParts,
+  isDefinedAndNotEqual,
+  ItineraryView
+} from '../util/ui'
 
 import {
   clearActiveSearch,
@@ -269,7 +273,9 @@ export function handleBackButtonPress(e) {
       // previous search ID.
       if (activeSearchId !== previousSearchId) {
         dispatch(setActiveSearch(previousSearchId))
-      } else if (uiUrlParams.ui_activeItinerary !== previousItinIndex) {
+      } else if (
+        isDefinedAndNotEqual(uiUrlParams.ui_activeItinerary, previousItinIndex)
+      ) {
         // Active itinerary index has changed.
         dispatch(setActiveItinerary({ index: previousItinIndex }))
       }
diff --git a/lib/util/ui.ts b/lib/util/ui.ts
index b438374bd..60e1d4b0a 100644
--- a/lib/util/ui.ts
+++ b/lib/util/ui.ts
@@ -93,6 +93,15 @@ interface UrlParams {
   ui_itineraryView: ItineraryView
 }
 
+export function isDefinedAndNotEqual(
+  subject: number | string,
+  value: number | string
+): boolean {
+  return (
+    subject !== null && subject !== undefined && `${subject}` !== `${value}`
+  )
+}
+
 /**
  * Gets the itinerary view to display based on URL params.
  */
@@ -102,10 +111,7 @@ export function getItineraryView({
 }: UrlParams): ItineraryView {
   return (
     ui_itineraryView ||
-    (ui_activeItinerary !== null &&
-      ui_activeItinerary !== undefined &&
-      `${ui_activeItinerary}` !== '-1' &&
-      ItineraryView.FULL) ||
+    (isDefinedAndNotEqual(ui_activeItinerary, -1) && ItineraryView.FULL) ||
     ItineraryView.LIST
   )
 }

From 3deb8844d8b0e584b15d247bab294d214a2af205 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:27:18 -0400
Subject: [PATCH 11/42] refactor(view-switcher): Remove highlight in accounts
 view. Remove history hook.

---
 lib/components/app/view-switcher.tsx | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/components/app/view-switcher.tsx b/lib/components/app/view-switcher.tsx
index d24615e13..39902f920 100644
--- a/lib/components/app/view-switcher.tsx
+++ b/lib/components/app/view-switcher.tsx
@@ -1,11 +1,10 @@
 import { Button } from 'react-bootstrap'
 import { connect } from 'react-redux'
 import { FormattedMessage, useIntl } from 'react-intl'
-import { useHistory } from 'react-router'
 import React from 'react'
 
+import * as uiActions from '../../actions/ui'
 import { MainPanelContent } from '../../actions/ui-constants'
-import { setMainPanelContent } from '../../actions/ui'
 
 type Props = {
   accountsActive: boolean
@@ -23,7 +22,6 @@ const ViewSwitcher = ({
   setMainPanelContent,
   sticky
 }: Props) => {
-  const history = useHistory()
   const intl = useIntl()
 
   const _showRouteViewer = () => {
@@ -31,15 +29,11 @@ const ViewSwitcher = ({
   }
 
   const _showTripPlanner = () => {
-    if (accountsActive) {
-      // Go up to root while preserving query parameters
-      history.push('..' + history.location.search)
-    } else {
-      setMainPanelContent(null)
-    }
+    // setMainPanelContent(null) already includes navigation to '/'.
+    setMainPanelContent(null)
   }
 
-  const tripPlannerActive = activePanel === null
+  const tripPlannerActive = activePanel === null && !accountsActive
   const routeViewerActive = activePanel === MainPanelContent.ROUTE_VIEWER
 
   return (
@@ -102,7 +96,7 @@ const mapStateToProps = (state: any) => {
 }
 
 const mapDispatchToProps = {
-  setMainPanelContent
+  setMainPanelContent: uiActions.setMainPanelContent
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(ViewSwitcher)

From d92148be25f3730758cbf5e6dda3b7f9665cd462 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:56:09 -0400
Subject: [PATCH 12/42] fix(actions/ui): Allow setting null main panel when in
 accounts page.

---
 lib/actions/ui.js                    | 10 +++++++---
 lib/components/app/view-switcher.tsx | 12 +-----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/actions/ui.js b/lib/actions/ui.js
index 4df30e074..43cf75b58 100644
--- a/lib/actions/ui.js
+++ b/lib/actions/ui.js
@@ -118,12 +118,16 @@ export function setViewedTrip(payload) {
 export function setMainPanelContent(payload) {
   return function (dispatch, getState) {
     const { otp, router } = getState()
-    if (otp.ui.mainPanelContent === payload) {
+    if (
+      otp.ui.mainPanelContent === payload &&
+      (payload || router.location.pathname === '/')
+    ) {
+      // Do nothing if the panel is already set (but do something if changing to main panel
+      // and the router path is not at the root (/#/?ui_activeSearch=...).
+      // This will guard against over-enthusiastic routing and overwriting current/nested states.
       console.warn(
         `Attempt to route from ${otp.ui.mainPanelContent} to ${payload}. Doing nothing`
       )
-      // Do nothing if the panel is already set. This will guard against over
-      // enthusiastic routing and overwriting current/nested states.
       return
     }
     dispatch(setPanel(payload))
diff --git a/lib/components/app/view-switcher.tsx b/lib/components/app/view-switcher.tsx
index 39902f920..801e5954e 100644
--- a/lib/components/app/view-switcher.tsx
+++ b/lib/components/app/view-switcher.tsx
@@ -78,20 +78,10 @@ const ViewSwitcher = ({
 // connect to the redux store
 
 const mapStateToProps = (state: any) => {
-  const { mainPanelContent } = state.otp.ui
-
-  // Reverse the ID to string mapping
-  const activePanelPair = Object.entries(MainPanelContent).find(
-    (keyValuePair) => keyValuePair[1] === mainPanelContent
-  )
-  // activePanel is array of form [string, ID]
-  // The trip planner has id null
-  const activePanel = (activePanelPair && activePanelPair[1]) || null
-
   return {
     // TODO: more reliable way of detecting these things, such as terms of storage page
     accountsActive: state.router.location.pathname.includes('/account'),
-    activePanel
+    activePanel: state.otp.ui.mainPanelContent
   }
 }
 

From c234ed0d1a8418c70e53b70bcdec4c11ddf45f2a Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 22 Aug 2023 10:44:54 -0400
Subject: [PATCH 13/42] fix: support disabling sort modes, setting a default

---
 example-config.yml                                | 13 +++++++++++++
 .../narrative/narrative-itineraries-header.tsx    |  4 +++-
 lib/components/narrative/narrative-itineraries.js |  7 ++++++-
 lib/components/util/sortOptions.ts                | 15 +++++++++++++--
 lib/reducers/create-otp-reducer.js                |  2 +-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/example-config.yml b/example-config.yml
index 7ac9b11ff..b725f59a4 100644
--- a/example-config.yml
+++ b/example-config.yml
@@ -350,6 +350,19 @@ itinerary:
   showLegDurations: false
   # Allows calorie counts to be hidden
   displayCalories: true
+  # The sort option to use by default
+  # Available sort options: 'BEST', 'DURATION', 'ARRIVALTIME', 'WALKTIME', 'COST', 'DEPARTURETIME'
+  # defaultSort: "BEST" # Default
+  # The sort options to display in the sort options list
+  # If unset, will display all.
+  # Available sort options: 'BEST', 'DURATION', 'ARRIVALTIME', 'WALKTIME', 'COST', 'DEPARTURETIME'
+  # sortModes: 
+  #   - 'BEST'
+  #   - 'DURATION'
+  #   - 'ARRIVALTIME'
+  #   - 'WALKTIME'
+  #   - 'COST'
+  #   - 'DEPARTURETIME'
 
 # The transitOperators key is a list of transit operators that can be used to
 # order transit agencies when sorting by route. Also, this can optionally
diff --git a/lib/components/narrative/narrative-itineraries-header.tsx b/lib/components/narrative/narrative-itineraries-header.tsx
index a55191005..d928a83c1 100644
--- a/lib/components/narrative/narrative-itineraries-header.tsx
+++ b/lib/components/narrative/narrative-itineraries-header.tsx
@@ -36,6 +36,7 @@ const ItinerariesHeaderContainer = styled.div<{ showHeaderText: boolean }>`
 
 export default function NarrativeItinerariesHeader({
   customBatchUiBackground,
+  enabledSortModes,
   errors,
   itineraries,
   itinerary,
@@ -52,6 +53,7 @@ export default function NarrativeItinerariesHeader({
   sort
 }: {
   customBatchUiBackground?: boolean
+  enabledSortModes: string[]
   errors: unknown[]
   itineraries: unknown[]
   itinerary: Itinerary
@@ -97,7 +99,7 @@ export default function NarrativeItinerariesHeader({
     ? searching
     : intl.formatList([itinerariesFound, numIssues], { type: 'conjunction' })
 
-  const sortOptionsArr = sortOptions(intl)
+  const sortOptionsArr = sortOptions(intl, enabledSortModes)
   const sortText = sortOptionsArr.find((x) => x.value === sort.type)?.text
 
   const handleSortClick = useCallback(
diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index 2f37581e1..30200a5cf 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -195,6 +195,7 @@ class NarrativeItineraries extends Component {
     activeStep: PropTypes.object,
     containerStyle: PropTypes.object,
     customBatchUiBackground: PropTypes.bool,
+    enabledSortModes: PropTypes.object,
     errorMessages: PropTypes.object,
     errors: PropTypes.array,
     itineraries: PropTypes.array,
@@ -391,6 +392,7 @@ class NarrativeItineraries extends Component {
       activeItinerary,
       activeSearch,
       customBatchUiBackground,
+      enabledSortModes,
       errorMessages,
       errors,
       errorsOtp2,
@@ -453,6 +455,7 @@ class NarrativeItineraries extends Component {
         />
         <NarrativeItinerariesHeader
           customBatchUiBackground={customBatchUiBackground}
+          enabledSortModes={enabledSortModes}
           errors={errors}
           itineraries={mergedItineraries}
           itinerary={itinerary}
@@ -577,7 +580,8 @@ const mapStateToProps = (state) => {
     groupByMode: groupItineraries,
     groupTransitModes,
     mergeItineraries,
-    showHeaderText
+    showHeaderText,
+    sortModes
   } = state.otp.config?.itinerary || false
   // Default to true for backwards compatibility
   const renderSkeletons = !state.otp.config.itinerary?.hideSkeletons
@@ -610,6 +614,7 @@ const mapStateToProps = (state) => {
     activeStep: activeSearch && activeSearch.activeStep,
     co2Config: co2,
     customBatchUiBackground,
+    enabledSortModes: sortModes,
     errorMessages,
     errors: getResponsesWithErrors(state),
     // TODO: Destroy otp1 errors and rename this
diff --git a/lib/components/util/sortOptions.ts b/lib/components/util/sortOptions.ts
index 6d721a548..bb24225e5 100644
--- a/lib/components/util/sortOptions.ts
+++ b/lib/components/util/sortOptions.ts
@@ -1,7 +1,15 @@
 import { IntlShape } from 'react-intl'
 
 export const sortOptions = (
-  intl: IntlShape
+  intl: IntlShape,
+  enabledOptions: (
+    | 'BEST'
+    | 'DURATION'
+    | 'ARRIVALTIME'
+    | 'DEPARTURETIME'
+    | 'WALKTIME'
+    | 'COST'
+  )[] = ['BEST', 'DURATION', 'ARRIVALTIME', 'WALKTIME', 'COST', 'DEPARTURETIME']
 ): {
   text: string
   value: string
@@ -45,5 +53,8 @@ export const sortOptions = (
     }
   ]
 
-  return sortOptionsArray
+  return sortOptionsArray.filter((sortOption) =>
+    // @ts-expect-error TODO: why is this failing
+    enabledOptions.includes(sortOption.value)
+  )
 }
diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index bc866f3ea..ae3f9b0c4 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -162,7 +162,7 @@ export function getInitialState(userDefinedConfig) {
       sort: {
         direction: 'ASC',
         // Only apply custom sort if batch routing is enabled.
-        type: 'BEST'
+        type: config?.itinerary?.defaultSort || 'BEST'
       }
     },
     initialUrl: window.location.href,

From 22b55a5255b1a9811fad1efa6aa1657351e9d2d6 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:08:56 -0500
Subject: [PATCH 14/42] Prevent crash on InitialModeSettings

---
 lib/reducers/create-otp-reducer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index bc866f3ea..3ce02399a 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -132,7 +132,7 @@ export function getInitialState(userDefinedConfig) {
   }
 
   let initialModeSettings = defaultModeSettings
-  if (!initialModeSettings.length) {
+  if (!initialModeSettings?.length) {
     initialModeSettings = []
   }
 

From 91959d184e19f10266a5966303362adc81fa060d Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Tue, 22 Aug 2023 13:25:03 -0500
Subject: [PATCH 15/42] chore: update otp-ui dependencies

---
 package.json |  6 +++---
 yarn.lock    | 56 +++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 83d45ab65..f3316ca65 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@bugsnag/plugin-react": "^7.17.0",
     "@floating-ui/react": "^0.19.2",
     "@opentripplanner/base-map": "^3.0.13",
-    "@opentripplanner/core-utils": "^9.0.3",
+    "@opentripplanner/core-utils": "^11.0.0",
     "@opentripplanner/endpoints-overlay": "^2.0.7",
     "@opentripplanner/from-to-location-picker": "^2.1.7",
     "@opentripplanner/geocoder": "^1.4.2",
@@ -58,7 +58,7 @@
     "@opentripplanner/transit-vehicle-overlay": "^4.0.4",
     "@opentripplanner/transitive-overlay": "^3.0.13",
     "@opentripplanner/trip-details": "^5.0.2",
-    "@opentripplanner/trip-form": "^3.1.1",
+    "@opentripplanner/trip-form": "^3.3.0",
     "@opentripplanner/trip-viewer-overlay": "^2.0.5",
     "@opentripplanner/vehicle-rental-overlay": "^2.1.1",
     "@styled-icons/fa-regular": "^10.34.0",
@@ -132,7 +132,7 @@
     "@craco/craco": "^6.3.0",
     "@jackwilsdon/craco-use-babelrc": "^1.0.0",
     "@opentripplanner/scripts": "^1.2.0",
-    "@opentripplanner/types": "^6.0.0",
+    "@opentripplanner/types": "^6.1.0",
     "@percy/cli": "^1.20.3",
     "@percy/puppeteer": "^2.0.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
diff --git a/yarn.lock b/yarn.lock
index 0835fc215..0c1e7f9ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2394,6 +2394,44 @@
     maplibre-gl "^2.1.9"
     react-map-gl "^7.0.15"
 
+"@opentripplanner/core-utils@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-10.0.0.tgz#ab5cba39097e2b15e634b1e70141076f3a5614d3"
+  integrity sha512-3T+P9GlBmeL8AHATUXbOouDtr3eYNv6VYMbVagFV9MBhYf3wSCJ3kAdBEWK+TQGfiWRfcxVJueuy8kvmVrkJtA==
+  dependencies:
+    "@conveyal/lonlat" "^1.4.1"
+    "@mapbox/polyline" "^1.1.0"
+    "@opentripplanner/geocoder" "^1.4.1"
+    "@styled-icons/foundation" "^10.34.0"
+    "@turf/along" "^6.0.1"
+    bowser "^2.7.0"
+    chroma-js "^2.4.2"
+    date-fns "^2.28.0"
+    date-fns-tz "^1.2.2"
+    graphql "^16.6.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+    qs "^6.9.1"
+
+"@opentripplanner/core-utils@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.0.0.tgz#dd40b7cd68d7d7bf4f56d87bf708d6bd4b7660ed"
+  integrity sha512-b+oPQWKpzXHeq9QdU0JmsplZX2QIRj4ARdIPJ++f5i/hpIxMnbKApwDHVkRdHz6kYCOQI7pcVNTunT7AGNvudg==
+  dependencies:
+    "@conveyal/lonlat" "^1.4.1"
+    "@mapbox/polyline" "^1.1.0"
+    "@opentripplanner/geocoder" "^1.4.1"
+    "@styled-icons/foundation" "^10.34.0"
+    "@turf/along" "^6.0.1"
+    bowser "^2.7.0"
+    chroma-js "^2.4.2"
+    date-fns "^2.28.0"
+    date-fns-tz "^1.2.2"
+    graphql "^16.6.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+    qs "^6.9.1"
+
 "@opentripplanner/core-utils@^8.1.1", "@opentripplanner/core-utils@^8.2.1":
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-8.3.2.tgz#5095dd3ae8493e478b3f599353c6804b35f1e1dd"
@@ -2694,13 +2732,13 @@
     flat "^5.0.2"
     react-animate-height "^3.0.4"
 
-"@opentripplanner/trip-form@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.1.1.tgz#67d01f1fcfd31ccc758907b4324e453f2984f8b2"
-  integrity sha512-A5OFHZyLW4CZDndrdjLy3ZHSQGWgaido/yN/jZXKcBHRDZK91Izd0xNAn4p4EvwpULPocg1mak/2dYwl07TWUQ==
+"@opentripplanner/trip-form@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.3.0.tgz#c4eca2db26e3d3d50dfeed9a305961b974fdf345"
+  integrity sha512-wt/+zP6broTNHQ2b0Wr9XrphFvm1UJdFasfSfSiBxVe3Ir7FLafwNtT8Fkb6zvD3IHJQglaAFNlem9OnR7jIvg==
   dependencies:
     "@floating-ui/react" "^0.19.2"
-    "@opentripplanner/core-utils" "^8.2.1"
+    "@opentripplanner/core-utils" "^10.0.0"
     "@styled-icons/bootstrap" "^10.34.0"
     "@styled-icons/boxicons-regular" "^10.38.0"
     "@styled-icons/fa-regular" "^10.37.0"
@@ -2719,10 +2757,10 @@
     "@opentripplanner/base-map" "^3.0.11"
     "@opentripplanner/core-utils" "^8.2.1"
 
-"@opentripplanner/types@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.0.0.tgz#3dabebd404c88030f4191f08c7692d72ca2e3c8d"
-  integrity sha512-mwwj2WzkdCoG2KUYaR/4I2JkcuXr1fFUJpP4nk10YbRgzyGtGLaGIdiTXNYpwgk/5//pMHQ5Qa6psWrHpqRm1A==
+"@opentripplanner/types@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.1.0.tgz#dd5b88cc0b73939cd1eb5bd44d4768e21bedaacc"
+  integrity sha512-fFuNMJLrSCIoIWJ7VugM1Jb7HfIcRDzb8o2LNsASExWAEYDuONFxyGYT/98g82/70Grl8kCSMSAFi0lEiQ/cPQ==
 
 "@opentripplanner/vehicle-rental-overlay@^2.1.1":
   version "2.1.1"

From a05c6bd2293c6ab453a0f84c2cf3a1c096d483ea Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 22 Aug 2023 13:15:54 -0700
Subject: [PATCH 16/42] fix typescript error from new otp2 types

---
 lib/components/narrative/metro/default-route-renderer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/narrative/metro/default-route-renderer.tsx b/lib/components/narrative/metro/default-route-renderer.tsx
index 7f2fdf3ee..aed908708 100644
--- a/lib/components/narrative/metro/default-route-renderer.tsx
+++ b/lib/components/narrative/metro/default-route-renderer.tsx
@@ -34,7 +34,7 @@ const DefaultRouteRenderer = ({
   leg,
   style
 }: RouteRendererProps): JSX.Element => {
-  const routeTitle = leg.routeShortName || leg.route || leg.routeLongName
+  const routeTitle = leg.routeShortName || leg.routeLongName
   return (
     <Block
       color={leg.routeColor || '333333'}

From 3f998c9e5ddb946f7c4f68a345316b09c3cac526 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 23 Aug 2023 10:22:44 -0700
Subject: [PATCH 17/42] fix types for miles

---
 .../narrative-itineraries-header.tsx          |  4 ++--
 lib/components/util/sortOptions.ts            | 24 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/components/narrative/narrative-itineraries-header.tsx b/lib/components/narrative/narrative-itineraries-header.tsx
index d928a83c1..5afc60308 100644
--- a/lib/components/narrative/narrative-itineraries-header.tsx
+++ b/lib/components/narrative/narrative-itineraries-header.tsx
@@ -9,7 +9,7 @@ import React, { useCallback } from 'react'
 import styled from 'styled-components'
 
 import { IconWithText, StyledIconWrapper } from '../util/styledIcon'
-import { sortOptions } from '../util/sortOptions'
+import { sortOptions, SortOptionsType } from '../util/sortOptions'
 import { SortResultsDropdown } from '../util/dropdown'
 import { UnstyledButton } from '../util/unstyled-button'
 import InvisibleA11yLabel from '../util/invisible-a11y-label'
@@ -53,7 +53,7 @@ export default function NarrativeItinerariesHeader({
   sort
 }: {
   customBatchUiBackground?: boolean
-  enabledSortModes: string[]
+  enabledSortModes: SortOptionsType[]
   errors: unknown[]
   itineraries: unknown[]
   itinerary: Itinerary
diff --git a/lib/components/util/sortOptions.ts b/lib/components/util/sortOptions.ts
index bb24225e5..da8e1d9a7 100644
--- a/lib/components/util/sortOptions.ts
+++ b/lib/components/util/sortOptions.ts
@@ -1,15 +1,23 @@
 import { IntlShape } from 'react-intl'
 
+export type SortOptionsType =
+  | 'BEST'
+  | 'DURATION'
+  | 'ARRIVALTIME'
+  | 'DEPARTURETIME'
+  | 'WALKTIME'
+  | 'COST'
+
 export const sortOptions = (
   intl: IntlShape,
-  enabledOptions: (
-    | 'BEST'
-    | 'DURATION'
-    | 'ARRIVALTIME'
-    | 'DEPARTURETIME'
-    | 'WALKTIME'
-    | 'COST'
-  )[] = ['BEST', 'DURATION', 'ARRIVALTIME', 'WALKTIME', 'COST', 'DEPARTURETIME']
+  enabledOptions: SortOptionsType[] = [
+    'BEST',
+    'DURATION',
+    'ARRIVALTIME',
+    'WALKTIME',
+    'COST',
+    'DEPARTURETIME'
+  ]
 ): {
   text: string
   value: string

From 841feb5977e50b636f723aac8db7441836b94c01 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:11:49 -0400
Subject: [PATCH 18/42] fix(narrative-itineraries): Find earliest itin of a
 group without pre-sorting itins

This preserves the itinerary sort feature.
---
 .../narrative/narrative-itineraries.js        | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index aa78d24a1..ee61416c9 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -44,16 +44,11 @@ import NarrativeItinerariesErrors from './narrative-itineraries-errors'
 import NarrativeItinerariesHeader from './narrative-itineraries-header'
 
 function doMergeItineraries(itineraries) {
-  // Order itineraries by start time.
-  // This is because alternate routes are only added to the first non-duplicate itinerary,
-  // and we show alternate routes for the first (i.e. earliest) non-duplicate itinerary found.
-  const sortedItineraries = sortStartTimes([...itineraries])
-  const mergedItineraries = sortedItineraries
-    .reduce((prev, cur) => {
+  const mergedItineraries = itineraries
+    .reduce((prev, cur, curIndex) => {
       const updatedItineraries = clone(prev)
       const updatedItinerary = clone(cur)
-      // Sorting itineraries above requires to find the index in the original array.
-      updatedItinerary.index = itineraries.indexOf(cur)
+      updatedItinerary.index = curIndex
 
       const duplicateIndex = updatedItineraries.findIndex((itin) =>
         itinerariesAreEqual(itin, cur)
@@ -65,10 +60,23 @@ function doMergeItineraries(itineraries) {
         // Only process itineraries less than 24 hours in the future
         differenceInDays(updatedItinerary.startTime, Date.now()) < 1
       ) {
-        const duplicateItin = updatedItineraries[duplicateIndex]
+        const duplicateFoundItin = updatedItineraries[duplicateIndex]
         // TODO: MERGE ROUTE NAMES
 
-        // Add only new start time to existing itinerary
+        // Add only new start time to existing itinerary.
+        // The existing itinerary is the earliest between
+        // this itinerary (updatedItinerary) and duplicateItin.
+        // This is because alternate routes are only added to the first non-duplicate itinerary,
+        // and we show alternate routes for the first (i.e. earliest) non-duplicate itinerary found.
+        let duplicateItin = duplicateFoundItin
+        let itinCopyToAdd = updatedItinerary
+        if (duplicateFoundItin.startTime > updatedItinerary.startTime) {
+          duplicateItin = updatedItinerary
+          duplicateItin.startTimes = duplicateFoundItin.allStartTimes
+          updatedItineraries[duplicateIndex] = updatedItinerary
+          itinCopyToAdd = duplicateFoundItin
+        }
+
         if (!duplicateItin.allStartTimes) {
           duplicateItin.allStartTimes = [
             {
@@ -82,13 +90,14 @@ function doMergeItineraries(itineraries) {
         // the uniqueness feature of Set, but unfortunately objects are never equal
         if (
           !duplicateItin.allStartTimes.find(
-            (time) => getFirstLegStartTime(time.legs) === cur.startTime
+            (time) =>
+              getFirstLegStartTime(time.legs) === itinCopyToAdd.startTime
           )
         ) {
           duplicateItin.allStartTimes.push({
-            itinerary: updatedItinerary,
-            legs: cur.legs,
-            realtime: firstTransitLegIsRealtime(cur)
+            itinerary: itinCopyToAdd,
+            legs: itinCopyToAdd.legs,
+            realtime: firstTransitLegIsRealtime(itinCopyToAdd)
           })
         }
 
@@ -96,7 +105,7 @@ function doMergeItineraries(itineraries) {
         // This map catches those and stores the alternate routes so they can be displayed
         duplicateItin.legs = duplicateItin.legs.map((leg, index) => {
           const newLeg = clone(leg)
-          const curLeg = cur.legs[index]
+          const curLeg = itinCopyToAdd.legs[index]
           const curLegRouteId = curLeg?.routeId
           if (curLegRouteId && leg?.routeId && leg?.routeId !== curLegRouteId) {
             if (!newLeg.alternateRoutes) {

From 2040a8fc7b08e49352fa973dd1669e5ac2564004 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:23:23 -0400
Subject: [PATCH 19/42] refactor(attribute-utils): Fix typo in flex function
 name.

---
 lib/components/narrative/metro/attribute-utils.tsx | 2 +-
 lib/components/narrative/metro/metro-itinerary.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/components/narrative/metro/attribute-utils.tsx b/lib/components/narrative/metro/attribute-utils.tsx
index 36a12b90b..c48afd0c8 100644
--- a/lib/components/narrative/metro/attribute-utils.tsx
+++ b/lib/components/narrative/metro/attribute-utils.tsx
@@ -9,7 +9,7 @@ export const getFirstTransitLegStop = (
   itinerary.legs?.find((leg: Leg) => leg?.from?.vertexType === 'TRANSIT')?.from
     ?.name
 
-export const getFlexAttirbutes = (
+export const getFlexAttributes = (
   itinerary: Itinerary
 ): {
   isCallAhead: boolean
diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx
index 274b8816c..26ffa98a6 100644
--- a/lib/components/narrative/metro/metro-itinerary.tsx
+++ b/lib/components/narrative/metro/metro-itinerary.tsx
@@ -28,7 +28,7 @@ import ItineraryBody from '../line-itin/connected-itinerary-body'
 import NarrativeItinerary from '../narrative-itinerary'
 import SimpleRealtimeAnnotation from '../simple-realtime-annotation'
 
-import { getFlexAttirbutes } from './attribute-utils'
+import { getFlexAttributes } from './attribute-utils'
 import DepartureTimesList, {
   SetActiveItineraryHandler
 } from './departure-times-list'
@@ -266,7 +266,7 @@ class MetroItinerary extends NarrativeItinerary {
     const { SvgIcon } = this.context
 
     const { isCallAhead, isContinuousDropoff, isFlexItinerary, phone } =
-      getFlexAttirbutes(itinerary)
+      getFlexAttributes(itinerary)
 
     const { fareCurrency, transitFare } = getFare(itinerary, defaultFareType)
 

From 370dadf3c9999a2ec9ce3a7d724837090bf9b3ad Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:30:38 -0400
Subject: [PATCH 20/42] refactor(narrative-itineraries): Extract makeStartTime
 method.

---
 .../narrative/narrative-itineraries.js        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index ee61416c9..d5a7b0f2f 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -43,6 +43,15 @@ import Loading from './loading'
 import NarrativeItinerariesErrors from './narrative-itineraries-errors'
 import NarrativeItinerariesHeader from './narrative-itineraries-header'
 
+/** Creates a start time object for the given itinerary. */
+function makeStartTime(itinerary) {
+  return {
+    itinerary,
+    legs: itinerary.legs,
+    realtime: firstTransitLegIsRealtime(itinerary)
+  }
+}
+
 function doMergeItineraries(itineraries) {
   const mergedItineraries = itineraries
     .reduce((prev, cur, curIndex) => {
@@ -78,13 +87,7 @@ function doMergeItineraries(itineraries) {
         }
 
         if (!duplicateItin.allStartTimes) {
-          duplicateItin.allStartTimes = [
-            {
-              itinerary: duplicateItin,
-              legs: duplicateItin.legs,
-              realtime: firstTransitLegIsRealtime(duplicateItin)
-            }
-          ]
+          duplicateItin.allStartTimes = [makeStartTime(duplicateItin)]
         }
         // Only add new time if it doesn't already exist. It would be better to use
         // the uniqueness feature of Set, but unfortunately objects are never equal
@@ -94,11 +97,7 @@ function doMergeItineraries(itineraries) {
               getFirstLegStartTime(time.legs) === itinCopyToAdd.startTime
           )
         ) {
-          duplicateItin.allStartTimes.push({
-            itinerary: itinCopyToAdd,
-            legs: itinCopyToAdd.legs,
-            realtime: firstTransitLegIsRealtime(itinCopyToAdd)
-          })
+          duplicateItin.allStartTimes.push(makeStartTime(itinCopyToAdd))
         }
 
         // Some legs will be the same, but have a different route

From c000a4747de1f0d833b65e415ab518ab0baf1975 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 24 Aug 2023 11:51:56 -0400
Subject: [PATCH 21/42] refactor: address pr feedback

---
 lib/components/util/sortOptions.ts | 5 +++--
 lib/reducers/create-otp-reducer.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/components/util/sortOptions.ts b/lib/components/util/sortOptions.ts
index da8e1d9a7..1a721c8f0 100644
--- a/lib/components/util/sortOptions.ts
+++ b/lib/components/util/sortOptions.ts
@@ -8,6 +8,8 @@ export type SortOptionsType =
   | 'WALKTIME'
   | 'COST'
 
+type SortOptionEntry = { text: string; value: SortOptionsType }
+
 export const sortOptions = (
   intl: IntlShape,
   enabledOptions: SortOptionsType[] = [
@@ -22,7 +24,7 @@ export const sortOptions = (
   text: string
   value: string
 }[] => {
-  const sortOptionsArray = [
+  const sortOptionsArray: SortOptionEntry[] = [
     {
       text: intl.formatMessage({
         id: 'components.NarrativeItinerariesHeader.selectBest'
@@ -62,7 +64,6 @@ export const sortOptions = (
   ]
 
   return sortOptionsArray.filter((sortOption) =>
-    // @ts-expect-error TODO: why is this failing
     enabledOptions.includes(sortOption.value)
   )
 }
diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index ae3f9b0c4..8ab5f6ebe 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -162,7 +162,7 @@ export function getInitialState(userDefinedConfig) {
       sort: {
         direction: 'ASC',
         // Only apply custom sort if batch routing is enabled.
-        type: config?.itinerary?.defaultSort || 'BEST'
+        type: config.itinerary?.defaultSort || 'BEST'
       }
     },
     initialUrl: window.location.href,

From e09bb39a0b3fd83b2d255daea947a3bacbcc0f07 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 23 Aug 2023 10:07:05 -0400
Subject: [PATCH 22/42] fix(ResponsiveWebApp): Fetch location on loading
 desktop view.

---
 lib/components/app/responsive-webapp.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/components/app/responsive-webapp.js b/lib/components/app/responsive-webapp.js
index 6b717508b..e135c16b1 100644
--- a/lib/components/app/responsive-webapp.js
+++ b/lib/components/app/responsive-webapp.js
@@ -153,10 +153,11 @@ class ResponsiveWebapp extends Component {
       }
     }
 
-    if (isMobile()) {
-      // If on mobile browser, check position on load
-      getCurrentPosition(intl)
+    // Test location availability on load,
+    // so it is reported correctly by the location fields.
+    getCurrentPosition(intl)
 
+    if (isMobile()) {
       // Also, watch for changes in position on mobile
       navigator.geolocation.watchPosition(
         // On success

From 87cc55f79aca73ea6a1a9d5e8cce3ffbfe9943fa Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 25 Aug 2023 16:12:04 -0400
Subject: [PATCH 23/42] refactor(route-details): Make light refactors to
 component.

---
 lib/components/viewers/route-details.js | 36 +++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/lib/components/viewers/route-details.js b/lib/components/viewers/route-details.js
index b3d7099f3..faf32780e 100644
--- a/lib/components/viewers/route-details.js
+++ b/lib/components/viewers/route-details.js
@@ -3,10 +3,9 @@
 import { connect } from 'react-redux'
 import { FormattedMessage, injectIntl } from 'react-intl'
 import { getMostReadableTextColor } from '@opentripplanner/core-utils/lib/route'
-
-import { LinkOpensNewWindow } from '../util/externalLink'
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
+import styled from 'styled-components'
 
 import {
   extractHeadsignFromPattern,
@@ -14,7 +13,10 @@ import {
 } from '../../util/viewer'
 import { findStopsForPattern } from '../../actions/api'
 import { getOperatorName } from '../../util/state'
+import { LinkOpensNewWindow } from '../util/externalLink'
 import { setHoveredStop, setViewedRoute, setViewedStop } from '../../actions/ui'
+import { SortResultsDropdown } from '../util/dropdown'
+import { UnstyledButton } from '../util/unstyled-button'
 
 import {
   Container,
@@ -26,10 +28,14 @@ import {
   StopContainer,
   StopLink
 } from './styled'
-import { SortResultsDropdown } from '../util/dropdown'
-import { UnstyledButton } from '../util/unstyled-button'
 
-import styled from 'styled-components'
+const PatternSelectButton = styled(UnstyledButton)`
+  span {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+`
 
 class RouteDetails extends Component {
   static propTypes = {
@@ -80,24 +86,14 @@ class RouteDetails extends Component {
 
     const routeColor = getRouteColorBasedOnSettings(operator, route)
 
-    const PatternSelectButton = styled(UnstyledButton)`
-      span {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    `
-
     const headsigns =
       patterns &&
       Object.entries(patterns)
-        .map((pattern) => {
-          return {
-            geometryLength: pattern[1].geometry?.length,
-            headsign: extractHeadsignFromPattern(pattern[1], shortName),
-            id: pattern[0]
-          }
-        })
+        .map(([id, pattern]) => ({
+          geometryLength: pattern.geometry?.length,
+          headsign: extractHeadsignFromPattern(pattern, shortName),
+          id
+        }))
         // Remove duplicate headsigns. Using a reducer means that the first pattern
         // with a specific headsign is the accepted one. TODO: is this good behavior?
         .reduce((prev, cur) => {

From 3623041d06558e7bef41a6bfdf735a99cdf4a5bd Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 25 Aug 2023 16:42:17 -0400
Subject: [PATCH 24/42] fix(route-details): Obtain diplayed pattern name from
 orginal pattern dictionary.

---
 lib/components/viewers/route-details.js | 101 +++++++++++-------------
 1 file changed, 44 insertions(+), 57 deletions(-)

diff --git a/lib/components/viewers/route-details.js b/lib/components/viewers/route-details.js
index faf32780e..7877f9681 100644
--- a/lib/components/viewers/route-details.js
+++ b/lib/components/viewers/route-details.js
@@ -80,62 +80,58 @@ class RouteDetails extends Component {
   }
 
   render() {
-    const { intl, operator, pattern, route, setHoveredStop, viewedRoute } =
-      this.props
-    const { agency, patterns, shortName, url } = route
+    const { intl, operator, pattern, route, setHoveredStop } = this.props
+    const { agency, patterns = {}, shortName, url } = route
 
     const routeColor = getRouteColorBasedOnSettings(operator, route)
 
-    const headsigns =
-      patterns &&
-      Object.entries(patterns)
-        .map(([id, pattern]) => ({
-          geometryLength: pattern.geometry?.length,
-          headsign: extractHeadsignFromPattern(pattern, shortName),
-          id
-        }))
-        // Remove duplicate headsigns. Using a reducer means that the first pattern
-        // with a specific headsign is the accepted one. TODO: is this good behavior?
-        .reduce((prev, cur) => {
-          const amended = prev
-          const alreadyExistingIndex = prev.findIndex(
-            (h) => h.headsign === cur.headsign
-          )
-          // If the item we're replacing has less geometry, replace it!
-          if (alreadyExistingIndex >= 0) {
-            // Only replace if new pattern has greater geometry
-            if (
-              amended[alreadyExistingIndex].geometryLength < cur.geometryLength
-            ) {
-              amended[alreadyExistingIndex] = cur
-            }
-          } else {
-            amended.push(cur)
+    const headsigns = Object.entries(patterns)
+      .map(([id, pat]) => ({
+        geometryLength: pat.geometry?.length,
+        headsign: extractHeadsignFromPattern(pat, shortName),
+        id
+      }))
+      // Remove duplicate headsigns. Using a reducer means that the first pattern
+      // with a specific headsign is the accepted one. TODO: is this good behavior?
+      .reduce((prev, cur) => {
+        const amended = prev
+        const alreadyExistingIndex = prev.findIndex(
+          (h) => h.headsign === cur.headsign
+        )
+        // If the item we're replacing has less geometry, replace it!
+        if (alreadyExistingIndex >= 0) {
+          // Only replace if new pattern has greater geometry
+          if (
+            amended[alreadyExistingIndex].geometryLength < cur.geometryLength
+          ) {
+            amended[alreadyExistingIndex] = cur
           }
-          return amended
-        }, [])
-        .sort((a, b) => {
-          // sort by number of vehicles on that pattern
-          const aVehicleCount = route.vehicles?.filter(
-            (vehicle) => vehicle.patternId === a.id
-          ).length
-          const bVehicleCount = route.vehicles?.filter(
-            (vehicle) => vehicle.patternId === b.id
-          ).length
-
-          // if both have the same count, sort by pattern geometry length
-          if (aVehicleCount === bVehicleCount) {
-            return b.geometryLength - a.geometryLength
-          }
-          return bVehicleCount - aVehicleCount
-        })
+        } else {
+          amended.push(cur)
+        }
+        return amended
+      }, [])
+      .sort((a, b) => {
+        // sort by number of vehicles on that pattern
+        const aVehicleCount = route.vehicles?.filter(
+          (vehicle) => vehicle.patternId === a.id
+        ).length
+        const bVehicleCount = route.vehicles?.filter(
+          (vehicle) => vehicle.patternId === b.id
+        ).length
+
+        // if both have the same count, sort by pattern geometry length
+        if (aVehicleCount === bVehicleCount) {
+          return b.geometryLength - a.geometryLength
+        }
+        return bVehicleCount - aVehicleCount
+      })
 
     const patternSelectLabel = intl.formatMessage({
       id: 'components.RouteDetails.selectADirection'
     })
     const patternSelectName =
-      headsigns?.find((h) => h.id === viewedRoute?.patternId)?.headsign ||
-      patternSelectLabel
+      (pattern && patterns[pattern.id]?.headsign) || patternSelectLabel
 
     // if no pattern is set, we are in the routeRow
     return (
@@ -246,12 +242,6 @@ class RouteDetails extends Component {
 }
 
 // connect to redux store
-const mapStateToProps = (state) => {
-  return {
-    viewedRoute: state.otp.ui.viewedRoute
-  }
-}
-
 const mapDispatchToProps = {
   findStopsForPattern,
   setHoveredStop,
@@ -259,7 +249,4 @@ const mapDispatchToProps = {
   setViewedStop
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(injectIntl(RouteDetails))
+export default connect(null, mapDispatchToProps)(injectIntl(RouteDetails))

From 612933a3b6f114ca6445ca81018cb7176f9aa721 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 25 Aug 2023 16:54:01 -0400
Subject: [PATCH 25/42] refactor(Rename props, remove dead code.):

---
 lib/components/viewers/pattern-viewer.tsx |  6 +----
 lib/components/viewers/route-details.js   | 33 +++++++----------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/lib/components/viewers/pattern-viewer.tsx b/lib/components/viewers/pattern-viewer.tsx
index 62102089e..1f6204633 100644
--- a/lib/components/viewers/pattern-viewer.tsx
+++ b/lib/components/viewers/pattern-viewer.tsx
@@ -131,11 +131,7 @@ const PatternViewer = ({
             </h1>
           </div>
         </div>
-        <RouteDetails
-          operator={operator}
-          pattern={route?.patterns?.[patternId]}
-          route={route}
-        />
+        <RouteDetails operator={operator} patternId={patternId} route={route} />
       </div>
     )
   }
diff --git a/lib/components/viewers/route-details.js b/lib/components/viewers/route-details.js
index 7877f9681..48ba77c02 100644
--- a/lib/components/viewers/route-details.js
+++ b/lib/components/viewers/route-details.js
@@ -7,14 +7,13 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import styled from 'styled-components'
 
+import * as uiActions from '../../actions/ui'
 import {
   extractHeadsignFromPattern,
   getRouteColorBasedOnSettings
 } from '../../util/viewer'
-import { findStopsForPattern } from '../../actions/api'
 import { getOperatorName } from '../../util/state'
 import { LinkOpensNewWindow } from '../util/externalLink'
-import { setHoveredStop, setViewedRoute, setViewedStop } from '../../actions/ui'
 import { SortResultsDropdown } from '../util/dropdown'
 import { UnstyledButton } from '../util/unstyled-button'
 
@@ -39,27 +38,14 @@ const PatternSelectButton = styled(UnstyledButton)`
 
 class RouteDetails extends Component {
   static propTypes = {
-    findStopsForPattern: findStopsForPattern.type,
     operator: PropTypes.shape({
       defaultRouteColor: PropTypes.string,
       defaultRouteTextColor: PropTypes.string,
       longNameSplitter: PropTypes.string
     }),
     // There are more items in pattern and route, but none mandatory
-    pattern: PropTypes.shape({ id: PropTypes.string }),
-    route: PropTypes.shape({ id: PropTypes.string }),
-    setHoveredStop: setHoveredStop.type,
-    setViewedRoute: setViewedRoute.type
-  }
-
-  /**
-   * Requests stop list for current pattern
-   */
-  getStops = () => {
-    const { findStopsForPattern, pattern, route } = this.props
-    if (pattern && route) {
-      findStopsForPattern({ patternId: pattern.id, routeId: route.id })
-    }
+    patternId: PropTypes.string,
+    route: PropTypes.shape({ id: PropTypes.string })
   }
 
   /**
@@ -80,8 +66,9 @@ class RouteDetails extends Component {
   }
 
   render() {
-    const { intl, operator, pattern, route, setHoveredStop } = this.props
+    const { intl, operator, patternId, route, setHoveredStop } = this.props
     const { agency, patterns = {}, shortName, url } = route
+    const pattern = patterns[patternId]
 
     const routeColor = getRouteColorBasedOnSettings(operator, route)
 
@@ -130,8 +117,7 @@ class RouteDetails extends Component {
     const patternSelectLabel = intl.formatMessage({
       id: 'components.RouteDetails.selectADirection'
     })
-    const patternSelectName =
-      (pattern && patterns[pattern.id]?.headsign) || patternSelectLabel
+    const patternSelectName = pattern?.headsign || patternSelectLabel
 
     // if no pattern is set, we are in the routeRow
     return (
@@ -243,10 +229,9 @@ class RouteDetails extends Component {
 
 // connect to redux store
 const mapDispatchToProps = {
-  findStopsForPattern,
-  setHoveredStop,
-  setViewedRoute,
-  setViewedStop
+  setHoveredStop: uiActions.setHoveredStop,
+  setViewedRoute: uiActions.setViewedRoute,
+  setViewedStop: uiActions.setViewedStop
 }
 
 export default connect(null, mapDispatchToProps)(injectIntl(RouteDetails))

From b64304ac57a73cef88bc32909d95ea3ba15de810 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:09:52 -0400
Subject: [PATCH 26/42] refactor(route-details): Convert to TypeScript, add
 missing types.

---
 lib/components/util/types.ts                  | 30 ++++----
 .../{route-details.js => route-details.tsx}   | 72 +++++++++++--------
 .../viewers/{styled.js => styled.ts}          | 16 +++--
 3 files changed, 69 insertions(+), 49 deletions(-)
 rename lib/components/viewers/{route-details.js => route-details.tsx} (83%)
 rename lib/components/viewers/{styled.js => styled.ts} (89%)

diff --git a/lib/components/util/types.ts b/lib/components/util/types.ts
index d75469556..febaa585d 100644
--- a/lib/components/util/types.ts
+++ b/lib/components/util/types.ts
@@ -1,3 +1,5 @@
+import { Route } from '@opentripplanner/types'
+
 // TYPESCRIPT TODO: move this to a larger shared types file, preferably within otp-ui
 export interface StopData {
   bikeRental: BikeRental
@@ -22,15 +24,6 @@ export interface BikeRental {
   stations: any[]
 }
 
-export interface Route {
-  agencyId: string
-  agencyName: string
-  id: string
-  longName: string
-  mode: string
-  sortOrder: number
-}
-
 // FIXME: incomplete
 export interface StopTime {
   departureDelay: number
@@ -45,6 +38,11 @@ export interface Pattern {
   desc: string
   headsign: string
   id: string
+  patternGeometry?: {
+    length: number
+    points: string
+  }
+  stops?: StopData[]
 }
 
 export interface Time {
@@ -80,14 +78,18 @@ export interface ViewedRouteState {
   routeId: string
 }
 
+export interface RouteVehicle {
+  patternId: string
+}
+
 // Routes have many properties beside id, but none of these are guaranteed.
-export interface ViewedRouteObject {
-  id: string
-  longName?: string
+export interface ViewedRouteObject extends Route {
   patterns?: Record<string, Pattern>
   pending?: boolean
-  shortName?: string
-  textColor?: string
+  url?: string
+  vehicles?: RouteVehicle[]
 }
 
 export type SetViewedRouteHandler = (route?: ViewedRouteState) => void
+
+export type SetViewedStopHandler = (payload: { stopId: string }) => void
diff --git a/lib/components/viewers/route-details.js b/lib/components/viewers/route-details.tsx
similarity index 83%
rename from lib/components/viewers/route-details.js
rename to lib/components/viewers/route-details.tsx
index 48ba77c02..2dbc4e3fe 100644
--- a/lib/components/viewers/route-details.js
+++ b/lib/components/viewers/route-details.tsx
@@ -1,9 +1,7 @@
-// FIXME: typescript
-/* eslint-disable react/prop-types */
 import { connect } from 'react-redux'
-import { FormattedMessage, injectIntl } from 'react-intl'
+import { FormattedMessage, injectIntl, IntlShape } from 'react-intl'
 import { getMostReadableTextColor } from '@opentripplanner/core-utils/lib/route'
-import PropTypes from 'prop-types'
+import { TransitOperator } from '@opentripplanner/types'
 import React, { Component } from 'react'
 import styled from 'styled-components'
 
@@ -14,6 +12,11 @@ import {
 } from '../../util/viewer'
 import { getOperatorName } from '../../util/state'
 import { LinkOpensNewWindow } from '../util/externalLink'
+import {
+  SetViewedRouteHandler,
+  SetViewedStopHandler,
+  ViewedRouteObject
+} from '../util/types'
 import { SortResultsDropdown } from '../util/dropdown'
 import { UnstyledButton } from '../util/unstyled-button'
 
@@ -36,23 +39,28 @@ const PatternSelectButton = styled(UnstyledButton)`
   }
 `
 
-class RouteDetails extends Component {
-  static propTypes = {
-    operator: PropTypes.shape({
-      defaultRouteColor: PropTypes.string,
-      defaultRouteTextColor: PropTypes.string,
-      longNameSplitter: PropTypes.string
-    }),
-    // There are more items in pattern and route, but none mandatory
-    patternId: PropTypes.string,
-    route: PropTypes.shape({ id: PropTypes.string })
-  }
+interface PatternSummary {
+  geometryLength: number
+  headsign: string
+  id: string
+}
+
+interface Props {
+  intl: IntlShape
+  operator: TransitOperator
+  patternId: string
+  route: ViewedRouteObject
+  setHoveredStop: (id: string | null) => void
+  setViewedRoute: SetViewedRouteHandler
+  setViewedStop: SetViewedStopHandler
+}
 
+class RouteDetails extends Component<Props> {
   /**
    * If a headsign link is clicked, set that pattern in redux state so that the
    * view can adjust
    */
-  _headSignButtonClicked = (id) => {
+  _headSignButtonClicked = (id: string) => {
     const { route, setViewedRoute } = this.props
     setViewedRoute({ patternId: id, routeId: route.id })
   }
@@ -60,7 +68,7 @@ class RouteDetails extends Component {
   /**
    * If a stop link is clicked, redirect to stop viewer
    */
-  _stopLinkClicked = (stopId) => {
+  _stopLinkClicked = (stopId: string) => {
     const { setViewedStop } = this.props
     setViewedStop({ stopId })
   }
@@ -73,14 +81,16 @@ class RouteDetails extends Component {
     const routeColor = getRouteColorBasedOnSettings(operator, route)
 
     const headsigns = Object.entries(patterns)
-      .map(([id, pat]) => ({
-        geometryLength: pat.geometry?.length,
-        headsign: extractHeadsignFromPattern(pat, shortName),
-        id
-      }))
+      .map(
+        ([id, pat]): PatternSummary => ({
+          geometryLength: pat.patternGeometry?.length || 0,
+          headsign: extractHeadsignFromPattern(pat, shortName),
+          id
+        })
+      )
       // Remove duplicate headsigns. Using a reducer means that the first pattern
       // with a specific headsign is the accepted one. TODO: is this good behavior?
-      .reduce((prev, cur) => {
+      .reduce((prev: PatternSummary[], cur) => {
         const amended = prev
         const alreadyExistingIndex = prev.findIndex(
           (h) => h.headsign === cur.headsign
@@ -100,12 +110,12 @@ class RouteDetails extends Component {
       }, [])
       .sort((a, b) => {
         // sort by number of vehicles on that pattern
-        const aVehicleCount = route.vehicles?.filter(
-          (vehicle) => vehicle.patternId === a.id
-        ).length
-        const bVehicleCount = route.vehicles?.filter(
-          (vehicle) => vehicle.patternId === b.id
-        ).length
+        const aVehicleCount =
+          route.vehicles?.filter((vehicle) => vehicle.patternId === a.id)
+            .length || 0
+        const bVehicleCount =
+          route.vehicles?.filter((vehicle) => vehicle.patternId === b.id)
+            .length || 0
 
         // if both have the same count, sort by pattern geometry length
         if (aVehicleCount === bVehicleCount) {
@@ -164,7 +174,7 @@ class RouteDetails extends Component {
               pullRight
               style={{ color: 'black' }}
             >
-              {headsigns.map((h) => (
+              {headsigns.map((h: PatternSummary) => (
                 <li key={h.id}>
                   <PatternSelectButton
                     onClick={() => this._headSignButtonClicked(h.id)}
@@ -182,7 +192,7 @@ class RouteDetails extends Component {
             <h2
               style={{
                 fontSize: 'inherit',
-                fontWeight: '400',
+                fontWeight: 400,
                 margin: '0 0 10px 8px'
               }}
             >
diff --git a/lib/components/viewers/styled.js b/lib/components/viewers/styled.ts
similarity index 89%
rename from lib/components/viewers/styled.js
rename to lib/components/viewers/styled.ts
index e1a4bd984..16bfbe173 100644
--- a/lib/components/viewers/styled.js
+++ b/lib/components/viewers/styled.ts
@@ -1,7 +1,14 @@
 import styled from 'styled-components'
 
+interface RenderProps {
+  backgroundColor?: string
+  full?: boolean
+  routeColor?: string
+  textColor?: string
+}
+
 /** Route Details */
-export const Container = styled.div`
+export const Container = styled.div<RenderProps>`
   background-color: ${(props) =>
     props.full ? props.backgroundColor || '#ddd' : 'inherit'};
   color: ${(props) => (props.full ? props.textColor : 'inherit')};
@@ -60,7 +67,7 @@ export const PatternContainer = styled.div`
 }
 `
 
-export const StopContainer = styled.ol`
+export const StopContainer = styled.ol<RenderProps>`
   color: ${(props) => props?.textColor || '#333'};
   background-color: ${(props) => props?.backgroundColor || '#fff'};
   overflow-y: scroll;
@@ -69,7 +76,7 @@ export const StopContainer = styled.ol`
   are shown when browsers don't calculate 100% sensibly */
   padding: 15px 0 100px;
 `
-export const StopLink = styled.button`
+export const StopLink = styled.button<RenderProps>`
   color: ${(props) => props?.textColor + 'da' || '#333'};
   background-color: transparent;
   border: none;
@@ -82,7 +89,8 @@ export const StopLink = styled.button`
     text-decoration: underline;
   }
 `
-export const Stop = styled.li`
+
+export const Stop = styled.li<RenderProps>`
   cursor: pointer;
   display: block;
   white-space: nowrap;

From dba0955402098006461e32b18082a386c9fa498a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 28 Aug 2023 10:16:22 -0400
Subject: [PATCH 27/42] refactor(route-details): Use logic to determine
 headsign with pattern.

---
 lib/components/viewers/route-details.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/components/viewers/route-details.tsx b/lib/components/viewers/route-details.tsx
index 2dbc4e3fe..f5ee0d53c 100644
--- a/lib/components/viewers/route-details.tsx
+++ b/lib/components/viewers/route-details.tsx
@@ -127,7 +127,9 @@ class RouteDetails extends Component<Props> {
     const patternSelectLabel = intl.formatMessage({
       id: 'components.RouteDetails.selectADirection'
     })
-    const patternSelectName = pattern?.headsign || patternSelectLabel
+
+    const patternSelectName =
+      extractHeadsignFromPattern(pattern, shortName) || patternSelectLabel
 
     // if no pattern is set, we are in the routeRow
     return (

From af56ed50d15a03d667a13000b2fd77e073cdcb2f Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 28 Aug 2023 10:30:44 -0400
Subject: [PATCH 28/42] fix(route-details): Use index as key in stop list.

---
 lib/components/viewers/route-details.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/components/viewers/route-details.tsx b/lib/components/viewers/route-details.tsx
index f5ee0d53c..4c0524b63 100644
--- a/lib/components/viewers/route-details.tsx
+++ b/lib/components/viewers/route-details.tsx
@@ -129,7 +129,8 @@ class RouteDetails extends Component<Props> {
     })
 
     const patternSelectName =
-      extractHeadsignFromPattern(pattern, shortName) || patternSelectLabel
+      (pattern ? extractHeadsignFromPattern(pattern, shortName) : null) ||
+      patternSelectLabel
 
     // if no pattern is set, we are in the routeRow
     return (
@@ -205,9 +206,10 @@ class RouteDetails extends Component<Props> {
               onMouseLeave={() => setHoveredStop(null)}
               textColor={getMostReadableTextColor(routeColor, route?.textColor)}
             >
-              {pattern?.stops?.map((stop) => (
+              {pattern?.stops?.map((stop, index) => (
                 <Stop
-                  key={stop.id}
+                  // Use array index instead of stop id because a stop can be visited several times.
+                  key={index}
                   onClick={() => this._stopLinkClicked(stop.id)}
                   onFocus={() => setHoveredStop(stop.id)}
                   onMouseOver={() => setHoveredStop(stop.id)}

From 85527a4296723f9b0de3bf3d80a23ba5b51cd718 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 28 Aug 2023 11:29:12 -0400
Subject: [PATCH 29/42] refactor(route-details): Tweak a11y and headsign
 lookup.

---
 lib/components/viewers/route-details.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/components/viewers/route-details.tsx b/lib/components/viewers/route-details.tsx
index 4c0524b63..579e376cc 100644
--- a/lib/components/viewers/route-details.tsx
+++ b/lib/components/viewers/route-details.tsx
@@ -129,10 +129,9 @@ class RouteDetails extends Component<Props> {
     })
 
     const patternSelectName =
-      (pattern ? extractHeadsignFromPattern(pattern, shortName) : null) ||
+      headsigns.find((h) => h.id === pattern?.id)?.headsign ||
       patternSelectLabel
 
-    // if no pattern is set, we are in the routeRow
     return (
       <Container
         backgroundColor={routeColor}
@@ -211,7 +210,6 @@ class RouteDetails extends Component<Props> {
                   // Use array index instead of stop id because a stop can be visited several times.
                   key={index}
                   onClick={() => this._stopLinkClicked(stop.id)}
-                  onFocus={() => setHoveredStop(stop.id)}
                   onMouseOver={() => setHoveredStop(stop.id)}
                   routeColor={
                     routeColor.includes('ffffff') ? '#333' : routeColor
@@ -224,6 +222,7 @@ class RouteDetails extends Component<Props> {
                   <StopLink
                     name={stop.name}
                     onClick={() => this._stopLinkClicked(stop.id)}
+                    onFocus={() => setHoveredStop(stop.id)}
                     textColor={getMostReadableTextColor(
                       routeColor,
                       route?.textColor

From 92a5f7e608771636eafaf2b35b3aa7311c2847f7 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 28 Aug 2023 13:48:14 -0400
Subject: [PATCH 30/42] test(percy): Apply new route button id scheme in percy
 test.

---
 percy/percy.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/percy/percy.test.js b/percy/percy.test.js
index b2e5d818f..b09cf9e5e 100644
--- a/percy/percy.test.js
+++ b/percy/percy.test.js
@@ -290,7 +290,7 @@ async function executeTest(page, isMobile, isCallTaker) {
   // click the little pattern arrow
   // Triggers mock.har graphql query #13 and #14 (vehicle positions, twice again).
   // FIXME: Investigate why twice.
-  await page.click('#open-route-button-1')
+  await page.click('#open-route-button-1-MARTA')
 
   // View the other pattern on the selected route.
   await page.click('#headsign-selector-label')

From ef1f8cce4275303db1648ec616c3614c4d7a2ae4 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 28 Aug 2023 14:04:30 -0400
Subject: [PATCH 31/42] test: update snapshots

---
 __tests__/reducers/__snapshots__/create-otp-reducer.js.snap  | 1 -
 __tests__/reducers/__snapshots__/create-user-reducer.js.snap | 1 -
 2 files changed, 2 deletions(-)

diff --git a/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap b/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap
index 388e97543..b15adfb3b 100644
--- a/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap
+++ b/__tests__/reducers/__snapshots__/create-otp-reducer.js.snap
@@ -48,7 +48,6 @@ Object {
     "startTime": "07:00",
     "time": "19:34",
     "to": null,
-    "walkSpeed": 1.34,
     "watts": 250,
     "wheelchair": false,
   },
diff --git a/__tests__/reducers/__snapshots__/create-user-reducer.js.snap b/__tests__/reducers/__snapshots__/create-user-reducer.js.snap
index 08c962832..76e633fe3 100644
--- a/__tests__/reducers/__snapshots__/create-user-reducer.js.snap
+++ b/__tests__/reducers/__snapshots__/create-user-reducer.js.snap
@@ -28,7 +28,6 @@ Object {
       "routingType": "ITINERARY",
       "showIntermediateStops": true,
       "startTime": "07:00",
-      "walkSpeed": 1.34,
       "watts": 250,
       "wheelchair": false,
     },

From 3c86ff6ed5c51cd7a7820bf3eb6fe91be2ce8dc3 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 28 Aug 2023 14:12:13 -0400
Subject: [PATCH 32/42] chore: update otp-ui

---
 package.json |  30 +++---
 yarn.lock    | 279 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 170 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index f3316ca65..770861132 100644
--- a/package.json
+++ b/package.json
@@ -38,29 +38,29 @@
     "@bugsnag/js": "^7.17.0",
     "@bugsnag/plugin-react": "^7.17.0",
     "@floating-ui/react": "^0.19.2",
-    "@opentripplanner/base-map": "^3.0.13",
+    "@opentripplanner/base-map": "^3.0.14",
     "@opentripplanner/core-utils": "^11.0.0",
-    "@opentripplanner/endpoints-overlay": "^2.0.7",
-    "@opentripplanner/from-to-location-picker": "^2.1.7",
+    "@opentripplanner/endpoints-overlay": "^2.0.8",
+    "@opentripplanner/from-to-location-picker": "^2.1.8",
     "@opentripplanner/geocoder": "^1.4.2",
     "@opentripplanner/humanize-distance": "^1.2.0",
-    "@opentripplanner/icons": "^2.0.3",
-    "@opentripplanner/itinerary-body": "^5.0.3",
+    "@opentripplanner/icons": "^2.0.5",
+    "@opentripplanner/itinerary-body": "^5.0.5",
     "@opentripplanner/location-field": "^2.0.7",
     "@opentripplanner/location-icon": "^1.4.1",
-    "@opentripplanner/map-popup": "^2.0.4",
+    "@opentripplanner/map-popup": "^2.0.5",
     "@opentripplanner/otp2-tile-overlay": "^1.0.5",
-    "@opentripplanner/park-and-ride-overlay": "^2.0.5",
     "@opentripplanner/printable-itinerary": "2.0.10-alpha.4",
-    "@opentripplanner/route-viewer-overlay": "^2.0.12",
-    "@opentripplanner/stop-viewer-overlay": "^2.0.5",
-    "@opentripplanner/stops-overlay": "^5.1.0",
-    "@opentripplanner/transit-vehicle-overlay": "^4.0.4",
-    "@opentripplanner/transitive-overlay": "^3.0.13",
+    "@opentripplanner/park-and-ride-overlay": "^2.0.6",
+    "@opentripplanner/route-viewer-overlay": "^2.0.13",
+    "@opentripplanner/stop-viewer-overlay": "^2.0.6",
+    "@opentripplanner/stops-overlay": "^5.1.1",
+    "@opentripplanner/transit-vehicle-overlay": "^4.0.5",
+    "@opentripplanner/transitive-overlay": "^3.0.14",
     "@opentripplanner/trip-details": "^5.0.2",
-    "@opentripplanner/trip-form": "^3.3.0",
-    "@opentripplanner/trip-viewer-overlay": "^2.0.5",
-    "@opentripplanner/vehicle-rental-overlay": "^2.1.1",
+    "@opentripplanner/trip-form": "^3.3.1",
+    "@opentripplanner/trip-viewer-overlay": "^2.0.6",
+    "@opentripplanner/vehicle-rental-overlay": "^2.1.2",
     "@styled-icons/fa-regular": "^10.34.0",
     "@styled-icons/fa-solid": "^10.34.0",
     "blob-stream": "^0.1.3",
diff --git a/yarn.lock b/yarn.lock
index 0c1e7f9ef..2d9cec407 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -44,11 +44,12 @@
     "@babel/highlight" "^7.10.4"
 
 "@babel/code-frame@^7.0.0":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
-  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
   dependencies:
-    "@babel/highlight" "^7.22.5"
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
 
 "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.5.5":
   version "7.18.6"
@@ -353,7 +354,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.18.6", "@babel/highlight@^7.22.5":
+"@babel/highlight@^7.18.6":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
   integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
@@ -362,6 +363,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16"
+  integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.5"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.12.3", "@babel/parser@^7.15.0", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.19.6", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
   version "7.20.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2"
@@ -1122,14 +1132,21 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.21.0":
+"@babel/runtime@^7.10.5", "@babel/runtime@^7.14.0":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
   integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.19.0", "@babel/runtime@^7.20.7":
+"@babel/runtime@^7.19.0", "@babel/runtime@^7.21.0":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.11.tgz#7a9ba3bbe406ad6f9e8dd4da2ece453eb23a77a4"
+  integrity sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
+"@babel/runtime@^7.20.7":
   version "7.22.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.3.tgz#0a7fce51d43adbf0f7b517a71f4c3aaca92ebcbb"
   integrity sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ==
@@ -2385,7 +2402,7 @@
   dependencies:
     "@octokit/openapi-types" "^10.0.0"
 
-"@opentripplanner/base-map@^3.0.10", "@opentripplanner/base-map@^3.0.11", "@opentripplanner/base-map@^3.0.13":
+"@opentripplanner/base-map@^3.0.11", "@opentripplanner/base-map@^3.0.13":
   version "3.0.13"
   resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.0.13.tgz#8a6550f60414e268a53d3613c3839711976d3882"
   integrity sha512-bzMa1ZrzqJ0Z+ZDf+M7XonvJeqpN4elcf1egZ/fPI6rDDHkIwGvPDBn5uqtIClYDYDmSuaS3nRmq6al+ZQ7Pwg==
@@ -2394,6 +2411,15 @@
     maplibre-gl "^2.1.9"
     react-map-gl "^7.0.15"
 
+"@opentripplanner/base-map@^3.0.14":
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.0.14.tgz#538fc45fa5663695bab05452021125366b98e06a"
+  integrity sha512-vtTWlgZBta8nB9Imb2Bjpc5z6g8HamN7iXyGcNRRpOK01XRQsn5WA04VbeOhRpqRcN40vUvL0K1b3EBJFnTZqg==
+  dependencies:
+    mapbox-gl "npm:empty-npm-package@1.0.0"
+    maplibre-gl "^2.1.9"
+    react-map-gl "^7.0.15"
+
 "@opentripplanner/core-utils@^10.0.0":
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-10.0.0.tgz#ab5cba39097e2b15e634b1e70141076f3a5614d3"
@@ -2432,7 +2458,7 @@
     lodash.isequal "^4.5.0"
     qs "^6.9.1"
 
-"@opentripplanner/core-utils@^8.1.1", "@opentripplanner/core-utils@^8.2.1":
+"@opentripplanner/core-utils@^8.2.1":
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-8.3.2.tgz#5095dd3ae8493e478b3f599353c6804b35f1e1dd"
   integrity sha512-Rij/vfnvB9+uoxfNoq/gPRr+T9YWiqrxnYHzzEbh+R4Jro7D8iwRbD08cHJF9RRMTv/s4Y2IQrzAnmZVXiLw6w==
@@ -2470,18 +2496,18 @@
     lodash.isequal "^4.5.0"
     qs "^6.9.1"
 
-"@opentripplanner/endpoints-overlay@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.0.7.tgz#7f31c69728ec8148a94100e5d645a538151bd4b2"
-  integrity sha512-5uYF4hRm8I3j9V4RPL1TwG8dZIJh6eD4sRJnjRGhWrAbkndgh8RwkpT8gWbqOY/Y4pjRGAq4Uq0B3w6n2rWSHw==
+"@opentripplanner/endpoints-overlay@^2.0.8":
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.0.8.tgz#18c8532a24d3d97cfc9e1208f7b5e0c1f8ae1341"
+  integrity sha512-ziIwLJxtFWEX1z/RiN60HqqLSt/GUovbWbWGkNdbHOZFT+jm7wrNbDSNWHfDJjwPMQaKO8SanVpIhmEcVgTOKQ==
   dependencies:
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/core-utils" "^8.2.1"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/core-utils" "^9.0.0"
     "@opentripplanner/location-icon" "^1.4.1"
     "@styled-icons/fa-solid" "^10.34.0"
     flat "^5.0.2"
 
-"@opentripplanner/from-to-location-picker@^2.1.5", "@opentripplanner/from-to-location-picker@^2.1.6":
+"@opentripplanner/from-to-location-picker@^2.1.6":
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/@opentripplanner/from-to-location-picker/-/from-to-location-picker-2.1.6.tgz#ce918d3d06be7e44276892786ac572bdd6b8dba1"
   integrity sha512-yv+ngCAlClV00FGY0K+tcCnFVp9M1VzMqqT5w3Ybc+ZxfuSFRLzTth+ZWRsz5Vo0Z9cswKHP5tPEuLE2jEBhow==
@@ -2497,6 +2523,14 @@
     "@opentripplanner/location-icon" "^1.4.1"
     flat "^5.0.2"
 
+"@opentripplanner/from-to-location-picker@^2.1.8":
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/from-to-location-picker/-/from-to-location-picker-2.1.8.tgz#4e4aaed7c1836f379ddfa77ee2802cb23fb3e428"
+  integrity sha512-qrf6w+8Q+Zord8epZeNKKEBhASOO8iemRagTtM/twNeukqaProCgi8yBaallQ18FHjm3pEjXnOARgKKAL4skWA==
+  dependencies:
+    "@opentripplanner/location-icon" "^1.4.1"
+    flat "^5.0.2"
+
 "@opentripplanner/geocoder@^1.4.0", "@opentripplanner/geocoder@^1.4.1", "@opentripplanner/geocoder@^1.4.2":
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/@opentripplanner/geocoder/-/geocoder-1.4.2.tgz#0f827dffca42c7f7a23063b54990a291dd028b80"
@@ -2512,7 +2546,15 @@
   resolved "https://registry.yarnpkg.com/@opentripplanner/humanize-distance/-/humanize-distance-1.2.0.tgz#71cf5d5d1b756adef15300edbba0995ccd4b35ee"
   integrity sha512-x0QRXMDhypFeazZ6r6vzrdU8vhiV56nZ/WX6zUbxpgp6T9Oclw0gwR2Zdw6DZiiFpSYVNeVNxVzZwsu6NRGjcA==
 
-"@opentripplanner/icons@^2.0.1", "@opentripplanner/icons@^2.0.3":
+"@opentripplanner/icons@^2.0.1", "@opentripplanner/icons@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/icons/-/icons-2.0.5.tgz#7274597e1d568b1d18861c36d9d4f77f4a6f82f3"
+  integrity sha512-0QIXsoGHK8c5Y2rFwKKfsDFTIL6NXuvTUtKDNH6qybkMDPc+IovswCdFjKLDvgR+7pmE5iEmhTvNBHvw/MZjig==
+  dependencies:
+    "@opentripplanner/core-utils" "^9.0.2"
+    prop-types "^15.7.2"
+
+"@opentripplanner/icons@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@opentripplanner/icons/-/icons-2.0.3.tgz#c7c587f5b3b8ea050f50af3537e2e409d7258829"
   integrity sha512-IHoFtTozacXMXBOc87kTcd1V9hXAP4UQEq6RCzhTTCwOEFQ2/aWHSJ+aIyr+3XFIKYyfQ0b8JAdJnEoa1yJzew==
@@ -2528,28 +2570,10 @@
     "@opentripplanner/core-utils" "^9.0.0"
     prop-types "^15.7.2"
 
-"@opentripplanner/itinerary-body@^4.1.17":
-  version "4.1.23"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-4.1.23.tgz#d2390af6fe171d6aa236e73a495d541098a39cde"
-  integrity sha512-uAgYgkQAfS6ZCW2tlzftX2z39U//B55pkC5/FJBx9ZrYFU69pW32H2yY030E7KK/tURkdq9K21Rofdbplw96BQ==
-  dependencies:
-    "@opentripplanner/core-utils" "^8.2.1"
-    "@opentripplanner/humanize-distance" "^1.2.0"
-    "@opentripplanner/icons" "^2.0.1"
-    "@opentripplanner/location-icon" "^1.4.1"
-    "@styled-icons/fa-solid" "^10.34.0"
-    "@styled-icons/foundation" "^10.34.0"
-    date-fns "^2.28.0"
-    date-fns-tz "^1.2.2"
-    flat "^5.0.2"
-    react-animate-height "^3.0.4"
-    react-resize-detector "^4.2.1"
-    string-similarity "^4.0.4"
-
 "@opentripplanner/itinerary-body@^4.2.0-alpha.3":
-  version "4.2.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-4.2.0-alpha.3.tgz#af03aba0ea48086090fe2a0d8f31b4932f0a10e5"
-  integrity sha512-dsZiO14SYkBxnVx7zwhjdzQwv+6r1CV/6K1qQGYfAPVLNpaABdbW42iO1voFrgqN+aWga1D+zOHRCdtq2BnGfQ==
+  version "4.2.0-alpha.4"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-4.2.0-alpha.4.tgz#407dcab1e74bab536c4818d11d39cdc2ca7f1e21"
+  integrity sha512-zJX/Safz7ZKtW10T9aF5VIYDAhXR8pkD6EfdlHS42j+eiwlL2ISsjEHWZ8NxaqGPHpqFW2C3A8rOXcduFTLrTw==
   dependencies:
     "@opentripplanner/core-utils" "^8.2.1"
     "@opentripplanner/humanize-distance" "^1.2.0"
@@ -2564,10 +2588,10 @@
     react-resize-detector "^4.2.1"
     string-similarity "^4.0.4"
 
-"@opentripplanner/itinerary-body@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.0.3.tgz#b7eed8a38a0d1e6a3d0b80ff2697386feb45df71"
-  integrity sha512-5uANv+z5FdUSDN1uo+xsON+Z8TR3uXjYh11zP/glv7d9hOZ7I7U2eHOSf6iHsUDiPnVS5hpe3WikxPaSkNdXvg==
+"@opentripplanner/itinerary-body@^5.0.0", "@opentripplanner/itinerary-body@^5.0.5":
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.0.5.tgz#3038a910291e42d1a7ed3a03abcd8ecd32cd958e"
+  integrity sha512-58xn0cadRt7Vth8arjExZOt85KVESkqt9MKh2yqnMeXeSFMvP14/+jobgBRY+xsAh+EcLWPVBKq3ylas8npmEw==
   dependencies:
     "@opentripplanner/core-utils" "^9.0.2"
     "@opentripplanner/humanize-distance" "^1.2.0"
@@ -2603,16 +2627,6 @@
     "@styled-icons/fa-regular" "^10.34.0"
     "@styled-icons/fa-solid" "^10.34.0"
 
-"@opentripplanner/map-popup@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-2.0.3.tgz#9edfecb451a9405e364a4251237289d142ad139e"
-  integrity sha512-6So8qPbHsebXzJICTuC4LfXSk+39SMWCygS//qhCG8IXzbAVtOwpTRRofbRhhlliJSXF07oCRJs6YbPvWkXI/A==
-  dependencies:
-    "@opentripplanner/base-map" "^3.0.10"
-    "@opentripplanner/core-utils" "^8.1.1"
-    "@opentripplanner/from-to-location-picker" "^2.1.5"
-    flat "^5.0.2"
-
 "@opentripplanner/map-popup@^2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-2.0.4.tgz#268230e385f92c14f1526e079af037f74fc63d4c"
@@ -2640,13 +2654,13 @@
   dependencies:
     "@opentripplanner/map-popup" "^2.0.5"
 
-"@opentripplanner/park-and-ride-overlay@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/park-and-ride-overlay/-/park-and-ride-overlay-2.0.5.tgz#5597550e4adcde4e30a04d899f1628b2fa9cdc25"
-  integrity sha512-Ku0aQOCAq9GfvsTEpd3vRfSURvlLRYl0o2Pk+KqNkj29bErUtByF5VaLkfI4bFndf1H+G9UVJALp0UCMvIIM7g==
+"@opentripplanner/park-and-ride-overlay@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/park-and-ride-overlay/-/park-and-ride-overlay-2.0.6.tgz#9e8850ef9de5aff8cb772f83cff0eb15d8ddade4"
+  integrity sha512-YBT0DzoltEfMYunAMWzf8TcOmqQ/gNkF18+/MXETgb9nBmPQmYWyl3YEknV/Gu7rwAqsEVBG/HKrhRdFTeFu7A==
   dependencies:
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/from-to-location-picker" "^2.1.6"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/from-to-location-picker" "^2.1.7"
 
 "@opentripplanner/printable-itinerary@2.0.10-alpha.4":
   version "2.0.10-alpha.4"
@@ -2656,14 +2670,14 @@
     "@opentripplanner/core-utils" "^8.2.1"
     "@opentripplanner/itinerary-body" "^4.2.0-alpha.3"
 
-"@opentripplanner/route-viewer-overlay@^2.0.12":
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/route-viewer-overlay/-/route-viewer-overlay-2.0.12.tgz#d422cd47c5217ff8d96becf92dc31e6e3bf4cc2c"
-  integrity sha512-bfJi8N3+fsEdLhxFakLCJlN42ulzaZsYUfvMyOAVs4sUllcoFLldtQc42t6jRu8rSs+pv9LSk7kE89M9jLaGsA==
+"@opentripplanner/route-viewer-overlay@^2.0.13":
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/route-viewer-overlay/-/route-viewer-overlay-2.0.13.tgz#0772b074fd19dcc52ce56455710fa3fcbfc42271"
+  integrity sha512-FYaj9O3HTcnr78XpRaWIKIBiSWvNgeoibksHJCwvSmwVqgCHd3aA0WHKiNOui4pfiic2CdwbiQgY0ObJfHn/bg==
   dependencies:
     "@mapbox/polyline" "^1.1.0"
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/core-utils" "^8.2.1"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/core-utils" "^9.0.0"
     point-in-polygon "^1.1.0"
 
 "@opentripplanner/scripts@^1.2.0":
@@ -2677,43 +2691,43 @@
     glob-promise "^4.2.2"
     js-yaml "^4.1.0"
 
-"@opentripplanner/stop-viewer-overlay@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/stop-viewer-overlay/-/stop-viewer-overlay-2.0.5.tgz#67b59f38c9d09b141a05b9d943dc57661c160dcd"
-  integrity sha512-I0PH9IS/2otIZbj3kIKTlxmit1FqL7EMwW8w0DcaAhb4H2/JzLQ3R33hQ06dU35FPy4U5R0d/uBLXZY5FWISww==
+"@opentripplanner/stop-viewer-overlay@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/stop-viewer-overlay/-/stop-viewer-overlay-2.0.6.tgz#83e622651dd5e46b6766e180c1cdfb41aeb0d193"
+  integrity sha512-psrBNQwHveFf9Vtsj0VqJDjZUN/O8zYQbO9F3FYWhRKeKcwbjfJsf8BUHsy9w8qvBprUXTgU4SIzrB27Y2xLXw==
   dependencies:
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/core-utils" "^8.2.1"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/core-utils" "^9.0.0"
 
-"@opentripplanner/stops-overlay@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/stops-overlay/-/stops-overlay-5.1.0.tgz#d5a54a02c9c964ce8e6c18a22ae1ef3f5281ab5c"
-  integrity sha512-VYC9K1LQ202YhvR/JJuELsSbreUfT+uO0QZAwuys4W/XVgK0IF53uzbTmlXXmUbsDABWRL8Yd2L6gWUjO26Ixg==
+"@opentripplanner/stops-overlay@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/stops-overlay/-/stops-overlay-5.1.1.tgz#c33ed904b42b8d4a92c51693538b82dca139c8fa"
+  integrity sha512-/Szhb4Sjry1w33OzI8xsYvUTc8jo1GZacz76ZAK/l0IkhkBHYomY4FH/NEkG4OKq7LjYqjRAKeElyjovpZLlpg==
   dependencies:
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/from-to-location-picker" "^2.1.6"
-    "@opentripplanner/map-popup" "^2.0.3"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/from-to-location-picker" "^2.1.7"
+    "@opentripplanner/map-popup" "^2.0.4"
     flat "^5.0.2"
 
-"@opentripplanner/transit-vehicle-overlay@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/transit-vehicle-overlay/-/transit-vehicle-overlay-4.0.4.tgz#38b1f2e0c6427d50cfe0258e774329f0d997cf04"
-  integrity sha512-YoEKz2nMEY57fl4mLvKK85Xb6GDqJHTEbCGGki72j4idu1e/DpReFbjfwBMigA6wto8p3QsAPV8cOjSXm9Hdig==
+"@opentripplanner/transit-vehicle-overlay@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/transit-vehicle-overlay/-/transit-vehicle-overlay-4.0.5.tgz#4bd0d07e36ed8cb63724c387231ec47afbeaba23"
+  integrity sha512-jxSThu2KoGNQ9JHhDr1Ut89ULCekfZWFIHVWBGo1kcH0bocCizlm+0uLe95rmVif5R1iQjj0Zfx6Bx6FY1KT8Q==
   dependencies:
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/core-utils" "^8.2.1"
-    "@opentripplanner/icons" "^2.0.1"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/core-utils" "^9.0.0"
+    "@opentripplanner/icons" "^2.0.3"
     flat "^5.0.2"
 
-"@opentripplanner/transitive-overlay@^3.0.13":
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/transitive-overlay/-/transitive-overlay-3.0.13.tgz#61457d75a9f16ec2262c746d88ae185faf1333e0"
-  integrity sha512-9t6UER7oFZvz/1N38wQMs0DBnuACDdLBwfF17SK0cpoty5Nb+s4GZQD60ohLqXVILjFfy/wPIRcISaUvzJhDYg==
+"@opentripplanner/transitive-overlay@^3.0.14":
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/transitive-overlay/-/transitive-overlay-3.0.14.tgz#6a9a2ca676ddd7567d36b337c4ddee1591eed058"
+  integrity sha512-/CMhT56GrjMAK79edtVw7HjLt/jgXo/rWv48oYMaF8u8nZ/5BH7t2vH6Q6HN3POXghctJr38bm2ecWcp4n1baA==
   dependencies:
     "@mapbox/polyline" "^1.1.1"
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/core-utils" "^8.2.1"
-    "@opentripplanner/itinerary-body" "^4.1.17"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/core-utils" "^9.0.0"
+    "@opentripplanner/itinerary-body" "^5.0.0"
     "@turf/bbox" "^6.5.0"
     "@turf/bearing" "^6.5.0"
     "@turf/destination" "^6.5.0"
@@ -2732,10 +2746,10 @@
     flat "^5.0.2"
     react-animate-height "^3.0.4"
 
-"@opentripplanner/trip-form@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.3.0.tgz#c4eca2db26e3d3d50dfeed9a305961b974fdf345"
-  integrity sha512-wt/+zP6broTNHQ2b0Wr9XrphFvm1UJdFasfSfSiBxVe3Ir7FLafwNtT8Fkb6zvD3IHJQglaAFNlem9OnR7jIvg==
+"@opentripplanner/trip-form@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.3.1.tgz#3cf3212d1948ff28440600a6951847bf7a77467a"
+  integrity sha512-XDioTMNXSugz1iPWRVeP91xqJYbEOI/ZdEL9fHXllIT5c8dkg35mjCNtGtOJzaZZVtY+p3KxzD4lEWLVdAD45w==
   dependencies:
     "@floating-ui/react" "^0.19.2"
     "@opentripplanner/core-utils" "^10.0.0"
@@ -2748,29 +2762,29 @@
     react-indiana-drag-scroll "^2.0.1"
     react-inlinesvg "^2.3.0"
 
-"@opentripplanner/trip-viewer-overlay@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-viewer-overlay/-/trip-viewer-overlay-2.0.5.tgz#788846bfc89dc23a755065e29041d81dc10ebf7f"
-  integrity sha512-1p2T8NJDz67sswBtXBbTs766T/7e3DBQCvIxUig5+xdJLzTNm5+he6DjsNiye1hB3Zn/vEjjvT90HuxMGughLQ==
+"@opentripplanner/trip-viewer-overlay@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-viewer-overlay/-/trip-viewer-overlay-2.0.6.tgz#96e8e6026812a7e64ccd431f67a01bb168acbe5d"
+  integrity sha512-Pp+pTykcnu7Udq8DDsVVyYVdENtzBtajXXM4W/BWgPzNAoXuKU0IA6HexK1WiR3IQiQV9sfZ0Gf27JdoNcDxhg==
   dependencies:
     "@mapbox/polyline" "^1.1.0"
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/core-utils" "^8.2.1"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/core-utils" "^9.0.0"
 
 "@opentripplanner/types@^6.1.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.1.0.tgz#dd5b88cc0b73939cd1eb5bd44d4768e21bedaacc"
   integrity sha512-fFuNMJLrSCIoIWJ7VugM1Jb7HfIcRDzb8o2LNsASExWAEYDuONFxyGYT/98g82/70Grl8kCSMSAFi0lEiQ/cPQ==
 
-"@opentripplanner/vehicle-rental-overlay@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/vehicle-rental-overlay/-/vehicle-rental-overlay-2.1.1.tgz#fa05294aea3b6502f948d2c8c9726a5a597b869c"
-  integrity sha512-Ifb3+aHCcokure64UwlX5PI7IybtJrGWFTcuhV7X/DDGPSSG9ufe1c8jr2UNFEE9YMl0nKYyi8YgxQk1cFQyAg==
+"@opentripplanner/vehicle-rental-overlay@^2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/vehicle-rental-overlay/-/vehicle-rental-overlay-2.1.2.tgz#5939e07cd15a25f92bfeb6229bd583de205cfee7"
+  integrity sha512-SCufc7d10ixE+82pfnalbZvEF4QBRw+9qmkTNW8lalArX8UbngUoZEaZ3QKTT0PIXuxcwqobZNtVyxH8iz5Vig==
   dependencies:
-    "@opentripplanner/base-map" "^3.0.11"
-    "@opentripplanner/core-utils" "^8.2.1"
-    "@opentripplanner/from-to-location-picker" "^2.1.6"
-    "@opentripplanner/map-popup" "^2.0.3"
+    "@opentripplanner/base-map" "^3.0.13"
+    "@opentripplanner/core-utils" "^9.0.0"
+    "@opentripplanner/from-to-location-picker" "^2.1.7"
+    "@opentripplanner/map-popup" "^2.0.4"
     "@styled-icons/fa-solid" "^10.34.0"
     flat "^5.0.2"
     lodash.memoize "^4.1.2"
@@ -10111,7 +10125,14 @@ is-core-module@^2.0.0, is-core-module@^2.5.0, is-core-module@^2.6.0:
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.11.0, is-core-module@^2.2.0:
+is-core-module@^2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
+  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+  dependencies:
+    has "^1.0.3"
+
+is-core-module@^2.2.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
@@ -12904,9 +12925,9 @@ node-fetch@^1.0.1:
     is-stream "^1.0.1"
 
 node-fetch@^2.6.1:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
-  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -15780,6 +15801,11 @@ regenerator-runtime@^0.13.7:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
+regenerator-runtime@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
+  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
+
 regenerator-transform@^0.14.2:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
@@ -16062,11 +16088,11 @@ resolve@^1.1.5, resolve@^1.1.6, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.
     path-parse "^1.0.6"
 
 resolve@^1.10.0:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  version "1.22.4"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
+  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
   dependencies:
-    is-core-module "^2.11.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -16454,10 +16480,10 @@ semver-regex@^3.1.2:
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
   integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+"semver@2 || 3 || 4 || 5":
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@7.0.0:
   version "7.0.0"
@@ -16476,6 +16502,11 @@ semver@7.x, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.2.1, semver@^
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -18647,9 +18678,9 @@ whatwg-encoding@^1.0.5:
     iconv-lite "0.4.24"
 
 whatwg-fetch@>=0.10.0, whatwg-fetch@^3.4.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
-  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
+  version "3.6.17"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz#009bbbfc122b227b74ba1ff31536b3a1a0e0e212"
+  integrity sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ==
 
 whatwg-mimetype@^2.3.0:
   version "2.3.0"

From 14adb4e6cbb5d28053f64752b2f01e8cabeac93a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 28 Aug 2023 15:31:33 -0400
Subject: [PATCH 33/42] refactor(RouteRow): Omit operator in route button id if
 operator is absent. Update test.

---
 lib/components/viewers/RouteRow.js | 2 +-
 percy/percy.test.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/components/viewers/RouteRow.js b/lib/components/viewers/RouteRow.js
index e31c0faac..9bc8631a2 100644
--- a/lib/components/viewers/RouteRow.js
+++ b/lib/components/viewers/RouteRow.js
@@ -202,7 +202,7 @@ export class RouteRow extends PureComponent {
           aria-label={patternViewerButtonText}
           display={isActive}
           id={`open-route-button-${route.shortName || route.longName}-${
-            operator.name
+            operator.name || '' // don't print 'undefined' if there is no operator.
           }`}
           onClick={this._patternButtonClicked}
           // Cannot keyboard navigate to the button unless it is visible
diff --git a/percy/percy.test.js b/percy/percy.test.js
index b09cf9e5e..b2e5d818f 100644
--- a/percy/percy.test.js
+++ b/percy/percy.test.js
@@ -290,7 +290,7 @@ async function executeTest(page, isMobile, isCallTaker) {
   // click the little pattern arrow
   // Triggers mock.har graphql query #13 and #14 (vehicle positions, twice again).
   // FIXME: Investigate why twice.
-  await page.click('#open-route-button-1-MARTA')
+  await page.click('#open-route-button-1')
 
   // View the other pattern on the selected route.
   await page.click('#headsign-selector-label')

From a883aaf25a549b2bfed03acaf0525577338d2897 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 28 Aug 2023 15:43:58 -0400
Subject: [PATCH 34/42] test(percy): Update route button id.

---
 percy/percy.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/percy/percy.test.js b/percy/percy.test.js
index b2e5d818f..462419dcb 100644
--- a/percy/percy.test.js
+++ b/percy/percy.test.js
@@ -290,7 +290,7 @@ async function executeTest(page, isMobile, isCallTaker) {
   // click the little pattern arrow
   // Triggers mock.har graphql query #13 and #14 (vehicle positions, twice again).
   // FIXME: Investigate why twice.
-  await page.click('#open-route-button-1')
+  await page.click('#open-route-button-1-')
 
   // View the other pattern on the selected route.
   await page.click('#headsign-selector-label')

From 257cac2f40ce5533e1d11b34c5efe731b4f16372 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 28 Aug 2023 17:17:12 -0400
Subject: [PATCH 35/42] fix(metro-itinerary): Display all routes in dashed
 lines on mouse leave.

---
 lib/components/narrative/metro/metro-itinerary.tsx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx
index 26ffa98a6..4e65c966d 100644
--- a/lib/components/narrative/metro/metro-itinerary.tsx
+++ b/lib/components/narrative/metro/metro-itinerary.tsx
@@ -202,23 +202,17 @@ class MetroItinerary extends NarrativeItinerary {
   static ModesAndRoutes = MetroItineraryRoutes
 
   _onMouseEnter = () => {
-    const { active, index, setVisibleItinerary, visibleItinerary } = this.props
+    const { active, index, setVisibleItinerary, visible } = this.props
     // Set this itinerary as visible if not already visible.
-    const visibleNotSet =
-      visibleItinerary === null || visibleItinerary === undefined
-    const isVisible =
-      visibleItinerary === index || (active === index && visibleNotSet)
+    const isVisible = visible || active === index
     if (typeof setVisibleItinerary === 'function' && !isVisible) {
       setVisibleItinerary({ index })
     }
   }
 
   _onMouseLeave = () => {
-    const { index, setVisibleItinerary, visibleItinerary } = this.props
-    if (
-      typeof setVisibleItinerary === 'function' &&
-      visibleItinerary === index
-    ) {
+    const { setVisibleItinerary, visible } = this.props
+    if (typeof setVisibleItinerary === 'function' && visible) {
       setVisibleItinerary({ index: null })
     }
   }

From c23143a4deca538286356e02284e882f20d8c682 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 28 Aug 2023 14:53:40 -0700
Subject: [PATCH 36/42] deps: update new walkspeed deps

---
 lib/reducers/create-otp-reducer.js |  2 +-
 package.json                       |  8 ++---
 yarn.lock                          | 56 +++++++++++++++++++++++++-----
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index bc866f3ea..14c002f36 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -131,7 +131,7 @@ export function getInitialState(userDefinedConfig) {
     config.api.path = `/otp/routers/${routerId}`
   }
 
-  let initialModeSettings = defaultModeSettings
+  let initialModeSettings = defaultModeSettings || []
   if (!initialModeSettings.length) {
     initialModeSettings = []
   }
diff --git a/package.json b/package.json
index 83d45ab65..c8ea4eaea 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@bugsnag/plugin-react": "^7.17.0",
     "@floating-ui/react": "^0.19.2",
     "@opentripplanner/base-map": "^3.0.13",
-    "@opentripplanner/core-utils": "^9.0.3",
+    "@opentripplanner/core-utils": "^11.0.0",
     "@opentripplanner/endpoints-overlay": "^2.0.7",
     "@opentripplanner/from-to-location-picker": "^2.1.7",
     "@opentripplanner/geocoder": "^1.4.2",
@@ -58,7 +58,7 @@
     "@opentripplanner/transit-vehicle-overlay": "^4.0.4",
     "@opentripplanner/transitive-overlay": "^3.0.13",
     "@opentripplanner/trip-details": "^5.0.2",
-    "@opentripplanner/trip-form": "^3.1.1",
+    "@opentripplanner/trip-form": "^3.3.1",
     "@opentripplanner/trip-viewer-overlay": "^2.0.5",
     "@opentripplanner/vehicle-rental-overlay": "^2.1.1",
     "@styled-icons/fa-regular": "^10.34.0",
@@ -132,7 +132,7 @@
     "@craco/craco": "^6.3.0",
     "@jackwilsdon/craco-use-babelrc": "^1.0.0",
     "@opentripplanner/scripts": "^1.2.0",
-    "@opentripplanner/types": "^6.0.0",
+    "@opentripplanner/types": "^6.1.0",
     "@percy/cli": "^1.20.3",
     "@percy/puppeteer": "^2.0.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
@@ -240,4 +240,4 @@
       "percy-css": ".percy-hide { opacity: 0!important; } "
     }
   }
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 0835fc215..724a0c63f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2394,6 +2394,44 @@
     maplibre-gl "^2.1.9"
     react-map-gl "^7.0.15"
 
+"@opentripplanner/core-utils@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-10.0.0.tgz#ab5cba39097e2b15e634b1e70141076f3a5614d3"
+  integrity sha512-3T+P9GlBmeL8AHATUXbOouDtr3eYNv6VYMbVagFV9MBhYf3wSCJ3kAdBEWK+TQGfiWRfcxVJueuy8kvmVrkJtA==
+  dependencies:
+    "@conveyal/lonlat" "^1.4.1"
+    "@mapbox/polyline" "^1.1.0"
+    "@opentripplanner/geocoder" "^1.4.1"
+    "@styled-icons/foundation" "^10.34.0"
+    "@turf/along" "^6.0.1"
+    bowser "^2.7.0"
+    chroma-js "^2.4.2"
+    date-fns "^2.28.0"
+    date-fns-tz "^1.2.2"
+    graphql "^16.6.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+    qs "^6.9.1"
+
+"@opentripplanner/core-utils@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.0.0.tgz#dd40b7cd68d7d7bf4f56d87bf708d6bd4b7660ed"
+  integrity sha512-b+oPQWKpzXHeq9QdU0JmsplZX2QIRj4ARdIPJ++f5i/hpIxMnbKApwDHVkRdHz6kYCOQI7pcVNTunT7AGNvudg==
+  dependencies:
+    "@conveyal/lonlat" "^1.4.1"
+    "@mapbox/polyline" "^1.1.0"
+    "@opentripplanner/geocoder" "^1.4.1"
+    "@styled-icons/foundation" "^10.34.0"
+    "@turf/along" "^6.0.1"
+    bowser "^2.7.0"
+    chroma-js "^2.4.2"
+    date-fns "^2.28.0"
+    date-fns-tz "^1.2.2"
+    graphql "^16.6.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+    qs "^6.9.1"
+
 "@opentripplanner/core-utils@^8.1.1", "@opentripplanner/core-utils@^8.2.1":
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-8.3.2.tgz#5095dd3ae8493e478b3f599353c6804b35f1e1dd"
@@ -2694,13 +2732,13 @@
     flat "^5.0.2"
     react-animate-height "^3.0.4"
 
-"@opentripplanner/trip-form@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.1.1.tgz#67d01f1fcfd31ccc758907b4324e453f2984f8b2"
-  integrity sha512-A5OFHZyLW4CZDndrdjLy3ZHSQGWgaido/yN/jZXKcBHRDZK91Izd0xNAn4p4EvwpULPocg1mak/2dYwl07TWUQ==
+"@opentripplanner/trip-form@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.3.1.tgz#3cf3212d1948ff28440600a6951847bf7a77467a"
+  integrity sha512-XDioTMNXSugz1iPWRVeP91xqJYbEOI/ZdEL9fHXllIT5c8dkg35mjCNtGtOJzaZZVtY+p3KxzD4lEWLVdAD45w==
   dependencies:
     "@floating-ui/react" "^0.19.2"
-    "@opentripplanner/core-utils" "^8.2.1"
+    "@opentripplanner/core-utils" "^10.0.0"
     "@styled-icons/bootstrap" "^10.34.0"
     "@styled-icons/boxicons-regular" "^10.38.0"
     "@styled-icons/fa-regular" "^10.37.0"
@@ -2719,10 +2757,10 @@
     "@opentripplanner/base-map" "^3.0.11"
     "@opentripplanner/core-utils" "^8.2.1"
 
-"@opentripplanner/types@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.0.0.tgz#3dabebd404c88030f4191f08c7692d72ca2e3c8d"
-  integrity sha512-mwwj2WzkdCoG2KUYaR/4I2JkcuXr1fFUJpP4nk10YbRgzyGtGLaGIdiTXNYpwgk/5//pMHQ5Qa6psWrHpqRm1A==
+"@opentripplanner/types@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.1.0.tgz#dd5b88cc0b73939cd1eb5bd44d4768e21bedaacc"
+  integrity sha512-fFuNMJLrSCIoIWJ7VugM1Jb7HfIcRDzb8o2LNsASExWAEYDuONFxyGYT/98g82/70Grl8kCSMSAFi0lEiQ/cPQ==
 
 "@opentripplanner/vehicle-rental-overlay@^2.1.1":
   version "2.1.1"

From 91055c878240cf7c722e8cd97e72bc4fcdfdace6 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 29 Aug 2023 09:51:28 -0400
Subject: [PATCH 37/42] refactor(metro-itinerary): Update interpretation of
 active.

---
 lib/components/narrative/metro/metro-itinerary.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx
index 4e65c966d..cbd0f7194 100644
--- a/lib/components/narrative/metro/metro-itinerary.tsx
+++ b/lib/components/narrative/metro/metro-itinerary.tsx
@@ -204,7 +204,7 @@ class MetroItinerary extends NarrativeItinerary {
   _onMouseEnter = () => {
     const { active, index, setVisibleItinerary, visible } = this.props
     // Set this itinerary as visible if not already visible.
-    const isVisible = visible || active === index
+    const isVisible = visible || active
     if (typeof setVisibleItinerary === 'function' && !isVisible) {
       setVisibleItinerary({ index })
     }

From 2dacb7b4b383882083032b056b70dae9c03a517e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 29 Aug 2023 16:11:57 -0400
Subject: [PATCH 38/42] fix(actions/location): Display alert if location was
 denied.

Also, don't fetch location on loading the desktop view.
---
 i18n/en-US.yml                          |  5 +++++
 lib/actions/location.tsx                | 10 ++++++++++
 lib/components/app/responsive-webapp.js |  6 ++----
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/i18n/en-US.yml b/i18n/en-US.yml
index 613156575..e518a7672 100644
--- a/i18n/en-US.yml
+++ b/i18n/en-US.yml
@@ -34,6 +34,11 @@ actions:
     setPaymentError: "Error setting payment info:"
     setRequestStatusError: "Error setting request status:"
   location:
+    deniedAccessAlert: >
+      Access to your location is blocked.
+
+      To use your current location, enable location permissions from your
+      browser, and reload the page. 
     geolocationNotSupportedError: Geolocation not supported by your browser
     unknownPositionError: Unknown error getting position
   map:
diff --git a/lib/actions/location.tsx b/lib/actions/location.tsx
index a336efb18..64e9e8921 100644
--- a/lib/actions/location.tsx
+++ b/lib/actions/location.tsx
@@ -2,6 +2,7 @@
 import { createAction } from 'redux-actions'
 import { Dispatch } from 'redux'
 import { IntlShape } from 'react-intl'
+import { isMobile } from '@opentripplanner/core-utils/lib/ui'
 
 import { setLocationToCurrent } from './map'
 
@@ -47,6 +48,15 @@ export function getCurrentPosition(
         // On error
         (error) => {
           console.log('error getting current position', error)
+          // On desktop, after user clicks "Use location" from the location fields,
+          // show an alert and explain if location is blocked.
+          if (!isMobile() && error.code === 1) {
+            window.alert(
+              intl.formatMessage({
+                id: 'actions.location.deniedAccessAlert'
+              })
+            )
+          }
           // FIXME, analyze error code to produce better error message.
           // See https://developer.mozilla.org/en-US/docs/Web/API/GeolocationPositionError
           dispatch(receivedPositionError({ error }))
diff --git a/lib/components/app/responsive-webapp.js b/lib/components/app/responsive-webapp.js
index e135c16b1..0ae74b8a7 100644
--- a/lib/components/app/responsive-webapp.js
+++ b/lib/components/app/responsive-webapp.js
@@ -153,11 +153,9 @@ class ResponsiveWebapp extends Component {
       }
     }
 
-    // Test location availability on load,
-    // so it is reported correctly by the location fields.
-    getCurrentPosition(intl)
-
     if (isMobile()) {
+      // Test location availability on load
+      getCurrentPosition(intl)
       // Also, watch for changes in position on mobile
       navigator.geolocation.watchPosition(
         // On success

From 11e8a613640ee0b0a343fe2617832b4e466e9c44 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 29 Aug 2023 16:54:36 -0400
Subject: [PATCH 39/42] improvement(actions/location): Add i18n to user-denied
 error messages.

---
 i18n/en-US.yml           |  1 +
 lib/actions/location.tsx | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/i18n/en-US.yml b/i18n/en-US.yml
index e518a7672..8c438529b 100644
--- a/i18n/en-US.yml
+++ b/i18n/en-US.yml
@@ -41,6 +41,7 @@ actions:
       browser, and reload the page. 
     geolocationNotSupportedError: Geolocation not supported by your browser
     unknownPositionError: Unknown error getting position
+    userDeniedPermission: User denied permission
   map:
     currentLocation: (Current Location)
   user:
diff --git a/lib/actions/location.tsx b/lib/actions/location.tsx
index 64e9e8921..40ffeaa93 100644
--- a/lib/actions/location.tsx
+++ b/lib/actions/location.tsx
@@ -57,9 +57,19 @@ export function getCurrentPosition(
               })
             )
           }
-          // FIXME, analyze error code to produce better error message.
-          // See https://developer.mozilla.org/en-US/docs/Web/API/GeolocationPositionError
-          dispatch(receivedPositionError({ error }))
+          const newError = { ...error }
+          if (error.code === 1) {
+            // i18n for user-denied location message (error.code = 1 on secure origins).
+            if (
+              window.location.protocol === 'https:' ||
+              window.location.host.startsWith('localhost:')
+            ) {
+              newError.message = intl.formatMessage({
+                id: 'actions.location.userDeniedPermission'
+              })
+            }
+          }
+          dispatch(receivedPositionError({ error: newError }))
         },
         // Options
         { enableHighAccuracy: true }

From 1b84270e8789820a5ded4a077a568b7304dc690e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:03:38 -0400
Subject: [PATCH 40/42] chore(i18n): Add missing French.

---
 i18n/fr.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/i18n/fr.yml b/i18n/fr.yml
index 742db4275..5c41e72fc 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -38,8 +38,14 @@ actions:
     setPaymentError: "Erreur sur les coordonnées de paiement :"
     setRequestStatusError: "Erreur sur l'état de la requête :"
   location:
+    deniedAccessAlert: >
+      L'accès à votre position est refusé.
+
+      Pour utiliser votre emplacement actuel, permettez-en l'accès depuis votre
+      navigateur, et ouvrez de nouveau cette page.
     geolocationNotSupportedError: La géolocalisation n'est pas prise en charge par votre navigateur.
     unknownPositionError: Erreur inconnue lors de la détection de votre emplacement.
+    userDeniedPermission: Refusé par l'utilisateur
   map:
     currentLocation: (Emplacement actuel)
   user:
@@ -178,7 +184,7 @@ components:
   AdvancedOptions:
     bannedRoutes: Choisissez les lignes à éviter…
     bikeTolerance: Tolérance au vélo
-    preferredRoutes: Choisissez les lignes preferées
+    preferredRoutes: Choisissez les lignes préferées
     walkTolerance: Tolérance à la marche
   AfterSignInScreen:
     mainTitle: Redirection...

From 933d34a0c8fc1838653a27433651b5e21b92c218 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 30 Aug 2023 10:37:38 -0400
Subject: [PATCH 41/42] refactor(actions/location): Apply PR review feedback.

---
 lib/actions/location.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/actions/location.tsx b/lib/actions/location.tsx
index 40ffeaa93..c62e9b740 100644
--- a/lib/actions/location.tsx
+++ b/lib/actions/location.tsx
@@ -50,6 +50,7 @@ export function getCurrentPosition(
           console.log('error getting current position', error)
           // On desktop, after user clicks "Use location" from the location fields,
           // show an alert and explain if location is blocked.
+          // TODO: Consider moving the handling of unavailable location to the location-field component.
           if (!isMobile() && error.code === 1) {
             window.alert(
               intl.formatMessage({

From 381f9edbc4184644da2b5b91fa4725d12d8d7fcf Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 30 Aug 2023 12:36:02 -0400
Subject: [PATCH 42/42] refactor: address pr feedback

---
 lib/components/user/sequential-pane-display.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/components/user/sequential-pane-display.tsx b/lib/components/user/sequential-pane-display.tsx
index adf171e21..e41a953b7 100644
--- a/lib/components/user/sequential-pane-display.tsx
+++ b/lib/components/user/sequential-pane-display.tsx
@@ -52,7 +52,7 @@ class SequentialPaneDisplay<T> extends Component<Props<T>> {
 
   h1Ref = React.createRef<HTMLHeadingElement>()
 
-  _handleFocus = () => {
+  _focusHeader = () => {
     this.h1Ref?.current?.focus()
   }
 
@@ -76,7 +76,7 @@ class SequentialPaneDisplay<T> extends Component<Props<T>> {
         this._routeTo(nextId)
       }
     }
-    this._handleFocus()
+    this._focusHeader()
   }
 
   _handleToPrevPane = () => {
@@ -85,11 +85,11 @@ class SequentialPaneDisplay<T> extends Component<Props<T>> {
       const prevId = panes[activePaneIndex - 1].id
       prevId && this._routeTo(prevId)
     }
-    this._handleFocus()
+    this._focusHeader()
   }
 
   componentDidMount(): void {
-    this._handleFocus()
+    this._focusHeader()
   }
 
   render() {