Merge pull request #726 from opentripplanner/printable-itin-stop-id

Stop ID in printable itinerary.

Author: demory

Diff for: lib/components/map/enhanced-stop-marker.js

@@ -8,6 +8,7 @@ import { connect } from 'react-redux'
 import { FormattedMessage } from 'react-intl'
 import { MapMarker } from '@styled-icons/fa-solid/MapMarker'
 import { Styled as StopsOverlayStyled } from '@opentripplanner/stops-overlay'
+import coreUtils from '@opentripplanner/core-utils'
 import FromToLocationPicker from '@opentripplanner/from-to-location-picker'
 import React, { Component } from 'react'
 import styled from 'styled-components'
@@ -93,10 +94,9 @@ class EnhancedStopMarker extends Component {
   render() {
     const { activeStopId, highlight, languageConfig, modeColors, stop } =
       this.props
-    const { code, id, lat, lon, name } = stop
-    const [, stopId] = id.split(':')
-    const stopCode = code || stopId
-    if (!stopCode) return null
+    const { id, lat, lon, name } = stop
+    const displayedStopId = coreUtils.itinerary.getDisplayedStopId(stop)
+    if (!displayedStopId) return null
 
     const mode = getModeFromStop(stop)
     let color = modeColors && modeColors[mode] ? modeColors[mode] : '#121212'
@@ -130,7 +130,7 @@ class EnhancedStopMarker extends Component {
                   <b>
                     <FormattedMessage id="components.EnhancedStopMarker.stopID" />
                   </b>{' '}
-                  {stopCode}
+                  {displayedStopId}
                 </span>
                 <ViewStopButton onClick={this.onClickView}>
                   {languageConfig.stopViewer || (

Diff for: lib/util/state.js

@@ -833,7 +833,10 @@ export function getTitle(state, intl) {
     case MainPanelContent.STOP_VIEWER:
       status = intl.formatMessage(
         { id: 'util.state.titleBarStopId' },
-        { stopId: viewedStop?.stopCode || viewedStop?.stopId }
+        {
+          stopId:
+            viewedStop && coreUtils.itinerary.getDisplayedStopId(viewedStop)
+        }
       )
       break
     default:

Diff for: lib/util/viewer.js

@@ -1,5 +1,7 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import { getMostReadableTextColor } from '@opentripplanner/core-utils/lib/route'
+import coreUtils from '@opentripplanner/core-utils'
 import tinycolor from 'tinycolor2'
 
 import { isBlank } from './ui'
@@ -54,17 +56,7 @@ export function routeIsValid(route, routeId) {
 }
 
 export function getStopName(stop) {
-  return `${stop.name} (${getStopCodeToDisplay(stop)})`
-}
-
-/**
- * Gets stop code for displaying to user.
- * @param  {Object} stop OTP stop entity
- * @return {string}      stop_code or cleaned stop_id
- */
-export function getStopCodeToDisplay(stop) {
-  if (!stop) return ''
-  return stop.code || stop.id.split(':')[1]
+  return `${stop.name} (${coreUtils.itinerary.getDisplayedStopId(stop)})`
 }
 
 /**