diff --git a/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap b/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap
new file mode 100644
index 000000000..9030fa631
--- /dev/null
+++ b/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap
@@ -0,0 +1,4456 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`components > viewers > stop viewer should render countdown times after midnight with no date if it is the previous day 1`] = `
+
+
+
+
+
+
+
+`;
+
+exports[`components > viewers > stop viewer should render countdown times for stop times departing 48+ hours from start of service 1`] = `
+
+
+
+
{/* The header bar, including the Toggle Map and Print buttons */}
@@ -87,7 +87,14 @@ class PrintLayout extends Component {
}
{/* The main itinerary body */}
- {itinerary && }
+ {itinerary
+ ?
+ : null
+ }
)
}
@@ -98,7 +105,7 @@ class PrintLayout extends Component {
const mapStateToProps = (state, ownProps) => {
return {
itinerary: getActiveItinerary(state.otp),
- companies: state.otp.currentQuery.companies,
+ configCompanies: state.otp.config.companies,
timeFormat: getTimeFormat(state.otp.config)
}
}
diff --git a/lib/components/app/responsive-webapp.js b/lib/components/app/responsive-webapp.js
index f70787102..36bfd1ce5 100644
--- a/lib/components/app/responsive-webapp.js
+++ b/lib/components/app/responsive-webapp.js
@@ -193,7 +193,13 @@ class RouterWrapper extends Component {
/>
{
+ // combine the router props with the other props that get
+ // passed to the exported component. This way it's possible for
+ // the PrintLayout component to receive the custom icons prop.
+ const props = {...this.props, ...routerProps}
+ return
+ }}
/>
{/* For any other route, simply return the web app. */}
- {moment(date).calendar(null, { sameElse: dateFormat }).split(' at')[0]}
+ {
+ moment(date, OTP_API_DATE_FORMAT)
+ .calendar(null, { sameElse: dateFormat })
+ .split(' at')[0]}
{timeStr}
diff --git a/lib/components/form/date-time-selector.js b/lib/components/form/date-time-selector.js
index 59ea3c97e..7abefb43b 100644
--- a/lib/components/form/date-time-selector.js
+++ b/lib/components/form/date-time-selector.js
@@ -6,7 +6,12 @@ import { connect } from 'react-redux'
import moment from 'moment'
import { setQueryParam } from '../../actions/form'
-import { getTimeFormat, getDateFormat } from '../../util/time'
+import {
+ OTP_API_DATE_FORMAT,
+ OTP_API_TIME_FORMAT,
+ getTimeFormat,
+ getDateFormat
+} from '../../util/time'
class DateTimeSelector extends Component {
static propTypes = {
@@ -36,7 +41,7 @@ class DateTimeSelector extends Component {
_onDayOfWeekChange = evt => {
this.props.setQueryParam({
- date: moment().weekday(evt.target.value).format('YYYY-MM-DD')
+ date: moment().weekday(evt.target.value).format(OTP_API_DATE_FORMAT)
})
}
@@ -53,21 +58,24 @@ class DateTimeSelector extends Component {
}
_onBackupTimeChange = (evt) => {
- const time = moment(evt.target.value, this.props.timeFormat).format('HH:mm')
- this.props.setQueryParam({ time })
+ const {setQueryParam, timeFormat} = this.props
+ const time = moment(evt.target.value, timeFormat).format(OTP_API_TIME_FORMAT)
+ setQueryParam({ time })
}
_onBackupDateChange = (evt) => {
- const date = moment(evt.target.value, this.props.dateFormat).format('YYYY-MM-DD')
- this.props.setQueryParam({ date })
+ const {setQueryParam, dateFormat} = this.props
+ const date = moment(evt.target.value, dateFormat).format(OTP_API_DATE_FORMAT)
+ setQueryParam({ date })
}
_setDepartArrive = (type) => {
- this.props.setQueryParam({ departArrive: type })
+ const {setQueryParam} = this.props
+ setQueryParam({ departArrive: type })
if (type === 'NOW') {
- this.props.setQueryParam({
- date: moment().format('YYYY-MM-DD'),
- time: moment().format('HH:mm')
+ setQueryParam({
+ date: moment().format(OTP_API_DATE_FORMAT),
+ time: moment().format(OTP_API_TIME_FORMAT)
})
}
}
@@ -148,7 +156,11 @@ class DateTimeSelector extends Component {
{['NOW', 'DEPART', 'ARRIVE'].map((type, i) => (
-
+
))}
@@ -158,7 +170,7 @@ class DateTimeSelector extends Component {
@@ -167,7 +179,7 @@ class DateTimeSelector extends Component {
diff --git a/lib/components/form/location-field.js b/lib/components/form/location-field.js
index 296006f24..ef5036a7f 100644
--- a/lib/components/form/location-field.js
+++ b/lib/components/form/location-field.js
@@ -19,6 +19,7 @@ import { distanceStringImperial } from '../../util/distance'
import getGeocoder from '../../util/geocoder'
import { formatStoredPlaceName } from '../../util/map'
import { getActiveSearch, getShowUserSettings } from '../../util/state'
+import { isIE } from '../../util/ui'
class LocationField extends Component {
static propTypes = {
@@ -518,10 +519,27 @@ function createOption (icon, title, onSelect, isActive, isLast) {
// style={{ borderBottom: '1px solid lightgrey' }}
key={itemKey++}
active={isActive}>
-
-
-
{title}
-
+ {isIE()
+ // In internet explorer 11, some really weird stuff is happening where it
+ // is not possible to click the text of the title, but if you click just
+ // above it, then it works. So, if using IE 11, just return the title text
+ // and avoid all the extra fancy stuff.
+ // See https://github.com/ibi-group/trimet-mod-otp/issues/237
+ ? title
+ : (
+
{leg.routeShortName} {leg.routeLongName} to {leg.to.name}
-
Board at {leg.from.name} at {formatTime(leg.startTime, timeOptions)}
- {interlineFollows
- ?
Stay on board at {leg.to.name}
- :
Get off at {leg.to.name} at {formatTime(leg.endTime, timeOptions)}
- }
+
+ Board at {leg.from.name}{' '}
+ at {formatTime(leg.startTime, timeOptions)}
+
+
+ {interlineFollows
+ ? Stay on board at {leg.to.name}
+ :
+ Get off at {leg.to.name}{' '}
+ at {formatTime(leg.endTime, timeOptions)}
+
+ }
+
@@ -92,19 +134,49 @@ class AccessLeg extends Component {
}
render () {
- const { leg } = this.props
+ const { configCompanies, customIcons, leg } = this.props
+
+ // calculate leg mode label in a special way for this component
+ let legModeLabel = getLegModeLabel(leg)
+
+ if (leg.rentedBike) {
+ // FIXME: Special case for TriMet that needs to be refactored to
+ // incorporate actual company.
+ legModeLabel = 'Ride BIKETOWN bike'
+ } else if (leg.rentedCar) {
+ // Add extra information to printview that would otherwise clutter up
+ // other places that use the getLegModeLabel function
+ const companiesLabel = getCompaniesLabelFromNetworks(
+ leg.from.networks,
+ configCompanies
+ )
+ legModeLabel = `Drive ${companiesLabel} ${leg.from.name}`
+ } else if (leg.rentedVehicle) {
+ const companiesLabel = getCompaniesLabelFromNetworks(
+ leg.from.networks,
+ configCompanies
+ )
+ legModeLabel = `Ride ${companiesLabel} eScooter`
+ }
+
return (
{getStepDirection(step)} on {getStepStreetName(step)}
+
+ {getStepDirection(step)} on {getStepStreetName(step)}
+
)
})}
@@ -121,20 +193,26 @@ class TNCLeg extends Component {
}
render () {
- const { leg } = this.props
+ const { customIcons, leg } = this.props
const { tncData } = leg
if (!tncData) return null
return (
-
+
{getLegIcon(leg, customIcons)}
Take {tncData.displayName} to {leg.to.name}
-
Estimated wait time for pickup: {formatDuration(tncData.estimatedArrival)}
-
Estimated travel time: {formatDuration(leg.duration)} (does not account for traffic)
+
+ Estimated wait time for pickup:{' '}
+ {formatDuration(tncData.estimatedArrival)}
+
+
+ Estimated travel time:{' '}
+ {formatDuration(leg.duration)} (does not account for traffic)
+
diff --git a/lib/components/viewers/stop-viewer.js b/lib/components/viewers/stop-viewer.js
index 90ec9ddba..480b31eee 100644
--- a/lib/components/viewers/stop-viewer.js
+++ b/lib/components/viewers/stop-viewer.js
@@ -14,7 +14,7 @@ import { findStop, findStopTimesForStop } from '../../actions/api'
import { forgetStop, rememberStop, setLocation } from '../../actions/map'
import { routeComparator } from '../../util/itinerary'
import { getShowUserSettings, getStopViewerConfig } from '../../util/state'
-import { formatDuration, formatStopTime, getTimeFormat } from '../../util/time'
+import { formatDuration, formatSecondsAfterMidnight, getTimeFormat, getUserTimezone } from '../../util/time'
class StopViewer extends Component {
state = {}
@@ -136,6 +136,15 @@ class StopViewer extends Component {
const id = `${routeId}-${headsign}`
if (!(id in stopTimesByPattern)) {
const route = stopData.routes.find(r => r.id === routeId)
+ // in some cases, the TriMet transit index will not return all routes
+ // that serve a stop. Perhaps it doesn't return some routes if the
+ // route only performs a drop-off at the stop... not quite sure. So a
+ // check is needed to make sure we don't add data for routes not found
+ // from the routes query.
+ if (!route) {
+ console.warn(`Route with id ${routeId} not found in list of routes! No stop times from this route will be displayed.`)
+ return
+ }
stopTimesByPattern[id] = {
id,
route,
@@ -203,7 +212,9 @@ class StopViewer extends Component {
{' '}
- {moment(stopData.stopTimesLastUpdated).format(timeFormat)}
+ {moment(stopData.stopTimesLastUpdated)
+ .tz(getUserTimezone())
+ .format(timeFormat)}
Plan a trip:{' '}
@@ -387,44 +398,55 @@ class PatternRow extends Component {
}
const ONE_HOUR_IN_SECONDS = 3600
+const ONE_DAY_IN_SECONDS = 86400
/**
- * @param {string} [homeTimezone='America/New_York'] Timezone string
- * @return {number} Current time in home timezone in seconds since midnight
+ * Helper method to generate stop time w/ status icon
+ *
+ * @param {object} stopTime A stopTime object as received from a transit index API
+ * @param {string} [homeTimezone] If configured, the timezone of the area
+ * @param {string} [soonText='Due'] The text to display for departure times
+ * about to depart in a short amount of time
+ * @param {string} timeFormat A valid moment.js formatting string
*/
-function getHomeTime (homeTimezone = 'America/New_York') {
- const now = moment()
- return now.tz(homeTimezone).diff(now.clone().startOf('day'), 'seconds')
-}
-
-// helper method to generate stop time w/ status icon
function getFormattedStopTime (stopTime, homeTimezone, soonText = 'Due', timeFormat) {
- const now = moment()
- const serviceDay = moment(stopTime.serviceDay * 1000)
- const currentHomeTime = getHomeTime(homeTimezone)
- const differentDay = now.date() !== serviceDay.date()
-
- const userTimeZone = moment.tz.guess()
+ const userTimeZone = getUserTimezone()
const inHomeTimezone = homeTimezone && homeTimezone === userTimeZone
- // Determine whether to show departure as countdown (e.g. "5 min") or as HH:mm time
- const secondsUntilDeparture = stopTime.realtimeDeparture - currentHomeTime
- const departsInFuture = stopTime.realtimeDeparture > currentHomeTime
- // Show the exact time if the departure occurs after midnight and if the
- // departure happens within an hour.
- // FIXME: It's unclear why this was designed to show exact time after midnight.
- // We should determine whether this is the desired behavior.
- const showCountdown = !differentDay &&
- secondsUntilDeparture < ONE_HOUR_IN_SECONDS &&
- departsInFuture
+
+ const now = moment().tz(homeTimezone)
+ const serviceDay = moment(stopTime.serviceDay * 1000).tz(homeTimezone)
+ // Determine if arrival occurs on different day, making sure to account for
+ // any extra days added to the service day if it arrives after midnight. Note:
+ // this can handle the rare (and non-existent?) case where an arrival occurs
+ // 48:00 hours (or more) from the start of the service day.
+ const departureTimeRemainder = stopTime.realtimeDeparture % ONE_DAY_IN_SECONDS
+ const daysAfterServiceDay = (stopTime.realtimeDeparture - departureTimeRemainder) / ONE_DAY_IN_SECONDS
+ const departureDay = serviceDay.add(daysAfterServiceDay, 'day')
+ const vehicleDepartsToday = now.dayOfYear() === departureDay.dayOfYear()
+ // Determine whether to show departure as countdown (e.g. "5 min") or as HH:mm
+ // time.
+ const secondsUntilDeparture = (stopTime.realtimeDeparture + stopTime.serviceDay) - now.unix()
+ // Determine if vehicle arrives after midnight in order to advance the day of
+ // the week when showing arrival time/day.
+ const departsInFuture = secondsUntilDeparture > 0
+ // Show the exact time if the departure happens within an hour.
+ const showCountdown = secondsUntilDeparture < ONE_HOUR_IN_SECONDS && departsInFuture
// Use "soon text" (e.g., Due) if vehicle is approaching.
const countdownString = secondsUntilDeparture < 60
? soonText
: formatDuration(secondsUntilDeparture)
- // Only show timezone (e.g., PDT) if user is not in home time zone (e.g., user
- // in New York, but viewing a trip planner for service based in Los Angeles).
- const tzToDisplay = inHomeTimezone ? null : homeTimezone
- const formattedTime = formatStopTime(stopTime.realtimeDeparture, tzToDisplay, timeFormat)
+ const formattedTime = formatSecondsAfterMidnight(
+ stopTime.realtimeDeparture,
+ // Only show timezone (e.g., PDT) if user is not in home time zone (e.g., user
+ // in New York, but viewing a trip planner for service based in Los Angeles).
+ inHomeTimezone ? timeFormat : `${timeFormat} z`
+ )
+ // We only want to show the day of the week if the arrival is on a
+ // different day and we're not showing the countdown string. This avoids
+ // cases such as when it's Wednesday at 11:55pm and an arrival occurs at
+ // Thursday 12:19am. We don't want the time to read: 'Thursday, 24 minutes'.
+ const showDayOfWeek = !vehicleDepartsToday && !showCountdown
return (
{/* the vertical strip map */}
@@ -128,9 +134,10 @@ class TripViewer extends Component {
const mapStateToProps = (state, ownProps) => {
const viewedTrip = state.otp.ui.viewedTrip
return {
+ languageConfig: state.otp.config.language,
+ timeFormat: getTimeFormat(state.otp.config),
tripData: state.otp.transitIndex.trips[viewedTrip.tripId],
- viewedTrip,
- languageConfig: state.otp.config.language
+ viewedTrip
}
}
diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index a3e473400..89ed97830 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -12,48 +12,10 @@ import {
import { isTransit, getTransitModes } from '../util/itinerary'
import { filterProfileOptions } from '../util/profile'
import { getItem, removeItem, storeItem } from '../util/storage'
+import { getUserTimezone } from '../util/time'
import { MainPanelContent, MobileScreens } from '../actions/ui'
-const defaultConfig = {
- autoPlan: false,
- debouncePlanTimeMs: 0,
- language: {},
- operators: [],
- realtimeEffectsDisplayThreshold: 120,
- routingTypes: [],
- stopViewer: {
- numberOfDepartures: 3, // per pattern
- // This is set to 345600 (four days) so that, for example, if it is Friday and
- // a route does not begin service again until Monday, we are showing its next
- // departure and it is not entirely excluded from display.
- timeRange: 345600 // four days in seconds
- }
-}
-
-// Load user settings from local storage.
-// TODO: Make this work with settings fetched from alternative storage system
-// (e.g., OTP backend middleware containing user profile system).
-// User overrides determine user's default mode/query parameters.
-const userOverrides = getItem('defaultQuery', {})
-// Combine user overrides with default query to get default search settings.
-const defaults = Object.assign(getDefaultQuery(), userOverrides)
-// Whether to auto-refresh stop arrival times in the Stop Viewer.
-const autoRefreshStopTimes = getItem('autoRefreshStopTimes', true)
-// User's home and work locations
-const home = getItem('home')
-const work = getItem('work')
-// Whether recent searches and places should be tracked in local storage.
-const trackRecent = getItem('trackRecent', false)
-// Recent places used in trip plan searches.
-const recentPlaces = getItem('recent', [])
-// List of user's favorite stops.
-const favoriteStops = getItem('favoriteStops', [])
-// Recent trip plan searches (excluding time/date parameters to avoid complexity).
-const recentSearches = getItem('recentSearches', [])
-// Filter valid locations found into locations list.
-const locations = [home, work].filter(p => p)
const MAX_RECENT_STORAGE = 5
-// TODO: parse and merge URL query params w/ default query
// TODO: fire planTrip action if default query is complete/error-free
@@ -93,7 +55,64 @@ function validateInitalState (initialState) {
}
}
-function createOtpReducer (config, initialQuery) {
+/**
+ * Create the initial state of otp-react-redux using user-provided config, any
+ * items in localStorage and a few defaults.
+ */
+export function getInitialState (userDefinedConfig, initialQuery) {
+ const defaultConfig = {
+ autoPlan: false,
+ debouncePlanTimeMs: 0,
+ language: {},
+ operators: [],
+ realtimeEffectsDisplayThreshold: 120,
+ routingTypes: [],
+ stopViewer: {
+ numberOfDepartures: 3, // per pattern
+ // This is set to 345600 (four days) so that, for example, if it is Friday and
+ // a route does not begin service again until Monday, we are showing its next
+ // departure and it is not entirely excluded from display.
+ timeRange: 345600 // four days in seconds
+ }
+ }
+
+ const config = Object.assign(defaultConfig, userDefinedConfig)
+
+ if (!config.homeTimezone) {
+ config.homeTimezone = getUserTimezone()
+ console.warn(
+ `Config value 'homeTimezone' not configured for this webapp!\n
+ This value is recommended in order to properly display stop times for
+ users that are not in the timezone that the transit system is in. The
+ detected user timezone of '${config.homeTimezone}' will be used. Hopefully
+ that is the right one...`
+ )
+ }
+
+ // Load user settings from local storage.
+ // TODO: Make this work with settings fetched from alternative storage system
+ // (e.g., OTP backend middleware containing user profile system).
+ // User overrides determine user's default mode/query parameters.
+ const userOverrides = getItem('defaultQuery', {})
+ // Combine user overrides with default query to get default search settings.
+ const defaults = Object.assign(getDefaultQuery(config), userOverrides)
+ // Whether to auto-refresh stop arrival times in the Stop Viewer.
+ const autoRefreshStopTimes = getItem('autoRefreshStopTimes', true)
+ // User's home and work locations
+ const home = getItem('home')
+ const work = getItem('work')
+ // Whether recent searches and places should be tracked in local storage.
+ const trackRecent = getItem('trackRecent', false)
+ // Recent places used in trip plan searches.
+ const recentPlaces = getItem('recent', [])
+ // List of user's favorite stops.
+ const favoriteStops = getItem('favoriteStops', [])
+ // Recent trip plan searches (excluding time/date parameters to avoid complexity).
+ const recentSearches = getItem('recentSearches', [])
+ // Filter valid locations found into locations list.
+ const locations = [home, work].filter(p => p)
+ // TODO: parse and merge URL query params w/ default query
+
// populate query by merging any provided query params w/ the default params
const currentQuery = Object.assign(defaults, initialQuery)
// Add configurable locations to home and work locations
@@ -117,8 +136,8 @@ function createOtpReducer (config, initialQuery) {
queryModes = ensureSingleAccessMode(queryModes)
}
- const initialState = {
- config: Object.assign(defaultConfig, config),
+ return {
+ config,
currentQuery,
location: {
currentPosition: {
@@ -178,6 +197,10 @@ function createOtpReducer (config, initialQuery) {
diagramLeg: null
}
}
+}
+
+function createOtpReducer (config, initialQuery) {
+ const initialState = getInitialState(config, initialQuery)
// validate the inital state
validateInitalState(initialState)
diff --git a/lib/util/geocoder.js b/lib/util/geocoder.js
index c3aae4001..8ce68c9dc 100644
--- a/lib/util/geocoder.js
+++ b/lib/util/geocoder.js
@@ -20,14 +20,8 @@ class Geocoder {
* address or POI, attempt to find possible matches.
*/
autocomplete (query) {
- const {apiKey, baseUrl, boundary, focusPoint} = this.geocoderConfig
- return this.api.autocomplete({
- apiKey,
- boundary,
- focusPoint,
- url: baseUrl ? `${baseUrl}/autocomplete` : undefined,
- ...query
- }).then(this._rewriteAutocompleteResponse)
+ return this.api.autocomplete(this.getAutocompleteQuery(query))
+ .then(this.rewriteAutocompleteResponse)
}
/**
@@ -50,46 +44,76 @@ class Geocoder {
* GPS coordiante.
*/
reverse (query) {
+ return this.api.reverse(this.getReverseQuery(query))
+ .then(this.rewriteReverseResponse)
+ }
+
+ /**
+ * Perform a search query. A search query is different from autocomplete in
+ * that it is assumed that the text provided is more or less a complete
+ * well-fromatted address.
+ */
+ search (query) {
+ return this.api.search(this.getSearchQuery(query))
+ .then(this.rewriteSearchResponse)
+ }
+
+ /**
+ * Default autocomplete query generator
+ */
+ getAutocompleteQuery (query) {
+ const {apiKey, baseUrl, boundary, focusPoint} = this.geocoderConfig
+ return {
+ apiKey,
+ boundary,
+ focusPoint,
+ url: baseUrl ? `${baseUrl}/autocomplete` : undefined,
+ ...query
+ }
+ }
+
+ /**
+ * Default reverse query generator
+ */
+ getReverseQuery (query) {
const {apiKey, baseUrl} = this.geocoderConfig
- return this.api.reverse({
+ return {
apiKey,
format: true,
url: baseUrl ? `${baseUrl}/reverse` : undefined,
...query
- }).then(this._rewriteReverseResponse)
+ }
}
/**
- * Perform a search query. This query assumes that the text being searched
- * is more-or-less an exact address or POI.
+ * Default search query generator.
*/
- search (query) {
+ getSearchQuery (query) {
const {apiKey, baseUrl, boundary, focusPoint} = this.geocoderConfig
- return this.api.search({
+ return {
apiKey,
boundary,
focusPoint,
- sources: null,
url: baseUrl ? `${baseUrl}/search` : undefined,
format: false, // keep as returned GeoJSON,
...query
- }).then(this._rewriteSearchResponse)
+ }
}
/**
* Default rewriter for autocomplete responses
*/
- _rewriteAutocompleteResponse (response) { return response }
+ rewriteAutocompleteResponse (response) { return response }
/**
* Default rewriter for reverse responses
*/
- _rewriteReverseResponse (response) { return response }
+ rewriteReverseResponse (response) { return response }
/**
* Default rewriter for search responses
*/
- _rewriteSearchResponse (response) { return response }
+ rewriteSearchResponse (response) { return response }
}
/**
@@ -118,7 +142,7 @@ class ArcGISGeocoder extends Geocoder {
* Rewrite an autocomplete response into an application specific data format.
* Also, filter out any results that are collections.
*/
- _rewriteAutocompleteResponse (response) {
+ rewriteAutocompleteResponse (response) {
return {
// remove any autocomplete results that are collections
// (eg multiple Starbucks)
@@ -137,7 +161,7 @@ class ArcGISGeocoder extends Geocoder {
* Rewrite the response into an application-specific data format using the
* first feature returned from the geocoder.
*/
- _rewriteReverseResponse (response) {
+ rewriteReverseResponse (response) {
const { features, query } = response
const { lat, lon } = query
return {
@@ -159,7 +183,7 @@ class NoApiGeocoder extends Geocoder {
* Use coordinate string parser.
*/
autocomplete (query) {
- return this._parseCoordinateString(query.text)
+ return this.parseCoordinateString(query.text)
}
/**
@@ -167,8 +191,8 @@ class NoApiGeocoder extends Geocoder {
*/
reverse (query) {
let { lat, lon } = query.point
- lat = this._roundGPSDecimal(lat)
- lon = this._roundGPSDecimal(lon)
+ lat = this.roundGPSDecimal(lat)
+ lon = this.roundGPSDecimal(lon)
return Promise.resolve({ lat, lon, name: `${lat}, ${lon}` })
}
@@ -176,14 +200,14 @@ class NoApiGeocoder extends Geocoder {
* Use coordinate string parser.
*/
search (query) {
- return this._parseCoordinateString(query.text)
+ return this.parseCoordinateString(query.text)
}
/**
* Attempt to parse the input as a GPS coordinate. If parseable, return a
* feature.
*/
- _parseCoordinateString (string) {
+ parseCoordinateString (string) {
let feature
try {
feature = {
@@ -201,7 +225,7 @@ class NoApiGeocoder extends Geocoder {
return Promise.resolve({ features: [feature] })
}
- _roundGPSDecimal (number) {
+ roundGPSDecimal (number) {
const roundFactor = 100000
return Math.round(number * roundFactor) / roundFactor
}
@@ -211,14 +235,55 @@ class NoApiGeocoder extends Geocoder {
* Geocoder implementation for the Pelias geocoder.
* See https://pelias.io
*
+ * This is exported for testing purposes only.
+ *
* @extends Geocoder
*/
-class PeliasGeocoder extends Geocoder {
+export class PeliasGeocoder extends Geocoder {
+ /**
+ * Generate an autocomplete query specifically for the Pelias API. The
+ * `sources` parameter is a Pelias-specific option.
+ */
+ getAutocompleteQuery (query) {
+ const {apiKey, baseUrl, boundary, focusPoint, sources} = this.geocoderConfig
+ return {
+ apiKey,
+ boundary,
+ focusPoint,
+ // explicitly send over null for sources if provided sources is not truthy
+ // in order to avoid default isomorphic-mapzen-search sources form being
+ // applied
+ sources: sources || null,
+ url: baseUrl ? `${baseUrl}/autocomplete` : undefined,
+ ...query
+ }
+ }
+
+ /**
+ * Generate a search query specifically for the Pelias API. The
+ * `sources` parameter is a Pelias-specific option.
+ */
+ getSearchQuery (query) {
+ const {apiKey, baseUrl, boundary, focusPoint, sources} = this.geocoderConfig
+ return {
+ apiKey,
+ boundary,
+ focusPoint,
+ // explicitly send over null for sources if provided sources is not truthy
+ // in order to avoid default isomorphic-mapzen-search sources form being
+ // applied
+ sources: sources || null,
+ url: baseUrl ? `${baseUrl}/search` : undefined,
+ format: false, // keep as returned GeoJSON,
+ ...query
+ }
+ }
+
/**
* Rewrite the response into an application-specific data format using the
* first feature returned from the geocoder.
*/
- _rewriteReverseResponse (response) {
+ rewriteReverseResponse (response) {
const { 'point.lat': lat, 'point.lon': lon } = response.isomorphicMapzenSearchQuery
return {
lat,
diff --git a/lib/util/itinerary.js b/lib/util/itinerary.js
index 412e1bfae..6241d3add 100644
--- a/lib/util/itinerary.js
+++ b/lib/util/itinerary.js
@@ -379,7 +379,7 @@ export function toSentenceCase (str) {
*/
export function getLegIcon (leg, customIcons) {
// check if a custom function exists for determining the icon for a leg
- if (typeof customIcons.customIconForLeg === 'function') {
+ if (customIcons && typeof customIcons.customIconForLeg === 'function') {
// function exits, get the icon string lookup. It's possible for there to be
// a custom function that only returns a string for when a leg meets the
// criteria of the custom function
@@ -402,7 +402,11 @@ export function getLegIcon (leg, customIcons) {
return getIcon(iconStr, customIcons)
}
-export function getCompanyForNetwork (networkString, companies = []) {
+/**
+ * Get the configured company object for the given network string if the company
+ * has been defined in the provided companies array config.
+ */
+function getCompanyForNetwork (networkString, companies = []) {
const company = companies.find(co => co.id === networkString)
if (!company) {
console.warn(`No company found in config.yml that matches rented vehicle network: ${networkString}`, companies)
@@ -410,6 +414,19 @@ export function getCompanyForNetwork (networkString, companies = []) {
return company
}
+/**
+ * Get a string label to display from a list of vehicle rental networks.
+ *
+ * @param {Array} networks A list of network ids.
+ * @param {Array