Merge pull request #125 from conveyal/dev

v1.2.0

Author: trevorgerhardt

configurations/default/messages.yml

@@ -12,6 +12,7 @@ Systems:
   BestTripTitle: Fastest trip
   AlternateTripsTitle: Alternatively use
   Waiting: waiting included
+  NoAccess: No data from this point...
 Faster: faster
 NewTrip: New Trip
 Geocoding:

package.json

@@ -10,7 +10,7 @@
     "pretest": "yarn",
     "semantic-release": "semantic-release",
     "start": "mastarm build --serve",
-    "test": "mastarm lint src"
+    "test": "mastarm lint src && mastarm build"
   },
   "repository": {
     "type": "git",
@@ -28,27 +28,30 @@
   "homepage": "https://github.com/conveyal/taui",
   "dependencies": {
     "@conveyal/gridualizer": "^2.1.0",
-    "@conveyal/lonlat": "^1.3.0",
-    "@conveyal/woonerf": "^4.0.0",
+    "@conveyal/lonlat": "^1.4.0",
+    "@conveyal/woonerf": "^4.1.0",
     "@mapbox/polyline": "^1.0.0",
     "d3-scale": "^2.1.0",
     "date-fns": "^1.29.0",
-    "debug": "^3.1.0",
+    "debug": "^4.1.0",
     "isomorphic-fetch": "^2.2.1",
-    "jsolines": "^1.0.2",
+    "jsolines": "^2.1.0",
     "leaflet": "^1.3.4",
     "lodash": "^4.17.10",
-    "mastarm": "^4.3.1",
-    "react": "^16.5.1",
-    "react-dom": "^16.5.1",
+    "mastarm": "^4.4.2",
+    "react": "^16.6.3",
+    "react-dom": "^16.6.3",
     "react-leaflet": "^1.9.1",
+    "react-leaflet-vectorgrid": "^2.1.3",
     "react-redux": "^5.0.7",
     "react-select": "^1.2.1",
-    "redux": "^4.0.0",
-    "redux-actions": "^2.6.1",
+    "react-select-fast-filter-options": "^0.2.3",
+    "react-virtualized-select": "^3.1.3",
+    "redux": "^4.0.1",
+    "redux-actions": "^2.6.4",
     "redux-mock-store": "1.5.3",
-    "reselect": "^3.0.1",
-    "semantic-release": "^15.9.9"
+    "reselect": "^4.0.0",
+    "semantic-release": "^15.12.4"
   },
   "standard": {
     "parser": "babel-eslint"

src/actions/geocode.js

@@ -5,13 +5,15 @@ import fetch from '@conveyal/woonerf/fetch'
 import {MAPBOX_GEOCODING_URL} from '../constants'
 import type {LonLat} from '../types'
 
+import cacheURL from '../utils/cache-url'
+
 /**
  * Format URL for fetching with query parameters
  */
 function formatURL (text: string, opts) {
   opts.access_token = process.env.MAPBOX_ACCESS_TOKEN
   const queryParams = Object.keys(opts).map(k => `${k}=${opts[k]}`).join('&')
-  return `${MAPBOX_GEOCODING_URL}/${text}.json?${queryParams}`
+  return cacheURL(`${MAPBOX_GEOCODING_URL}/${text}.json?${queryParams}`)
 }
 
 /**

src/actions/grid.js

@@ -1,6 +1,7 @@
 // @flow
 import fetch from 'isomorphic-fetch'
 
+import cacheURL from '../utils/cache-url'
 import createGrid from '../utils/create-grid'
 
 export function loadGrid (
@@ -11,7 +12,7 @@ export function loadGrid (
     url: string
   }
 ) {
-  return fetch(grid.url)
+  return fetch(cacheURL(grid.url))
     .then(res => res.arrayBuffer())
     .then(arrayBuffer => ({
       type: 'set grid',

src/actions/location.js

@@ -46,12 +46,18 @@ export const setStart = (start: any) => {
 /**
  * Update the start
  */
-export const updateStart = (value: Location) => [
-  setNetworksToLoading(),
-  addActionLogItem(`Updating start to ${value.label}`),
-  setStart(value),
-  fetchAllTimesAndPathsForCoordinate(value.position)
-]
+export const updateStart = (value?: Location) =>
+  value && value.label && value.position
+    ? [
+      setNetworksToLoading(),
+      addActionLogItem(`Updating start to ${value.label}`),
+      setStart(value),
+      fetchAllTimesAndPathsForCoordinate(value.position)
+    ]
+    : [
+      addActionLogItem('Clearing start'),
+      setStart()
+    ]
 
 export const updateStartPosition = (position: LonLat) => [
   reverseGeocode(position, features =>
@@ -63,8 +69,8 @@ export const updateStartPosition = (position: LonLat) => [
 /**
  * Update the end point
  */
-export const updateEnd = (value: Location) => [
-  addActionLogItem(`Updating end point to ${value.label}`),
+export const updateEnd = (value?: Location) => [
+  addActionLogItem(value ? `Updating end to ${value.label}` : 'Clearing end'),
   setEnd(value)
 ]
 

src/actions/network.js

@@ -5,6 +5,7 @@ import fetch, {fetchMultiple} from '@conveyal/woonerf/fetch'
 import {retrieveConfig, storeConfig} from '../config'
 import {ACCESSIBILITY_IS_LOADING, ACCESSIBILITY_IS_EMPTY} from '../constants'
 import type {LonLat} from '../types'
+import cacheURL from '../utils/cache-url'
 import coordinateToPoint, {pointToCoordinate} from '../utils/coordinate-to-point'
 import {parsePathsData, warnForInvalidPaths} from '../utils/parse-paths-data'
 import {parseTimesData} from '../utils/parse-times-data'
@@ -84,7 +85,7 @@ export const initialize = (startCoordinate?: LonLat) => (dispatch, getState) =>
     }
 
     dispatch(fetch({
-      url: 'config.json',
+      url: cacheURL('config.json'),
       next: response => {
         const c = response.value
         storeConfig(c)
@@ -131,7 +132,8 @@ export const loadDataset = (
   dispatch(fetchMultiple({
     fetches: networks.reduce((urls, n) => [
       ...urls,
-      {url: `${n.url}/request.json`}, {url: `${n.url}/transitive.json`}
+      {url: cacheURL(`${n.url}/request.json`)},
+      {url: cacheURL(`${n.url}/transitive.json`)}
     ], []),
     next: responses => {
       let offset = 0
@@ -214,41 +216,60 @@ const fetchTimesAndPathsForNetworkAtCoordinate = (network, coordinate, currentZo
   ]
 }
 
-const fetchTimesAndPathsForNetworkAtIndex = (network, originPoint, index) =>
-  fetchMultiple({
-    fetches: [
-      {
-        url: `${network.url}/${index}_times.dat`
-      },
-      {
-        url: `${network.url}/${index}_paths.dat`
-      }
-    ],
-    next: (error, responses) => {
+const fetchTimesAndPathsForNetworkAtIndex = (network, originPoint, index) => [
+  setNetwork({
+    ...network,
+    originPoint,
+    paths: null,
+    pathsPerTarget: null,
+    targets: null,
+    travelTimeSurface: null
+  }),
+  fetch({
+    url: cacheURL(`${network.url}/${index}_paths.dat`),
+    next: (error, response) => {
       if (error) {
         console.error(error)
-        if (error.status === 404) return logError('Data not available for these coordinates.')
-        return logError('Error while retrieving data for these coordinates.')
+        return logError(error.status === 400
+          ? 'Paths data not available for these coordinates.'
+          : 'Error while retrieving paths for these coordinates.')
       }
 
-      const [timesResponse, pathsResponse] = responses
-      const travelTimeSurface = parseTimesData(timesResponse.value)
-      const {paths, pathsPerTarget, targets} = parsePathsData(pathsResponse.value)
+      const {paths, pathsPerTarget, targets} = parsePathsData(response.value)
 
-      if (process.env.NODE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'test') {
         warnForInvalidPaths(paths, network.transitive)
       }
 
       return [
-        logItem(`Found times and paths for ${index}...`),
+        logItem(`Found paths for ${index}...`),
         setNetwork({
-          ...network,
-          originPoint,
+          name: network.name,
           paths,
           pathsPerTarget,
-          targets,
+          targets
+        })
+      ]
+    }
+  }),
+  fetch({
+    url: cacheURL(`${network.url}/${index}_times.dat`),
+    next: (error, timesResponse) => {
+      if (error) {
+        console.error(error)
+        return logError(error.status === 400
+          ? 'Data not available for these coordinates.'
+          : 'Error while retrieving data for these coordinates.')
+      }
+
+      const travelTimeSurface = parseTimesData(timesResponse.value)
+      return [
+        logItem(`Found times for ${index}...`),
+        setNetwork({
+          name: network.name,
           travelTimeSurface
         })
       ]
     }
   })
+]

src/actions/points-of-interest.js

@@ -1,9 +1,11 @@
 // @flow
 import fetch from '@conveyal/woonerf/fetch'
 
+import cacheURL from '../utils/cache-url'
+
 export function loadPointsOfInterest (url: string) {
   return fetch({
-    url,
+    url: cacheURL(url),
     next: response => ({
       type: 'set points of interest',
       payload: typeof response.value === 'string'