Skip to content

OTP-UI humanize-distance #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2020
Merged

OTP-UI humanize-distance #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13cf9ea
refactor(distance): Replace distance with @opentripplanner/humanize-d…
binh-dam-ibigroup Apr 7, 2020
7b5e934
Merge branch 'dev' into otp-ui-humanize-distance
binh-dam-ibigroup Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lib/components/narrative/default/access-leg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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'>
Expand All @@ -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>
)
Expand Down
26 changes: 0 additions & 26 deletions lib/util/distance.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions lib/util/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as distance from './distance'
import * as itinerary from './itinerary'
import * as map from './map'
import * as profile from './profile'
Expand All @@ -9,7 +8,6 @@ import * as time from './time'
import * as ui from './ui'

const OtpUtils = {
distance,
itinerary,
map,
profile,
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down