Merge pull request #151 from opentripplanner/otp-ui-humanize-distance

OTP-UI humanize-distance

Author: binh-dam-ibigroup

lib/components/narrative/default/access-leg.js

@@ -1,10 +1,9 @@
-import React, {Component} from 'react'
+import { humanizeDistanceString } from '@opentripplanner/humanize-distance'
 import PropTypes from 'prop-types'
+import React, {Component} from 'react'
 
 import Icon from '../icon'
-
 import LegDiagramPreview from '../leg-diagram-preview'
-import { distanceString } from '../../../util/distance'
 import { getStepInstructions } from '../../../util/itinerary'
 import { formatDuration } from '../../../util/time'
 
@@ -50,7 +49,7 @@ export default class AccessLeg extends Component {
           {' '}
           <span className='leg-duration'>{formatDuration(leg.duration)}</span>
           {' '}
-          <span className='leg-distance'>({distanceString(leg.distance)})</span>
+          <span className='leg-distance'>({humanizeDistanceString(leg.distance)})</span>
         </button>
         {active &&
           <div className='step-by-step'>
@@ -62,7 +61,7 @@ export default class AccessLeg extends Component {
                     key={stepIndex}
                     className={`step ${stepIsActive ? 'active' : ''}`}
                     onClick={(e) => this._onStepClick(e, step, stepIndex)}>
-                    <span className='step-distance'>{distanceString(step.distance)}</span>
+                    <span className='step-distance'>{humanizeDistanceString(step.distance)}</span>
                     <span className='step-text'>{getStepInstructions(step)}</span>
                   </button>
                 )

lib/util/distance.js

@@ -1,4 +1,3 @@
-import * as distance from './distance'
 import * as itinerary from './itinerary'
 import * as map from './map'
 import * as profile from './profile'
@@ -9,7 +8,6 @@ import * as time from './time'
 import * as ui from './ui'
 
 const OtpUtils = {
-  distance,
   itinerary,
   map,
   profile,

lib/util/index.js

@@ -34,6 +34,7 @@
     "@opentripplanner/endpoints-overlay": "^0.0.19",
     "@opentripplanner/from-to-location-picker": "^0.0.19",
     "@opentripplanner/geocoder": "^0.0.19",
+    "@opentripplanner/humanize-distance": "^0.0.19",
     "@opentripplanner/icons": "^0.0.19",
     "@opentripplanner/itinerary-body": "^0.0.19",
     "@opentripplanner/location-field": "^0.0.19",