Merge branch 'dev' into fix-account-help-link

.gitignore

@@ -20,3 +20,6 @@ dist
 !example-config.yml
 !test-config.yml
 !har-mock-config.yml
+
+# vscode extensions
+.vscode

example-config.yml

@@ -338,6 +338,8 @@ itinerary:
   # Whether the plan first/previous/next/last buttons should be shown along with
   # plan trip itineraries.
   showPlanFirstLastButtons: false
+  # Show all walking legs regardless of distance
+  showAllWalkLegs: false
   # Filters out trips returned by OTP by default, unless specifically requested.
   # e.g. filters out walk-only itineraries if user has not explicitly asked for them.
   strictItineraryFiltering: false

lib/actions/apiV2.js

@@ -685,14 +685,15 @@ export const findRoute = (params) =>
             lang
             phone
           }
+          bikesAllowed
+          color
           longName
-          shortName
           mode
-          type
-          color
-          textColor
-          bikesAllowed
           routeBikesAllowed: bikesAllowed
+          shortName
+          sortOrder
+          textColor
+          type
           url
       
           patterns {
@@ -821,11 +822,12 @@ export function findRoutes() {
               id: gtfsId
               name
             }
+            color
             longName
-            shortName
             mode
+            shortName
+            sortOrder
             type
-            color
           }
         }
       `,
@@ -853,6 +855,7 @@ export function findRoutes() {
                 longName,
                 mode,
                 shortName,
+                sortOrder,
                 type
               } = route
               // Set color overrides if present
@@ -882,6 +885,7 @@ export function findRoutes() {
                 ),
                 origColor,
                 shortName,
+                sortOrder,
                 type,
                 v2: true
               }

lib/components/app/desktop-nav.tsx

@@ -1,4 +1,5 @@
 import { connect } from 'react-redux'
+import { isMobile } from '@opentripplanner/core-utils/lib/ui'
 import { Nav, Navbar } from 'react-bootstrap'
 import { useIntl } from 'react-intl'
 import React from 'react'
@@ -104,16 +105,21 @@ const DesktopNav = ({
         >
           <Navbar.Brand>
             <AppMenu />
-            {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
-            {/* @ts-ignore The dynamic tag is causing some trouble */}
-            <BrandingElement
-              className={branding && `with-icon icon-${branding}`}
-              {...brandingProps}
-            >
-              {/* A title is always rendered (e.g.for screen readers)
-                  but is visually-hidden if a branding icon is used. */}
-              <div className="navbar-title">{title}</div>
-            </BrandingElement>
+
+            {!isMobile() && (
+              <>
+                {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
+                {/* @ts-ignore The dynamic tag is causing some trouble */}
+                <BrandingElement
+                  className={branding && `with-icon icon-${branding}`}
+                  {...brandingProps}
+                >
+                  {/* A title is always rendered (e.g.for screen readers)
+                    but is visually-hidden if a branding icon is used. */}
+                  <div className="navbar-title">{title}</div>
+                </BrandingElement>
+              </>
+            )}
           </Navbar.Brand>
 
           <ViewSwitcher sticky />

lib/components/narrative/metro/attribute-utils.tsx

@@ -43,7 +43,7 @@ export const getFlexAttributes = (
   }
 }
 
-export const removeInsignifigantWalkLegs = (leg: Leg): boolean =>
+export const removeInsignificantWalkLegs = (leg: Leg): boolean =>
   // Return true only for non walk-legs or walking legs over 400 meters
   // TODO: Make the 400 meters configurable?
   leg.mode !== 'WALK' || leg.distance > 400

lib/components/narrative/metro/metro-itinerary-routes.tsx

@@ -4,6 +4,7 @@ import { Itinerary, Leg } from '@opentripplanner/types'
 import React from 'react'
 import styled from 'styled-components'
 
+import { AppReduxState } from '../../../util/state-types'
 import { getFormattedMode } from '../../../util/i18n'
 import FormattedDuration, {
   formatDuration
@@ -12,7 +13,7 @@ import InvisibleA11yLabel from '../../util/invisible-a11y-label'
 
 import {
   getItineraryRoutes,
-  removeInsignifigantWalkLegs
+  removeInsignificantWalkLegs
 } from './attribute-utils'
 import RouteBlock from './route-block'
 
@@ -65,6 +66,7 @@ type Props = {
   /** This is true when there is only one itinerary being shown and the itinerary-body is visible */
   expanded: boolean
   itinerary: Itinerary
+  showAllWalkLegs?: boolean
   showLegDurations?: boolean
 }
 
@@ -73,10 +75,13 @@ const MetroItineraryRoutes = ({
   expanded,
   itinerary,
   LegIcon,
+  showAllWalkLegs,
   showLegDurations
 }: Props): JSX.Element => {
   const intl = useIntl()
-  const routeLegs = itinerary.legs.filter(removeInsignifigantWalkLegs)
+  const routeLegs = showAllWalkLegs
+    ? itinerary.legs
+    : itinerary.legs.filter(removeInsignificantWalkLegs)
   const transitRoutes = getItineraryRoutes(itinerary, intl)
 
   return (
@@ -129,9 +134,9 @@ const MetroItineraryRoutes = ({
   )
 }
 
-// TODO: state type
-const mapStateToProps = (state: any) => ({
-  enableDot: !state.otp.config.itinerary?.disableMetroSeperatorDot
+const mapStateToProps = (state: AppReduxState) => ({
+  enableDot: !state.otp.config.itinerary?.disableMetroSeperatorDot,
+  showAllWalkLegs: state.otp.config.itinerary?.showAllWalkLegs
 })
 
 export default connect(mapStateToProps)(MetroItineraryRoutes)

lib/util/config-types.ts

@@ -276,6 +276,7 @@ export interface ItineraryConfig {
   onlyShowCountdownForRealtime?: boolean
   previewOverlay?: boolean
   renderRouteNamesInBlocks?: boolean
+  showAllWalkLegs?: boolean
   showFirstResultByDefault?: boolean
   showHeaderText?: boolean
   showLegDurations?: boolean