From 97bfc61d87df2c577d81514c1132119c4d204581 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Thu, 13 Jun 2024 11:37:38 -0400 Subject: [PATCH 01/21] add class names to nearby view --- lib/components/viewers/nearby/nearby-view.tsx | 1 + lib/components/viewers/pattern-row.tsx | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/components/viewers/nearby/nearby-view.tsx b/lib/components/viewers/nearby/nearby-view.tsx index c087e1af3..9f4b24310 100644 --- a/lib/components/viewers/nearby/nearby-view.tsx +++ b/lib/components/viewers/nearby/nearby-view.tsx @@ -208,6 +208,7 @@ function NearbyView({ > {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
onMouseEnter(n.place)} onMouseEnter={() => onMouseEnter(n.place)} diff --git a/lib/components/viewers/pattern-row.tsx b/lib/components/viewers/pattern-row.tsx index f893a3293..ed70da046 100644 --- a/lib/components/viewers/pattern-row.tsx +++ b/lib/components/viewers/pattern-row.tsx @@ -78,7 +78,7 @@ const PatternRow = ({ const routeColor = getRouteColorBasedOnSettings(route.operator, route) return ( - + {/* header row */}
{/* next departure preview (only shows up to 3 entries) */} {hasStopTimes && ( - + {homeTimezone && renderDay(homeTimezone, stopTimes?.[0].serviceDay)} {[0, 1, 2].map( (index) => stopTimes?.[index] && ( // TODO: use stop time id as index -
  • +
  • Date: Fri, 14 Jun 2024 13:22:37 -0400 Subject: [PATCH 02/21] route viewer styles --- lib/components/viewers/pattern-viewer.tsx | 2 +- lib/components/viewers/route-details.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/components/viewers/pattern-viewer.tsx b/lib/components/viewers/pattern-viewer.tsx index 1f6204633..4f2fc90bc 100644 --- a/lib/components/viewers/pattern-viewer.tsx +++ b/lib/components/viewers/pattern-viewer.tsx @@ -78,7 +78,7 @@ const PatternViewer = ({ return (
    { full={pattern != null} textColor={getMostReadableTextColor(routeColor, route?.textColor)} > - + {agency && ( <> @@ -196,7 +196,7 @@ class RouteDetails extends Component { {headsigns && headsigns.length > 0 && ( - + From a1c199685ba7696c065669c4ffbef09056d07146 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Fri, 21 Jun 2024 14:18:22 -0400 Subject: [PATCH 03/21] itinerary tweaks to allow more styling --- example-config.yml | 2 + i18n/en-US.yml | 1 + lib/app.js | 3 + .../narrative/metro/departure-times-list.tsx | 2 +- .../narrative/metro/metro-itinerary.tsx | 75 ++++++++++++------- .../narrative/metro/route-block.tsx | 4 +- lib/util/config-types.ts | 1 + 7 files changed, 59 insertions(+), 29 deletions(-) diff --git a/example-config.yml b/example-config.yml index 0bc4e0feb..19cf97e7f 100644 --- a/example-config.yml +++ b/example-config.yml @@ -404,6 +404,8 @@ itinerary: previewOverlay: false # Whether to add a OTP_RR_A11Y_ROUTING_ENABLED error to all itineraries with accessibility scores displayA11yError: false + # Whether to display itinerary info in the side of the preview or next to the departure times + showInlineItinerarySummary: false # The sort option to use by default # Available sort options: 'BEST', 'DURATION', 'ARRIVALTIME', 'WALKTIME', 'COST', 'DEPARTURETIME' # defaultSort: "BEST" # Default diff --git a/i18n/en-US.yml b/i18n/en-US.yml index c041d1e56..38b859df4 100644 --- a/i18n/en-US.yml +++ b/i18n/en-US.yml @@ -280,6 +280,7 @@ components: MetroUI: arriveAt: You arrive itineraryDescription: "{time} itinerary using {routes}" + itinerarySummary: from {stopName} | {cost} leaveAt: You leave multipleOptions: Multiple Options orAlternatives: or other routes in the same direction diff --git a/lib/app.js b/lib/app.js index 4e3fb6728..83b0d9c02 100644 --- a/lib/app.js +++ b/lib/app.js @@ -63,6 +63,7 @@ const ErrorBoundary = bugsnagApiKey const { getCustomIcon, ItineraryBody, + ItineraryPreviewSupplement, LegIcon, MainPanel, MobileResultsScreen, @@ -171,6 +172,8 @@ const components = { ItineraryBody: DefaultItinerary, + ItineraryPreviewSupplement, + MainPanel: BatchRoutingPanel, MapWindows: isCallTakerModuleEnabled ? jsConfig.MapWindows : null, diff --git a/lib/components/narrative/metro/departure-times-list.tsx b/lib/components/narrative/metro/departure-times-list.tsx index bebfd30e8..c5a287e28 100644 --- a/lib/components/narrative/metro/departure-times-list.tsx +++ b/lib/components/narrative/metro/departure-times-list.tsx @@ -37,7 +37,7 @@ const TimeButton = ({ setActiveItinerary }: TimeButtonProps) => { const intl = useIntl() - const classNames = [] + const classNames = ['timeInfo'] if (realTime) classNames.push('realtime') if (active) classNames.push('active') const timeString = intl.formatTime(displayedTime) diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx index 27cad87bd..85fbb5c85 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 { getFlexAttributes } from './attribute-utils' +import { getFirstTransitLegStop, getFlexAttributes } from './attribute-utils' import DepartureTimesList, { SetActiveItineraryHandler } from './departure-times-list' @@ -253,10 +253,11 @@ class MetroItinerary extends NarrativeItinerary { setActiveItinerary, setActiveLeg, setItineraryView, + showInlineItinerarySummary, showLegDurations, showRealtimeAnnotation } = this.props - const { SvgIcon } = this.context + const { ItineraryPreviewSupplement, SvgIcon } = this.context const { isCallAhead, isContinuousDropoff, isFlexItinerary, phone } = getFlexAttributes(itinerary) @@ -307,6 +308,22 @@ class MetroItinerary extends NarrativeItinerary { ) } + const fareInfo = + // Hide the fare information entirely if the defaultFareType isn't specified. + transitFare === null || transitFare === undefined || transitFare < 0 ? ( + + ) : ( + // TODO: re-implement TNC fares for metro UI? + + ) + // Use first leg's agency as a fallback return (
    {/* TODO: a11y: add aria-label to parent element */} + {ItineraryPreviewSupplement && ( + + )} )} - { - // Hide the fare information entirely if the defaultFareType isn't specified. - - {transitFare === null || - transitFare === undefined || - transitFare < 0 ? ( - - ) : ( - // TODO: re-implement TNC fares for metro UI? - - )} - - } + {/* If inline summary is enabled, don't show fare in side */} + {showInlineItinerarySummary === true && ( + {fareInfo} + )} - {arrivesAt ? ( - - ) : ( - - )}{' '} + + {arrivesAt ? ( + + ) : ( + + )} + {' '} + {showInlineItinerarySummary && ( + <> + {' '} + + + )}{' '} )} @@ -464,6 +482,9 @@ const mapStateToProps = (state: AppReduxState, ownProps: Props) => { enableDot: !state.otp.config.itinerary?.disableMetroSeperatorDot, // @ts-expect-error TODO: type activeSearch pending: activeSearch ? Boolean(activeSearch.pending) : false, + + showInlineItinerarySummary: + state.otp.config.itinerary?.showInlineItinerarySummary, showLegDurations: state.otp.config.itinerary?.showLegDurations } } diff --git a/lib/components/narrative/metro/route-block.tsx b/lib/components/narrative/metro/route-block.tsx index dfa37408b..e167edceb 100644 --- a/lib/components/narrative/metro/route-block.tsx +++ b/lib/components/narrative/metro/route-block.tsx @@ -144,7 +144,9 @@ const RouteBlock = ({ return ( <> - {showDivider && previousLegMode && } + {showDivider && previousLegMode && ( + + )} {leg.mode !== previousLegMode && ( diff --git a/lib/util/config-types.ts b/lib/util/config-types.ts index e8008d9eb..cde93c4d1 100644 --- a/lib/util/config-types.ts +++ b/lib/util/config-types.ts @@ -281,6 +281,7 @@ export interface ItineraryConfig { showAllWalkLegs?: boolean showFirstResultByDefault?: boolean showHeaderText?: boolean + showInlineItinerarySummary?: boolean showLegDurations?: boolean showPlanFirstLastButtons?: boolean showRouteFares?: boolean From 0133041313574c53af87824ac788c6cd25e13ac6 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Wed, 26 Jun 2024 12:15:01 -0400 Subject: [PATCH 04/21] `ItineraryPreviewSupplement` more props --- lib/components/narrative/metro/metro-itinerary.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx index 85fbb5c85..dd06b6447 100644 --- a/lib/components/narrative/metro/metro-itinerary.tsx +++ b/lib/components/narrative/metro/metro-itinerary.tsx @@ -359,7 +359,10 @@ class MetroItinerary extends NarrativeItinerary { {/* TODO: a11y: add aria-label to parent element */} {ItineraryPreviewSupplement && ( - + )} Date: Wed, 26 Jun 2024 14:00:51 -0400 Subject: [PATCH 05/21] more class names --- lib/components/narrative/line-itin/connected-itinerary-body.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/components/narrative/line-itin/connected-itinerary-body.js b/lib/components/narrative/line-itin/connected-itinerary-body.js index 287a9852a..5274b176b 100644 --- a/lib/components/narrative/line-itin/connected-itinerary-body.js +++ b/lib/components/narrative/line-itin/connected-itinerary-body.js @@ -118,6 +118,7 @@ class ConnectedItineraryBody extends Component { Date: Fri, 28 Jun 2024 13:37:01 -0400 Subject: [PATCH 06/21] correct nearby view mobile link class --- lib/components/app/app-menu.tsx | 2 +- lib/components/app/app.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/components/app/app-menu.tsx b/lib/components/app/app-menu.tsx index 2bb891739..fe3870e5c 100644 --- a/lib/components/app/app-menu.tsx +++ b/lib/components/app/app-menu.tsx @@ -233,7 +233,7 @@ class AppMenu extends Component< {/* This item is duplicated by the view-switcher, but only shown on mobile when the view switcher isn't shown (using css) */} } onClick={this._togglePane} text={intl.formatMessage({ diff --git a/lib/components/app/app.css b/lib/components/app/app.css index 59aea38f2..87fe44222 100644 --- a/lib/components/app/app.css +++ b/lib/components/app/app.css @@ -33,12 +33,14 @@ /* Don't show route viewer link in the app menu on desktop as it is in the navbar */ .app-menu .app-menu-route-viewer-link, +.app-menu .app-menu-nearby-viewer-link, .app-menu .app-menu-trip-planner-link, .app-menu #app-menu-locale-selector { display: none; } @media (max-width: 768px) { .app-menu .app-menu-route-viewer-link, + .app-menu .app-menu-nearby-viewer-link, .app-menu .app-menu-trip-planner-link, .app-menu #app-menu-locale-selector { display: flex; From ec811598f76562831c5d8d637c3f9ea2c8c92f49 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Mon, 1 Jul 2024 10:51:12 -0400 Subject: [PATCH 07/21] add missing fr string --- i18n/fr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/i18n/fr.yml b/i18n/fr.yml index ff8f6deaf..99a1985f2 100644 --- a/i18n/fr.yml +++ b/i18n/fr.yml @@ -297,6 +297,7 @@ components: MetroUI: arriveAt: Vous arrivez à itineraryDescription: Trajet de {time} par les lignes {routes} + itinerarySummary: Partez à {stopName} | {cost} leaveAt: Partez à multipleOptions: Plusieurs options orAlternatives: ou autres lignes dans la même direction From fac98214a0dbe84fac8641d4625ea606f945d9cc Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Mon, 1 Jul 2024 11:18:28 -0400 Subject: [PATCH 08/21] correct condition --- 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 dd06b6447..158f619f3 100644 --- a/lib/components/narrative/metro/metro-itinerary.tsx +++ b/lib/components/narrative/metro/metro-itinerary.tsx @@ -393,7 +393,7 @@ class MetroItinerary extends NarrativeItinerary { )} {/* If inline summary is enabled, don't show fare in side */} - {showInlineItinerarySummary === true && ( + {showInlineItinerarySummary !== true && ( {fareInfo} )} From a470b0ac8bd92db6740cf7403dcf78f68805e38d Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Mon, 1 Jul 2024 11:25:37 -0400 Subject: [PATCH 09/21] update snapshots --- .../viewers/__snapshots__/nearby-view.js.snap | 1352 +++++++++-------- .../stop-schedule-viewer.ts.snap | 6 +- 2 files changed, 755 insertions(+), 603 deletions(-) diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap index 3c60f41c2..6ab8ca118 100644 --- a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap +++ b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap @@ -45,7 +45,7 @@ exports[`components > viewers > nearby view renders nothing on a blank page 1`] className="nearby-view base-color-bg" >
    viewers > nearby view renders nothing on a blank page 1`] } >
      viewers > nearby view renders proper scooter dates 1`] = ` className="nearby-view base-color-bg" >
      viewers > nearby view renders proper scooter dates 1`] = ` } >
        viewers > nearby view renders proper scooter dates 1`] = ` key="UmVudGFsVmVoaWNsZTpsaW1lX3NlYXR0bGU6MDM1NDBhOWUtZTY1Ny00NTRlLWFlN2ItOGFkOWRhODZjZmVk" >
        viewers > nearby view renders proper scooter dates 1`] = ` >

        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

        viewers > nearby view renders proper scooter dates 1`] = `

        viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
        viewers > nearby view renders proper scooter dates 1`] = ` >

        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

        viewers > nearby view renders proper scooter dates 1`] = `

        viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
        viewers > nearby view renders proper scooter dates 1`] = ` >

        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

        viewers > nearby view renders proper scooter dates 1`] = `

        viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
        viewers > nearby view renders proper scooter dates 1`] = ` >
        viewers > nearby view renders proper scooter dates 1`] = ` >

        Roosevelt Station - Bay 2 @@ -10030,7 +10034,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

        viewers > nearby view renders proper scooter dates 1`] = `

        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
          viewers > nearby view renders proper scooter dates 1`] = ` } >
        • viewers > nearby view renders proper scooter dates 1`] = ` title="45" > viewers > nearby view renders proper scooter dates 1`] = ` Loyal Heights Greenwood
          - +

            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

          1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
          2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
          3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
          4. viewers > nearby view renders proper scooter dates 1`] = ` title="62" > viewers > nearby view renders proper scooter dates 1`] = ` Downtown Seattle Fremont
            - +

              viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

            1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
            2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
            3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
            4. viewers > nearby view renders proper scooter dates 1`] = ` title="79" > viewers > nearby view renders proper scooter dates 1`] = ` Roosevelt Station Sand Point
              - +

                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

              1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
              2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
              3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` key="U3RvcDo0MDo5OTAwMDM" >
                viewers > nearby view renders proper scooter dates 1`] = ` >
                viewers > nearby view renders proper scooter dates 1`] = ` >

                Roosevelt @@ -16849,7 +16872,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                viewers > nearby view renders proper scooter dates 1`] = `

                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                  viewers > nearby view renders proper scooter dates 1`] = ` } >
                • viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` Angle Lake
                  - +

                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                  1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                  2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                  3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                  4. viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` Northgate
                    - +

                      viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                    1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                    2. viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` Capitol Hill
                      - +

                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                      1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                      2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                      3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` key="UmVudGFsVmVoaWNsZTpiaXJkLXNlYXR0bGUtd2FzaGluZ3RvbjpjZTM4MDA4Ny1lMjU1LTQzYjgtYjM5ZC04MjY3Y2E3MmJjMGQ" >
                        viewers > nearby view renders proper scooter dates 1`] = ` >

                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                        viewers > nearby view renders proper scooter dates 1`] = `

                        viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                        viewers > nearby view renders proper scooter dates 1`] = ` >

                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                        viewers > nearby view renders proper scooter dates 1`] = `

                        viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                        viewers > nearby view renders proper scooter dates 1`] = ` >

                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                        viewers > nearby view renders proper scooter dates 1`] = `

                        viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                        viewers > nearby view renders proper scooter dates 1`] = ` >
                        viewers > nearby view renders proper scooter dates 1`] = ` >

                        Roosevelt Station - Bay 1 @@ -26336,7 +26379,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                        viewers > nearby view renders proper scooter dates 1`] = `

                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                          viewers > nearby view renders proper scooter dates 1`] = ` } >
                        • viewers > nearby view renders proper scooter dates 1`] = ` title="45" > viewers > nearby view renders proper scooter dates 1`] = ` University District Roosevelt Station
                          - +

                            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                          1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                          2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                          3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                          4. viewers > nearby view renders proper scooter dates 1`] = ` title="62" > viewers > nearby view renders proper scooter dates 1`] = ` Sand Point East Green Lake
                            - +

                              viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                            1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                            2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                            3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                            4. viewers > nearby view renders proper scooter dates 1`] = ` title="79" > viewers > nearby view renders proper scooter dates 1`] = ` University District Sand Point
                              - +

                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                              1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                              2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                              3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                              4. viewers > nearby view renders proper scooter dates 1`] = ` title="988" > viewers > nearby view renders proper scooter dates 1`] = ` Madrona Special
                                - +

                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` key="UmVudGFsVmVoaWNsZTpsaW1lX3NlYXR0bGU6YTg5MDZiYTctMmU2NC00ZDk4LWI0ZGYtNmJjNDBlZTVkYzc3" >
                                  viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = `

                                  viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                  viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = `

                                  viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                  viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = `

                                  viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                  viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = `

                                  viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                  viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = `

                                  viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                  viewers > nearby view renders proper scooter dates 1`] = ` >
                                  viewers > nearby view renders proper scooter dates 1`] = ` >

                                  Roosevelt Station Bay 5 - Bay 5 @@ -35850,7 +35921,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                  viewers > nearby view renders proper scooter dates 1`] = `

                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                    viewers > nearby view renders proper scooter dates 1`] = ` } >
                                  • viewers > nearby view renders proper scooter dates 1`] = ` title="67" > viewers > nearby view renders proper scooter dates 1`] = ` University District Roosevelt
                                    - +

                                      viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                    1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                    2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                    3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                    4. viewers > nearby view renders proper scooter dates 1`] = ` title="73" > viewers > nearby view renders proper scooter dates 1`] = ` University District Maple Leaf
                                      - +

                                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                      1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                      2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                      3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                      4. viewers > nearby view renders proper scooter dates 1`] = ` title="984" > viewers > nearby view renders proper scooter dates 1`] = ` Downtown Seattle Special
                                        - +

                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                        1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` key="UmVudGFsVmVoaWNsZTpsaW1lX3NlYXR0bGU6OWM3ZDZkYjEtYWJiMi00OWFlLTg3NzAtOGNkNjQ1MzcwMGUw" >
                                          viewers > nearby view renders proper scooter dates 1`] = ` >

                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                          viewers > nearby view renders proper scooter dates 1`] = `

                                          viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                          viewers > nearby view renders proper scooter dates 1`] = ` >
                                          viewers > nearby view renders proper scooter dates 1`] = ` >

                                          Roosevelt @@ -43656,7 +43745,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                          viewers > nearby view renders proper scooter dates 1`] = `

                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                            viewers > nearby view renders proper scooter dates 1`] = ` } >
                                          • viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` Northgate
                                            - +

                                              viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                            1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                            2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                            3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` key="U3RvcDprY206MjM1NjE" >
                                              viewers > nearby view renders proper scooter dates 1`] = ` >
                                              viewers > nearby view renders proper scooter dates 1`] = ` >

                                              Roosevelt Station - Bay 3 @@ -51198,7 +51294,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                              viewers > nearby view renders proper scooter dates 1`] = `

                                              viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                                viewers > nearby view renders proper scooter dates 1`] = ` } >
                                              • viewers > nearby view renders proper scooter dates 1`] = ` title="522" > viewers > nearby view renders proper scooter dates 1`] = ` Bothell
                                                - +

                                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                4. viewers > nearby view renders proper scooter dates 1`] = ` title="67" > viewers > nearby view renders proper scooter dates 1`] = ` Northgate Station Roosevelt Station
                                                  - +

                                                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                  1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                  2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                  3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                  4. viewers > nearby view renders proper scooter dates 1`] = ` title="522" > viewers > nearby view renders proper scooter dates 1`] = ` Woodinville
                                                    - +

                                                      viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                    1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                    2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                    3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                    4. viewers > nearby view renders proper scooter dates 1`] = ` title="73" > viewers > nearby view renders proper scooter dates 1`] = ` Jackson Park Maple Leaf
                                                      - +

                                                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                      1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                      2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                      3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                      4. viewers > nearby view renders proper scooter dates 1`] = ` title="322" > viewers > nearby view renders proper scooter dates 1`] = ` Kenmore P&R Roosevelt Station
                                                        - +

                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                        1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                        2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                        3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                        4. viewers > nearby view renders proper scooter dates 1`] = ` title="322" > viewers > nearby view renders proper scooter dates 1`] = ` Kenmore P&R
                                                          - +

                                                            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                          1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                          2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                          3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` key="UmVudGFsVmVoaWNsZTpsaW1lX3NlYXR0bGU6YTM0YzhmNTUtMjY4Ny00MjhlLWJmZTMtYWZiODgwNjdmNDM2" >
                                                            viewers > nearby view renders proper scooter dates 1`] = ` >

                                                            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                            viewers > nearby view renders proper scooter dates 1`] = `

                                                            viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                                            viewers > nearby view renders proper scooter dates 1`] = ` >
                                                            viewers > nearby view renders proper scooter dates 1`] = ` >

                                                            NE 65th St & 14th Ave NE @@ -62309,7 +62443,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                            viewers > nearby view renders proper scooter dates 1`] = `

                                                            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` size="0.9em" > viewers > nearby view renders proper scooter dates 1`] = ` >
                                                              viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                            • viewers > nearby view renders proper scooter dates 1`] = ` title="45" > viewers > nearby view renders proper scooter dates 1`] = ` Loyal Heights Greenwood
                                                              - +

                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                              1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                              2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                              3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                              4. viewers > nearby view renders proper scooter dates 1`] = ` title="62" > viewers > nearby view renders proper scooter dates 1`] = ` Downtown Seattle Fremont
                                                                - +

                                                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                                1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                                4. viewers > nearby view renders proper scooter dates 1`] = ` title="79" > viewers > nearby view renders proper scooter dates 1`] = ` Roosevelt Station Sand Point
                                                                  - +

                                                                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `

                                                                  1. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                  2. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                  3. viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > stop viewer should render with initial stop id a > viewers > stop viewer should render with initial stop id a

                                                            Date: Tue, 9 Jul 2024 13:00:13 -0400 Subject: [PATCH 10/21] update otp ui --- package.json | 28 ++++----- yarn.lock | 170 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 135 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index 776150b9f..6f869b442 100644 --- a/package.json +++ b/package.json @@ -42,28 +42,28 @@ "@bugsnag/js": "^7.17.0", "@bugsnag/plugin-react": "^7.17.0", "@floating-ui/react": "^0.19.2", - "@opentripplanner/base-map": "^3.1.0", + "@opentripplanner/base-map": "^3.2.0", "@opentripplanner/building-blocks": "^1.0.3", - "@opentripplanner/core-utils": "^11.4.1", - "@opentripplanner/endpoints-overlay": "^2.0.12", - "@opentripplanner/from-to-location-picker": "^2.1.12", + "@opentripplanner/core-utils": "^11.4.2", + "@opentripplanner/endpoints-overlay": "^2.1.1", + "@opentripplanner/from-to-location-picker": "^2.1.13", "@opentripplanner/geocoder": "^3.0.1", "@opentripplanner/humanize-distance": "^1.2.0", - "@opentripplanner/icons": "^2.0.10", - "@opentripplanner/itinerary-body": "^5.3.0", - "@opentripplanner/location-field": "^2.0.18", + "@opentripplanner/icons": "^2.0.11", + "@opentripplanner/itinerary-body": "^5.3.2", + "@opentripplanner/location-field": "^2.0.20", "@opentripplanner/location-icon": "^1.4.1", - "@opentripplanner/map-popup": "^3.1.0", + "@opentripplanner/map-popup": "^3.1.1", "@opentripplanner/otp2-tile-overlay": "^1.0.12", "@opentripplanner/park-and-ride-overlay": "^2.0.8", - "@opentripplanner/printable-itinerary": "^2.0.20", + "@opentripplanner/printable-itinerary": "^2.0.21", "@opentripplanner/route-viewer-overlay": "^2.0.15", "@opentripplanner/stop-viewer-overlay": "^2.0.8", - "@opentripplanner/stops-overlay": "^5.2.2", - "@opentripplanner/transit-vehicle-overlay": "^4.0.10", "@opentripplanner/transitive-overlay": "^3.0.18", - "@opentripplanner/trip-details": "^5.0.11", - "@opentripplanner/trip-form": "^3.6.0", + "@opentripplanner/stops-overlay": "^5.3.0", + "@opentripplanner/transit-vehicle-overlay": "^4.0.11", + "@opentripplanner/trip-details": "^5.0.12", + "@opentripplanner/trip-form": "^3.6.2", "@opentripplanner/trip-viewer-overlay": "^2.0.8", "@opentripplanner/vehicle-rental-overlay": "^2.1.7", "@styled-icons/fa-regular": "^10.34.0", @@ -140,7 +140,7 @@ "@graphql-tools/schema": "^10.0.0", "@jackwilsdon/craco-use-babelrc": "^1.0.0", "@opentripplanner/scripts": "^1.2.0", - "@opentripplanner/types": "^6.5.0", + "@opentripplanner/types": "^6.5.1", "@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 dbe7c368e..32c5bae1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2392,12 +2392,22 @@ maplibre-gl "^2.1.9" react-map-gl "^7.0.15" +"@opentripplanner/base-map@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.2.0.tgz#db4410319d9614077ec925d739165a998c4a2485" + integrity sha512-d/yTKEnXqrw9pXhSvCERT+wLFa077Xr4wEFu4pYB+WYoZFflNxuTuAXXjm268HS/d0kjNndkjSMkxaKk6AjsvA== + dependencies: + "@opentripplanner/map-popup" "^3.1.0" + mapbox-gl "npm:empty-npm-package@1.0.0" + maplibre-gl "^2.1.9" + react-map-gl "^7.0.15" + "@opentripplanner/building-blocks@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@opentripplanner/building-blocks/-/building-blocks-1.0.3.tgz#74de32daba0d7fae7d10d5738db6d2f2824da3dd" integrity sha512-065pZZTzR+qisgbvJd9swhitMMin1/ooMwuzqqRknsKYK+wOGge3Y3sbgQZATyjR/oH43uF0P2ZhGcbgqgM+YQ== -"@opentripplanner/core-utils@^11.2.3", "@opentripplanner/core-utils@^11.3.1", "@opentripplanner/core-utils@^11.4.1": +"@opentripplanner/core-utils@^11.2.3", "@opentripplanner/core-utils@^11.3.1": version "11.4.1" resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.1.tgz#9ccfed82f9a05078bd8e815dd4025af164e37acb" integrity sha512-5FZT0ESVctyoO3V0W80QMZuzAc8hEYZxLAyrEARYXNeAHnBNxngGGMj7QMLK4JZgJDESnNietSRnBJd2MBWhOw== @@ -2415,14 +2425,33 @@ lodash.isequal "^4.5.0" qs "^6.9.1" -"@opentripplanner/endpoints-overlay@^2.0.12": - version "2.0.12" - resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.0.12.tgz#d320c23777008550f350f614798c4a6300f4dba6" - integrity sha512-Vih8PGEJNEjNEdBzbd8eErQJ3e+VgI0J0BreVTsAejOb+7gEf+YBRVaq7NHVPBkt6dcsiQmZrw8IIhpqDkqo2Q== +"@opentripplanner/core-utils@^11.4.0", "@opentripplanner/core-utils@^11.4.2": + version "11.4.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.2.tgz#cc6034fb80ccda44e50f7f0a1e80a7bad8387f84" + integrity sha512-EVYVN73Cgf9IC+uya49843MFJnVkmv0nHAjsQwmPGSx/w5fY49X4fSpDprL7Bn+MTzk58U2udDsn6OzKmV0JdA== dependencies: - "@opentripplanner/base-map" "^3.0.16" - "@opentripplanner/core-utils" "^11.2.3" + "@conveyal/lonlat" "^1.4.1" + "@mapbox/polyline" "^1.1.0" + "@opentripplanner/geocoder" "^3.0.0" + "@styled-icons/foundation" "^10.34.0" + "@turf/along" "^6.0.1" + 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/endpoints-overlay@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.1.1.tgz#e7029d95bd13436aacbc6f854c243d1fcf7e8570" + integrity sha512-llBGk8eRa8JRJreMp73zWXeCzTzirBNd2N4UtK66vLL9s7YYPFm/yKGLTIKg1MRHrJ+DGpaFkEOi/ajos8YiLA== + dependencies: + "@opentripplanner/base-map" "^3.1.0" + "@opentripplanner/core-utils" "^11.4.0" "@opentripplanner/location-icon" "^1.4.1" + "@opentripplanner/map-popup" "^3.1.0" "@styled-icons/fa-solid" "^10.34.0" flat "^5.0.2" @@ -2434,6 +2463,14 @@ "@opentripplanner/location-icon" "^1.4.1" flat "^5.0.2" +"@opentripplanner/from-to-location-picker@^2.1.13": + version "2.1.13" + resolved "https://registry.yarnpkg.com/@opentripplanner/from-to-location-picker/-/from-to-location-picker-2.1.13.tgz#d13acd582929175c676cd4303a6cdc6e1c289d99" + integrity sha512-6/7+wYQuuQhnGvxkDQcvoACdmuwUL1BlPqBIUFwyBpkdJ1VQGZiUSAAZTxXdY1Fv/p5mKR1vRsvZgtSPhcxgcg== + dependencies: + "@opentripplanner/location-icon" "^1.4.1" + flat "^5.0.2" + "@opentripplanner/geocoder@^2.2.2": version "2.2.2" resolved "https://registry.yarnpkg.com/@opentripplanner/geocoder/-/geocoder-2.2.2.tgz#8ddc669287ccdfff1a5cce14d1fa8049421c6480" @@ -2445,7 +2482,7 @@ isomorphic-mapzen-search "^1.6.1" lodash.memoize "^4.1.2" -"@opentripplanner/geocoder@^3.0.1": +"@opentripplanner/geocoder@^3.0.0", "@opentripplanner/geocoder@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@opentripplanner/geocoder/-/geocoder-3.0.1.tgz#834960bc52f515e1223346a8002fb847674d33bc" integrity sha512-+LHTqY8pHmPE39IjVev5T5baa+BohEyvsLwVwFB2bYWzM+m/RgAJ188uBcDzXKdqk5y3dZR9ZODYVMtrvIiKzQ== @@ -2461,7 +2498,7 @@ resolved "https://registry.yarnpkg.com/@opentripplanner/humanize-distance/-/humanize-distance-1.2.0.tgz#71cf5d5d1b756adef15300edbba0995ccd4b35ee" integrity sha512-x0QRXMDhypFeazZ6r6vzrdU8vhiV56nZ/WX6zUbxpgp6T9Oclw0gwR2Zdw6DZiiFpSYVNeVNxVzZwsu6NRGjcA== -"@opentripplanner/icons@^2.0.10", "@opentripplanner/icons@^2.0.9": +"@opentripplanner/icons@^2.0.10": version "2.0.10" resolved "https://registry.yarnpkg.com/@opentripplanner/icons/-/icons-2.0.10.tgz#688e75190ebe772ad45bb852517e93bdde28df74" integrity sha512-9X6kV6jDsNnQT4foZU9X530zTN7kjYLtWBjWmeA5EVHth0qZx5T3iFjzqeG4wK+rwZKUMLGS5lAhLIQdaXKZMQ== @@ -2469,6 +2506,14 @@ "@opentripplanner/core-utils" "^11.2.3" prop-types "^15.7.2" +"@opentripplanner/icons@^2.0.11": + version "2.0.11" + resolved "https://registry.yarnpkg.com/@opentripplanner/icons/-/icons-2.0.11.tgz#08ac56bee164c988748fb2b94a60e9e932dfbb3f" + integrity sha512-VOdp/SGn/bnVIQCdqGrLwqI0EFexw7eIuHIP1yNYGgDZETO2d6f/FUr6suw69Y59/4l6CoZvGZD5jCPi2vz/bA== + dependencies: + "@opentripplanner/core-utils" "^11.4.0" + prop-types "^15.7.2" + "@opentripplanner/itinerary-body@^5.2.6", "@opentripplanner/itinerary-body@^5.3.0": version "5.3.0" resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.3.0.tgz#1a611dc6c49438666e58c34d0f1f88ab6ff48f2d" @@ -2487,14 +2532,32 @@ react-resize-detector "^4.2.1" string-similarity "^4.0.4" -"@opentripplanner/location-field@^2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.18.tgz#e64c61d73b8858a6f9401cf132c3ec0c39395bab" - integrity sha512-Wsk5Rk8nWreQqlAcQLg/4PiIYa9DaYN1oNZzFyoZ5MLaAyN1voZHS6iuO5MYvxWx/3FOMR5pX+kgBa4Pr8CacA== +"@opentripplanner/itinerary-body@^5.3.2": + version "5.3.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.3.2.tgz#282c5963de16b165084d46f6e55d5afc3d563c87" + integrity sha512-1uatzGTnmlY5YoJFH+u4pznb/6MKUqai1/Rb91Kh4GfNwl8eMPQ3RmwGRWejOJEGtXMIlq7LJ5O8I6Swwc+1RQ== + dependencies: + "@opentripplanner/core-utils" "^11.4.0" + "@opentripplanner/humanize-distance" "^1.2.0" + "@opentripplanner/icons" "^2.0.10" + "@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/location-field@^2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.20.tgz#ade02af802ba9295aa73cabc2351da758fcfeb4d" + integrity sha512-sYiemP4v2OmNWRKh2J0soLq9EO53piuJ8I5Du8X6wUfsTIk7yFH+xVLHN1IfA3XPRHy0gE8wEAnWzhxh4Qa+NQ== dependencies: "@conveyal/geocoder-arcgis-geojson" "^0.0.3" - "@opentripplanner/core-utils" "^11.3.1" - "@opentripplanner/geocoder" "^2.2.2" + "@opentripplanner/core-utils" "^11.4.0" + "@opentripplanner/geocoder" "^3.0.0" "@opentripplanner/humanize-distance" "^1.2.0" "@opentripplanner/location-icon" "^1.4.1" "@styled-icons/fa-solid" "^10.34.0" @@ -2518,6 +2581,15 @@ "@opentripplanner/from-to-location-picker" "^2.1.12" flat "^5.0.2" +"@opentripplanner/map-popup@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-3.1.1.tgz#54f081162d328cc4bb0e89562f9ea200e29e01a1" + integrity sha512-yWBIPuYGw7biaRNIpglQm5+opZ+D5QQgXHLhKnYaCR0eNijjl9cx34lGXdyKPXt26S6MiyJZXL81uc6w6CnQ3A== + dependencies: + "@opentripplanner/core-utils" "^11.4.0" + "@opentripplanner/from-to-location-picker" "^2.1.12" + flat "^5.0.2" + "@opentripplanner/otp2-tile-overlay@^1.0.12": version "1.0.12" resolved "https://registry.yarnpkg.com/@opentripplanner/otp2-tile-overlay/-/otp2-tile-overlay-1.0.12.tgz#1fc6ea68f47c44ff39fd04c13d946a68ed62d279" @@ -2533,13 +2605,13 @@ "@opentripplanner/base-map" "^3.0.16" "@opentripplanner/from-to-location-picker" "^2.1.11" -"@opentripplanner/printable-itinerary@^2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@opentripplanner/printable-itinerary/-/printable-itinerary-2.0.20.tgz#4554b66fc5021eede2ebe0713d4065a5673fa2cc" - integrity sha512-Pcl5LeZxbnB+VsboNEbyU7VGBM2+7imEFJLkvHvxTR8xoQ+OMZUQaml3VIBvOaYcdoa7Gt+/1AEOAR+YzpU2+g== +"@opentripplanner/printable-itinerary@^2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@opentripplanner/printable-itinerary/-/printable-itinerary-2.0.21.tgz#2b85ad6017491bbae682ece53d57e35819b79959" + integrity sha512-MWcHWmZRiqygjrwJt6I/LyHin88cjsmgqdxx2lh3oLGMgjrF657sxAbXfXAySqsW1rZ1MtHRuZ7IA2ph93GfMQ== dependencies: - "@opentripplanner/core-utils" "^11.2.3" - "@opentripplanner/itinerary-body" "^5.2.6" + "@opentripplanner/core-utils" "^11.4.0" + "@opentripplanner/itinerary-body" "^5.3.0" "@opentripplanner/route-viewer-overlay@^2.0.15": version "2.0.15" @@ -2570,24 +2642,24 @@ "@opentripplanner/base-map" "^3.0.16" "@opentripplanner/core-utils" "^11.2.3" -"@opentripplanner/stops-overlay@^5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@opentripplanner/stops-overlay/-/stops-overlay-5.2.2.tgz#163dbc162c134113b5048905aa5cd2aabc47b807" - integrity sha512-1jYtHBvITWtE8pl4wXlfJ8X4SsoS3FWDPMVuUo05Rcefn8aGqr/AasaKa/wqsrvL1/vC9i+0ESSiu/BwSP8V2g== +"@opentripplanner/stops-overlay@^5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@opentripplanner/stops-overlay/-/stops-overlay-5.3.0.tgz#1f35927a769a5fac80e40cfdaf85a7275b90cec5" + integrity sha512-bQBH5vf/F8n7yL6zhWpiU1XyJOkarcZVLovKYGseJpLs+qnPUd+3MMK9W0cQAMn7iuxAjcDHmSNmeK99kwb3jw== dependencies: - "@opentripplanner/base-map" "^3.0.16" - "@opentripplanner/from-to-location-picker" "^2.1.11" - "@opentripplanner/map-popup" "^3.0.2" + "@opentripplanner/base-map" "^3.1.0" + "@opentripplanner/from-to-location-picker" "^2.1.12" + "@opentripplanner/map-popup" "^3.1.0" flat "^5.0.2" -"@opentripplanner/transit-vehicle-overlay@^4.0.10": - version "4.0.10" - resolved "https://registry.yarnpkg.com/@opentripplanner/transit-vehicle-overlay/-/transit-vehicle-overlay-4.0.10.tgz#a63e86a2dc5108ddf47ba8d8c0c9f5017c65c86a" - integrity sha512-j8+KCyeCD7WLQgAIbtzX7ckwqLU1fwKjXCMJ5E5/t75YqNuWB8hAiUonerIanuA20TUinm4sPwSL3dr9OnGNlA== +"@opentripplanner/transit-vehicle-overlay@^4.0.11": + version "4.0.11" + resolved "https://registry.yarnpkg.com/@opentripplanner/transit-vehicle-overlay/-/transit-vehicle-overlay-4.0.11.tgz#3485514b6000612bba32c4610d9a5f692e01cf95" + integrity sha512-1xwPqAB/NbBKyv+5wJKaXz7mww3Sznbk2MISbjCecpbYaCrYwcXTVhoXDnrkgAELI1mz739mud6qKr/X77SEEg== dependencies: - "@opentripplanner/base-map" "^3.0.16" - "@opentripplanner/core-utils" "^11.2.3" - "@opentripplanner/icons" "^2.0.9" + "@opentripplanner/base-map" "^3.1.0" + "@opentripplanner/core-utils" "^11.4.0" + "@opentripplanner/icons" "^2.0.10" flat "^5.0.2" "@opentripplanner/transitive-overlay@^3.0.18": @@ -2607,23 +2679,23 @@ "@turf/midpoint" "^6.5.0" lodash.isequal "^4.5.0" -"@opentripplanner/trip-details@^5.0.11": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.11.tgz#a672874a042ffcf89bb52a792ea8810545646c9e" - integrity sha512-oRu4o2zJxkm494iWvdwDnSqQ1VxZPlUMDp+FoJpC8S+H43RpHiCB6g/eutA2Ytigy/koezO9dpDveI6a6rPtQA== +"@opentripplanner/trip-details@^5.0.12": + version "5.0.12" + resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.12.tgz#138d009722569d1cb3b97b552a4cf0a855a828ba" + integrity sha512-o+1JNwUYNCb33eQDQLL1aCKf9j88T6yZtDnlrJIysxiYGMsqFtug8+LdYkBJ4SyeO/FqiHk8Q+VLOxTqZgcYUQ== dependencies: - "@opentripplanner/core-utils" "^11.2.3" + "@opentripplanner/core-utils" "^11.4.0" "@styled-icons/fa-solid" "^10.34.0" flat "^5.0.2" react-animate-height "^3.0.4" -"@opentripplanner/trip-form@^3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.6.0.tgz#e02996e3e21cee951a61522c1c01ea55f978c2b8" - integrity sha512-iV3bQkRhcJxvty7BZ+RUN/ylLmH+twUcveQgHj1HUCkPhEOz98m26ykDYXQhOXP68k/y9PtaLlt+Gzsa6p+8xQ== +"@opentripplanner/trip-form@^3.6.2": + version "3.6.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.6.2.tgz#910432d222aafa598e85cce134faffe956ac5c25" + integrity sha512-NWD2WtVjn5Iq/B4Verv+LnZIdt5vYcTMkMn+9Yyc5YBPt5hzK2HUdQbAh35ap30gj77KJFbNJ8lLJ3VPn9A8yg== dependencies: "@floating-ui/react" "^0.19.2" - "@opentripplanner/core-utils" "^11.2.3" + "@opentripplanner/core-utils" "^11.4.0" "@styled-icons/bootstrap" "^10.34.0" "@styled-icons/boxicons-regular" "^10.38.0" "@styled-icons/fa-regular" "^10.37.0" @@ -2642,10 +2714,10 @@ "@opentripplanner/base-map" "^3.0.16" "@opentripplanner/core-utils" "^11.2.3" -"@opentripplanner/types@^6.5.0": - version "6.5.0" - resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.5.0.tgz#d8cca355bf30f0984283faa793113ad6c0dba38d" - integrity sha512-FllEyE+1WQ2GOSKXQOuzrk+OPcJEqr4+zacsHQLB9WVyfm5D/BPHR1/OjfuVngrwLTK5bKP8VlDRS1ba/R8rtg== +"@opentripplanner/types@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.5.1.tgz#c19c73e051e516e187e79202de276f6ed3bbc59e" + integrity sha512-5S4otkjzlNLqcbDeMXy3Xi6tcPQgQRoyQZX+uvEdPOTzIERr7wJoltyQCBwi49GX99F+jqyRbd08TJ6SnLapbA== "@opentripplanner/vehicle-rental-overlay@^2.1.7": version "2.1.7" From 9def22bc21d0900afc57b03f9669697664c6edd1 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Mon, 29 Jul 2024 11:57:58 +0100 Subject: [PATCH 11/21] test: update snapshots --- .../viewers/__snapshots__/nearby-view.js.snap | 834 +++++++++--------- .../stop-schedule-viewer.ts.snap | 6 +- 2 files changed, 420 insertions(+), 420 deletions(-) diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap index 6ab8ca118..aea0b6124 100644 --- a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap +++ b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap @@ -45,7 +45,7 @@ exports[`components > viewers > nearby view renders nothing on a blank page 1`] className="nearby-view base-color-bg" >
                                                            viewers > nearby view renders nothing on a blank page 1`] } >
                                                              viewers > nearby view renders proper scooter dates 1`] = ` className="nearby-view base-color-bg" >
                                                              viewers > nearby view renders proper scooter dates 1`] = ` } >
                                                                viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                viewers > nearby view renders proper scooter dates 1`] = ` >
                                                                viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                Roosevelt Station - Bay 2 @@ -10034,7 +10034,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                  viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                • viewers > nearby view renders proper scooter dates 1`] = ` title="45" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                  1. viewers > nearby view renders proper scooter dates 1`] = ` title="62" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                      viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                    1. viewers > nearby view renders proper scooter dates 1`] = ` title="79" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                        viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                        Roosevelt @@ -16872,7 +16872,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                        viewers > nearby view renders proper scooter dates 1`] = `

                                                                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                          viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                        • viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                          1. viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                              viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                            1. viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` >
                                                                                viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                Roosevelt Station - Bay 1 @@ -26379,7 +26379,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                viewers > nearby view renders proper scooter dates 1`] = `

                                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                                • viewers > nearby view renders proper scooter dates 1`] = ` title="45" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                  1. viewers > nearby view renders proper scooter dates 1`] = ` title="62" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                    1. viewers > nearby view renders proper scooter dates 1`] = ` title="79" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                      1. viewers > nearby view renders proper scooter dates 1`] = ` title="988" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = `

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = `

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = `

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = `

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = `

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` >
                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          Roosevelt Station Bay 5 - Bay 5 @@ -35921,7 +35921,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                          viewers > nearby view renders proper scooter dates 1`] = `

                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                                          • viewers > nearby view renders proper scooter dates 1`] = ` title="67" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                            1. viewers > nearby view renders proper scooter dates 1`] = ` title="73" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                              1. viewers > nearby view renders proper scooter dates 1`] = ` title="984" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                  viewers > nearby view renders proper scooter dates 1`] = `

                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` >
                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                  Roosevelt @@ -43745,7 +43745,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                  viewers > nearby view renders proper scooter dates 1`] = `

                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                                                  • viewers > nearby view renders proper scooter dates 1`] = ` title="1 Line" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                      Roosevelt Station - Bay 3 @@ -51294,7 +51294,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                      viewers > nearby view renders proper scooter dates 1`] = `

                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                                                        viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                                                      • viewers > nearby view renders proper scooter dates 1`] = ` title="522" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                        1. viewers > nearby view renders proper scooter dates 1`] = ` title="67" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                          1. viewers > nearby view renders proper scooter dates 1`] = ` title="522" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                            1. viewers > nearby view renders proper scooter dates 1`] = ` title="73" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                              1. viewers > nearby view renders proper scooter dates 1`] = ` title="322" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                1. viewers > nearby view renders proper scooter dates 1`] = ` title="322" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = `

                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` >
                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                                    NE 65th St & 14th Ave NE @@ -62443,7 +62443,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` >

                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = `

                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = `
                                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                                                                    • viewers > nearby view renders proper scooter dates 1`] = ` title="45" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                                        viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                      1. viewers > nearby view renders proper scooter dates 1`] = ` title="62" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                        1. viewers > nearby view renders proper scooter dates 1`] = ` title="79" > viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >

                                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.realtime" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` iconViewBox="0 0 448 512" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > nearby view renders proper scooter dates 1`] = ` title="components.StopTimeCell.scheduled" > viewers > nearby view renders proper scooter dates 1`] = ` > viewers > stop viewer should render with initial stop id a > viewers > stop viewer should render with initial stop id a

                                                                                                                          Date: Tue, 30 Jul 2024 10:29:32 +0100 Subject: [PATCH 12/21] allow moving zoom buttons --- example-config.yml | 1 + lib/components/map/default-map.tsx | 7 +++++-- lib/util/config-types.ts | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/example-config.yml b/example-config.yml index 77879a11f..77caef21f 100644 --- a/example-config.yml +++ b/example-config.yml @@ -116,6 +116,7 @@ map: initLat: 45.52 initLon: -122.682 # autoFlyOnTripFormUpdate: false + # navigationControlPosition: "bottom-right" baseLayers: - name: Streets # These tiles are free to use, but not in production diff --git a/lib/components/map/default-map.tsx b/lib/components/map/default-map.tsx index a6388d998..005462418 100644 --- a/lib/components/map/default-map.tsx +++ b/lib/components/map/default-map.tsx @@ -269,7 +269,8 @@ class DefaultMap extends Component { } = this.props const { getCustomMapOverlays, getTransitiveRouteLabel, ModeIcon } = this.context - const { baseLayers, maxZoom, overlays } = mapConfig || {} + const { baseLayers, maxZoom, navigationControlPosition, overlays } = + mapConfig || {} const { lat, lon, zoom } = this.state const vectorTilesEndpoint = `${assembleBasePath(config)}${ config.api?.path @@ -411,7 +412,9 @@ class DefaultMap extends Component { {/* If set, custom overlays are shown if no active itinerary is shown or pending. */} {typeof getCustomMapOverlays === 'function' && getCustomMapOverlays(!itinerary && !pending)} - + ) diff --git a/lib/util/config-types.ts b/lib/util/config-types.ts index 108fa4b38..3995d0ba8 100644 --- a/lib/util/config-types.ts +++ b/lib/util/config-types.ts @@ -228,6 +228,7 @@ export interface MapConfig { initLon?: number initZoom?: number maxZoom?: number + navigationControlPosition?: string overlays?: SupportedOverlays[] views?: MapViewConfig[] } From 8307e8b6cccbc229c965ecc83c17bc839acdeaee Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Tue, 30 Jul 2024 10:49:40 +0100 Subject: [PATCH 13/21] complete `showInlineItinerarySummary` --- .../narrative/metro/attribute-utils.tsx | 7 ++++--- .../narrative/metro/metro-itinerary.tsx | 21 +++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/components/narrative/metro/attribute-utils.tsx b/lib/components/narrative/metro/attribute-utils.tsx index 3972b120a..8f6ecd687 100644 --- a/lib/components/narrative/metro/attribute-utils.tsx +++ b/lib/components/narrative/metro/attribute-utils.tsx @@ -3,11 +3,12 @@ import { Itinerary, Leg } from '@opentripplanner/types' import coreUtils from '@opentripplanner/core-utils' import React from 'react' +export const getFirstTransitLeg = (itinerary: Itinerary): Leg | undefined => + itinerary.legs?.find((leg: Leg) => leg?.from?.vertexType === 'TRANSIT') + export const getFirstTransitLegStop = ( itinerary: Itinerary -): string | undefined => - itinerary.legs?.find((leg: Leg) => leg?.from?.vertexType === 'TRANSIT')?.from - ?.name +): string | undefined => getFirstTransitLeg(itinerary)?.from?.name export const getFlexAttributes = ( itinerary: Itinerary diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx index 158f619f3..2c066ad56 100644 --- a/lib/components/narrative/metro/metro-itinerary.tsx +++ b/lib/components/narrative/metro/metro-itinerary.tsx @@ -28,7 +28,12 @@ import ItineraryBody from '../line-itin/connected-itinerary-body' import NarrativeItinerary from '../narrative-itinerary' import SimpleRealtimeAnnotation from '../simple-realtime-annotation' -import { getFirstTransitLegStop, getFlexAttributes } from './attribute-utils' +import { + getFirstTransitLeg, + getFirstTransitLegStop, + getFlexAttributes +} from './attribute-utils' +import DefaultRouteRenderer from './default-route-renderer' import DepartureTimesList, { SetActiveItineraryHandler } from './departure-times-list' @@ -257,7 +262,8 @@ class MetroItinerary extends NarrativeItinerary { showLegDurations, showRealtimeAnnotation } = this.props - const { ItineraryPreviewSupplement, SvgIcon } = this.context + const { ItineraryPreviewSupplement, RouteRenderer, SvgIcon } = this.context + const Route = RouteRenderer || DefaultRouteRenderer const { isCallAhead, isContinuousDropoff, isFlexItinerary, phone } = getFlexAttributes(itinerary) @@ -411,6 +417,17 @@ class MetroItinerary extends NarrativeItinerary { + {showInlineItinerarySummary && getFirstTransitLeg(itinerary) && ( + + )} {arrivesAt ? ( From 34e2cf5f352b97956c1f2a09be772904fd4ac1c9 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Tue, 30 Jul 2024 10:56:35 +0100 Subject: [PATCH 14/21] add second row of inline itinerary summary --- lib/components/narrative/metro/metro-itinerary.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx index 2c066ad56..716567c5d 100644 --- a/lib/components/narrative/metro/metro-itinerary.tsx +++ b/lib/components/narrative/metro/metro-itinerary.tsx @@ -4,6 +4,7 @@ import { FareProductSelector, Itinerary, Leg } from '@opentripplanner/types' import { FormattedMessage, FormattedNumber, + FormattedTime, injectIntl, IntlShape } from 'react-intl' @@ -453,6 +454,15 @@ class MetroItinerary extends NarrativeItinerary { /> )}{' '} + {expanded && showInlineItinerarySummary && ( +
                                                                                                                          + + + + + +
                                                                                                                          + )}
                                                                                                                          )} From a9ae10235fed68316e8dee84922a56c6854702e1 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Wed, 31 Jul 2024 17:29:50 +0100 Subject: [PATCH 15/21] fix stop with no operator logo --- lib/components/viewers/nearby/stop-card-header.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/components/viewers/nearby/stop-card-header.tsx b/lib/components/viewers/nearby/stop-card-header.tsx index 6eced1b1c..045616e60 100644 --- a/lib/components/viewers/nearby/stop-card-header.tsx +++ b/lib/components/viewers/nearby/stop-card-header.tsx @@ -1,5 +1,6 @@ import { connect } from 'react-redux' import { FormattedMessage, useIntl } from 'react-intl' +import { MapPin } from '@styled-icons/fa-solid' import { Search } from '@styled-icons/fa-solid/Search' import { TransitOperator } from '@opentripplanner/types' import React, { ComponentType } from 'react' @@ -54,7 +55,10 @@ const Operator = ({ operator }: { operator?: TransitOperator }) => { ) : ( // If operator exists but logo is missing, // we still need to announce the operator name to screen readers. - {operatorLogoAriaLabel} + <> + + {operatorLogoAriaLabel} + ) } } From 9aa354530d8caecc21b7c8c92215dacc34c88d2a Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Wed, 7 Aug 2024 15:17:40 +0200 Subject: [PATCH 16/21] default for transit stations string --- i18n/en-US.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/i18n/en-US.yml b/i18n/en-US.yml index 38b859df4..bc9e6e513 100644 --- a/i18n/en-US.yml +++ b/i18n/en-US.yml @@ -273,6 +273,7 @@ components: park-and-ride: Park & Ride Locations satellite: Satellite shared-vehicles: Shared Vehicles + stations: Transit Stations stops: Transit Stops streets: Streets MapillaryFrame: From 7cf344e6cb5fc097d94677b1b3db4b708a7a0343 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Thu, 8 Aug 2024 10:32:43 +0200 Subject: [PATCH 17/21] update otp-ui --- package.json | 10 ++++---- yarn.lock | 72 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 7e4c69365..85eea797f 100644 --- a/package.json +++ b/package.json @@ -44,14 +44,14 @@ "@floating-ui/react": "^0.19.2", "@opentripplanner/base-map": "^3.2.0", "@opentripplanner/building-blocks": "^1.1.0", - "@opentripplanner/core-utils": "^11.4.2", + "@opentripplanner/core-utils": "^11.4.3", "@opentripplanner/endpoints-overlay": "^2.1.1", "@opentripplanner/from-to-location-picker": "^2.1.13", "@opentripplanner/geocoder": "^3.0.1", "@opentripplanner/humanize-distance": "^1.2.0", "@opentripplanner/icons": "^2.0.11", - "@opentripplanner/itinerary-body": "^5.3.3", - "@opentripplanner/location-field": "^2.0.20", + "@opentripplanner/itinerary-body": "^5.3.5", + "@opentripplanner/location-field": "^2.0.22", "@opentripplanner/location-icon": "^1.4.1", "@opentripplanner/map-popup": "^3.1.1", "@opentripplanner/otp2-tile-overlay": "^1.0.12", @@ -61,7 +61,7 @@ "@opentripplanner/stop-viewer-overlay": "^2.0.8", "@opentripplanner/stops-overlay": "^5.3.0", "@opentripplanner/transit-vehicle-overlay": "^4.0.11", - "@opentripplanner/transitive-overlay": "^3.0.18", + "@opentripplanner/transitive-overlay": "^3.0.20", "@opentripplanner/trip-details": "^5.0.13", "@opentripplanner/trip-form": "^3.6.2", "@opentripplanner/trip-viewer-overlay": "^2.0.8", @@ -140,7 +140,7 @@ "@graphql-tools/schema": "^10.0.0", "@jackwilsdon/craco-use-babelrc": "^1.0.0", "@opentripplanner/scripts": "^1.2.0", - "@opentripplanner/types": "^6.5.1", + "@opentripplanner/types": "^6.5.2", "@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 1c0bb7eb6..ffb1c1c84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2398,7 +2398,7 @@ resolved "https://registry.yarnpkg.com/@opentripplanner/building-blocks/-/building-blocks-1.1.0.tgz#ef9fe862ce0a3e92c9a6c2c2db749a9a02deebd5" integrity sha512-nx7pU1zIZzJcSkCFYyZ7gt+jd0gXj7bjx8rXn1msgF5uLWmtN/70dsmYNEApeA7haC076KOO3B/Jh44YfXG95g== -"@opentripplanner/core-utils@^11.2.3", "@opentripplanner/core-utils@^11.4.0", "@opentripplanner/core-utils@^11.4.2": +"@opentripplanner/core-utils@^11.2.3", "@opentripplanner/core-utils@^11.4.0": version "11.4.2" resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.2.tgz#cc6034fb80ccda44e50f7f0a1e80a7bad8387f84" integrity sha512-EVYVN73Cgf9IC+uya49843MFJnVkmv0nHAjsQwmPGSx/w5fY49X4fSpDprL7Bn+MTzk58U2udDsn6OzKmV0JdA== @@ -2416,6 +2416,24 @@ lodash.isequal "^4.5.0" qs "^6.9.1" +"@opentripplanner/core-utils@^11.4.1", "@opentripplanner/core-utils@^11.4.3": + version "11.4.3" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.3.tgz#4655f9a3bef1977e53abd81a4a0eae966f977c60" + integrity sha512-GbvchRsLfEi9JygUx6ypU+Iqv2hELseC53yQyQ/XdnB1kcHzN71BtBbz+qpD5/jk8IuM92j1taRnGMeu5ni6yA== + dependencies: + "@conveyal/lonlat" "^1.4.1" + "@mapbox/polyline" "^1.1.0" + "@opentripplanner/geocoder" "^3.0.0" + "@styled-icons/foundation" "^10.34.0" + "@turf/along" "^6.0.1" + 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/endpoints-overlay@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.1.1.tgz#e7029d95bd13436aacbc6f854c243d1fcf7e8570" @@ -2460,7 +2478,7 @@ "@opentripplanner/core-utils" "^11.4.0" prop-types "^15.7.2" -"@opentripplanner/itinerary-body@^5.2.6", "@opentripplanner/itinerary-body@^5.3.0", "@opentripplanner/itinerary-body@^5.3.3": +"@opentripplanner/itinerary-body@^5.3.0": version "5.3.3" resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.3.3.tgz#5202060ccd1a38fd6ed823331a00233a15305957" integrity sha512-3G0szbSObrQh3uliQI6Hx62iCqqpxvrxGo7X69r28S7s8fexoI1B/3B4lRC0D14BUUPaOisE5Rc2N10SjI6MtQ== @@ -2478,13 +2496,31 @@ react-resize-detector "^4.2.1" string-similarity "^4.0.4" -"@opentripplanner/location-field@^2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.20.tgz#ade02af802ba9295aa73cabc2351da758fcfeb4d" - integrity sha512-sYiemP4v2OmNWRKh2J0soLq9EO53piuJ8I5Du8X6wUfsTIk7yFH+xVLHN1IfA3XPRHy0gE8wEAnWzhxh4Qa+NQ== +"@opentripplanner/itinerary-body@^5.3.5": + version "5.3.5" + resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.3.5.tgz#e31ea005f374acaf9050653d5e77464d70522fa4" + integrity sha512-Ku/KX+G1wGhNqFUTqjXLGz5cYkujEg2fdnpOhyoKayidQbux+CbX0BkpVBR7DBMkVJsN7wWUWVirfbYFBCCSdA== + dependencies: + "@opentripplanner/core-utils" "^11.4.1" + "@opentripplanner/humanize-distance" "^1.2.0" + "@opentripplanner/icons" "^2.0.10" + "@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/location-field@^2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.22.tgz#9ed68dee8660223d4c25ab78a19baf8cfe7d7ec2" + integrity sha512-OiowT7EJ3UWGQzseaN9oCW1BcsdA4XawQCF/AhTmpT3CUfG7SmzHe6kMcyGSKEqTRiNiJ5hBoTvR49gHdrUToQ== dependencies: "@conveyal/geocoder-arcgis-geojson" "^0.0.3" - "@opentripplanner/core-utils" "^11.4.0" + "@opentripplanner/core-utils" "^11.4.1" "@opentripplanner/geocoder" "^3.0.0" "@opentripplanner/humanize-distance" "^1.2.0" "@opentripplanner/location-icon" "^1.4.1" @@ -2580,15 +2616,15 @@ "@opentripplanner/icons" "^2.0.10" flat "^5.0.2" -"@opentripplanner/transitive-overlay@^3.0.18": - version "3.0.18" - resolved "https://registry.yarnpkg.com/@opentripplanner/transitive-overlay/-/transitive-overlay-3.0.18.tgz#c225564355125a0978061704fa4de3e899902869" - integrity sha512-zOcxhNszDg/87flr3SZ9J53YA5L0P+YFHQc/so4ceuaVXfkCkuaE6WvubG0FFM7Dj7JE+vqbjqz5bEYI6Xj8qg== +"@opentripplanner/transitive-overlay@^3.0.20": + version "3.0.20" + resolved "https://registry.yarnpkg.com/@opentripplanner/transitive-overlay/-/transitive-overlay-3.0.20.tgz#ff794938bdd4a051d52a78b874fd109629740bc9" + integrity sha512-3S8LNTPhipGWLDxP3FSoVXc8ob0K8XsKLMi+NWEl2S8nxQoHAHIWZHh6uIHwOLglQNKuseyhOy9kvIT4QJJPCA== dependencies: "@mapbox/polyline" "^1.1.1" - "@opentripplanner/base-map" "^3.0.16" - "@opentripplanner/core-utils" "^11.2.3" - "@opentripplanner/itinerary-body" "^5.2.6" + "@opentripplanner/base-map" "^3.1.0" + "@opentripplanner/core-utils" "^11.4.1" + "@opentripplanner/itinerary-body" "^5.3.0" "@turf/bbox" "^6.5.0" "@turf/bearing" "^6.5.0" "@turf/destination" "^6.5.0" @@ -2632,10 +2668,10 @@ "@opentripplanner/base-map" "^3.0.16" "@opentripplanner/core-utils" "^11.2.3" -"@opentripplanner/types@^6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.5.1.tgz#c19c73e051e516e187e79202de276f6ed3bbc59e" - integrity sha512-5S4otkjzlNLqcbDeMXy3Xi6tcPQgQRoyQZX+uvEdPOTzIERr7wJoltyQCBwi49GX99F+jqyRbd08TJ6SnLapbA== +"@opentripplanner/types@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.5.2.tgz#1373d738479568d880a3b13670b0ec53a1a75bd5" + integrity sha512-2qDcKOrsLoXdwjRAdi4xcdDUsZGTnwBM+vfEf8TTuuWSnA+WYav3ldlMB4sugxIdLaVKXlOfe3F5lCEh9jAHWA== "@opentripplanner/vehicle-rental-overlay@^2.1.7": version "2.1.7" From 29886a06cdcba0aba9d4b7c4defe38f13c28cd32 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Thu, 8 Aug 2024 10:32:57 +0200 Subject: [PATCH 18/21] add `formatDuration` to itin-body input --- lib/components/narrative/line-itin/connected-itinerary-body.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/components/narrative/line-itin/connected-itinerary-body.js b/lib/components/narrative/line-itin/connected-itinerary-body.js index 7f4b65851..3a42c538c 100644 --- a/lib/components/narrative/line-itin/connected-itinerary-body.js +++ b/lib/components/narrative/line-itin/connected-itinerary-body.js @@ -19,6 +19,7 @@ import styled from 'styled-components' import TransitLegSummary from '@opentripplanner/itinerary-body/lib/defaults/transit-leg-summary' import { ComponentContext } from '../../../util/contexts' +import { formatDuration } from '../../../components/util/formatted-duration' import { MainPanelContent } from '../../../actions/ui-constants' import { setLegDiagram, setMapillaryId } from '../../../actions/map' import { setMainPanelContent, setViewedTrip } from '../../../actions/ui' @@ -115,6 +116,7 @@ class ConnectedItineraryBody extends Component { } } + config.formatDuration = formatDuration return ( Date: Thu, 15 Aug 2024 07:52:42 -0400 Subject: [PATCH 19/21] make i18n string checker happy --- lib/components/map/default-map.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/components/map/default-map.tsx b/lib/components/map/default-map.tsx index 005462418..027462f3b 100644 --- a/lib/components/map/default-map.tsx +++ b/lib/components/map/default-map.tsx @@ -118,6 +118,8 @@ function getLayerName(overlay, config, intl) { return intl.formatMessage({ id: 'components.MapLayers.park-and-ride' }) case 'stops': return intl.formatMessage({ id: 'components.MapLayers.stops' }) + case 'stations': + return intl.formatMessage({ id: 'components.MapLayers.stations' }) case 'rentalVehicles': if (overlay.network) return getCompanyNames([overlay.network], config, intl) From bb8fd019b49eb2c6f713e72fca9eb8a9f3102902 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Thu, 15 Aug 2024 07:55:26 -0400 Subject: [PATCH 20/21] add missing fr (INCOMPLETE) --- i18n/fr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/i18n/fr.yml b/i18n/fr.yml index 99a1985f2..4ec02b1e4 100644 --- a/i18n/fr.yml +++ b/i18n/fr.yml @@ -290,6 +290,7 @@ components: park-and-ride: Parcs relais satellite: Satellite shared-vehicles: Véhicules en partage + stations: Arrêts et stations stops: Arrêts et stations streets: Plan des rues MapillaryFrame: From db199f3b6799a0c764760ca5db3b645141d17d9f Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Thu, 15 Aug 2024 13:16:07 -0400 Subject: [PATCH 21/21] fix otp-ui deps --- .../viewers/__snapshots__/nearby-view.js.snap | 276 +++--------------- package.json | 2 +- yarn.lock | 52 ++-- 3 files changed, 73 insertions(+), 257 deletions(-) diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap index b3ded1369..b20164dd6 100644 --- a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap +++ b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap @@ -11662,11 +11662,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >
                                                                                                                        2. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                            >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                          1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                              >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                            1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                              1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                  >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                    >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                  1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                      >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                    1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                        >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                        viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                      1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                        viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                          >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                        1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                            >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                          1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                              >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                            1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                              1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                  >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                    >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                  1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                      >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                    1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                        >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                        viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                      1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                        viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                          >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                        1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                          viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                            >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                          1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                            viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                              >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                            1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                              viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                                >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                              1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                                viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                                  >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                                1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                                  viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                                    >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                                  1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                                    viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                                      >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >

                                                                                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` roundedTop={false} >

                                                                                                                                                                    1. >>>>>> dev + className="sc-lgqlnP fJJsyj pattern-row-item" >
                                                                                                                                                                      viewers > nearby view renders proper scooter dates 1`] = ` className="departure-times" >
                                                                                                                                                                        >>>>>> dev + className="sc-huZMQ crhfPk departure-times" >