feat(deps): Update to latest mastarm, woonerf, browsochrones, and tra…

…nsitive
conveyal · Nov 3, 2016 · 00d70b2 · 00d70b2
1 parent 12e9b34
commit 00d70b2
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 150 deletions.
diff --git a/configurations/default/store.yml b/configurations/default/store.yml
@@ -2,13 +2,13 @@ browsochrones:
   active: base
   base: null
   comparison: null
-  gridsUrl: https://dz69bcpxxuhn6.cloudfront.net/indy-baseline-z9/intgrids
+  gridsUrl: https://s3.amazonaws.com/analyst-static/indy-baseline-z9/intgrids
   grids:
     - Jobs_total
     - Workers_total
   origins:
-    - https://dz69bcpxxuhn6.cloudfront.net/indyconnect-marion-v5/
-    - https://dz69bcpxxuhn6.cloudfront.net/indy-baseline-v5/
+    - https://s3.amazonaws.com/analyst-static/indyconnect-marion-v6
+    - https://s3.amazonaws.com/analyst-static/indy-baseline-v6
 geocoder:
   focusLatlng:
     lat: 39.7691

diff --git a/package.json b/package.json
@@ -23,11 +23,12 @@
   },
   "homepage": "https://github.com/conveyal/taui",
   "devDependencies": {
-    "mastarm": "conveyal/mastarm#add-entries-setting",
+    "mastarm": "^2.0.0",
     "semantic-release": "^4.3.5"
   },
   "dependencies": {
-    "browsochrones": "^0.8.0",
+    "@conveyal/woonerf": "^0.2.1",
+    "browsochrones": "^0.9.0",
     "color": "^0.11.1",
     "debug": "^2.2.0",
     "font-awesome": "^4.6.3",
@@ -53,7 +54,7 @@
     "react-select-geocoder": "^0.2.1",
     "redux": "^3.6.0",
     "redux-actions": "^0.12.0",
-    "transitive-js": "0.8.4"
+    "transitive-js": "0.9.0"
   },
   "standard": {
     "parser": "babel-eslint"

diff --git a/src/actions/index.js b/src/actions/index.js
@@ -5,7 +5,7 @@ import {createAction} from 'redux-actions'
 import fetch, {
   incrementFetches as incrementWork,
   decrementFetches as decrementWork
-} from 'mastarm/react/fetch'
+} from '@conveyal/woonerf/build/lib/fetch'
 
 import featureToLabel from '../utils/feature-to-label'
 import {setKeyTo} from '../utils/hash'
@@ -245,7 +245,13 @@ export function updateSelectedTimeCutoff ({browsochrones, latlng, timeCutoff}) {
  *  - If Browsochones is loaded, transitive data is generated
  *  - If Browsochones has a surface generated, travel time is calculated
  */
-export function updateDestination ({browsochrones, latlng, label, zoom}) {
+export function updateDestination ({
+  browsochrones,
+  fromLatlng,
+  latlng,
+  label,
+  zoom
+}) {
   const actions = []
 
   // TODO: Remove this!
@@ -266,8 +272,8 @@ export function updateDestination ({browsochrones, latlng, label, zoom}) {
   }
 
   if (browsochrones.base && browsochrones.base.isLoaded()) {
-    actions.push(generateDestinationDataFor({browsochrones: browsochrones.base, toLatlng: latlng, name: 'base', zoom}))
-    actions.push(generateDestinationDataFor({browsochrones: browsochrones.comparison, toLatlng: latlng, name: 'comparison', zoom}))
+    actions.push(generateDestinationDataFor({browsochrones: browsochrones.base, fromLatlng, toLatlng: latlng, name: 'base', zoom}))
+    actions.push(generateDestinationDataFor({browsochrones: browsochrones.comparison, fromLatlng, toLatlng: latlng, name: 'comparison', zoom}))
   }
 
   return actions

diff --git a/src/components/route-card.js b/src/components/route-card.js
@@ -114,10 +114,10 @@ function renderJourneys ({ oldTravelTime, transitiveData, travelTime, waitTime }
       <div className='BestTrip'>
         <div>{bestTripSegments} <strong> {travelTime}</strong> {messages.Units.Mins}</div>
         <div>{oldTravelTime &&
-            <TripDiff
-              oldTravelTime={oldTravelTime}
-              travelTime={travelTime}
-              />}<br />
+          <TripDiff
+            oldTravelTime={oldTravelTime}
+            travelTime={travelTime}
+            />}<br />
           includes <strong>{waitTime}</strong> {messages.Units.Mins} waiting <br />
         </div>
       </div>

diff --git a/src/containers/indianapolis/index.js b/src/containers/indianapolis/index.js
@@ -31,6 +31,7 @@ class Indianapolis extends Component {
     clearStart: PropTypes.func.isRequired,
     destinations: PropTypes.object,
     geocoder: PropTypes.object,
+    history: PropTypes.any,
     initializeBrowsochrones: PropTypes.func.isRequired,
     mapMarkers: PropTypes.object,
     map: PropTypes.object,
@@ -104,9 +105,10 @@ class Indianapolis extends Component {
     label,
     latlng
   }) => {
-    const {browsochrones, map, moveDestination} = this.props
+    const {browsochrones, map, mapMarkers, moveDestination} = this.props
     moveDestination({
       browsochrones,
+      fromLatlng: mapMarkers.origin.latlng,
       label,
       latlng: lonlng(latlng),
       zoom: map.zoom

diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,4 @@
-import mount from 'mastarm/react/mount'
+import mount from '@conveyal/woonerf/build/lib/mount'
 
 import Indianapolis from './containers/indianapolis'
 import reducers from './reducers'

diff --git a/src/reducers/ui.js b/src/reducers/ui.js
@@ -1,5 +1,5 @@
+import {DECREMENT_FETCH, INCREMENT_FETCH} from '@conveyal/woonerf/build/lib/fetch'
 import {handleActions} from 'redux-actions'
-import {DECREMENT_FETCH, INCREMENT_FETCH} from 'mastarm/react/fetch'
 
 export default handleActions({
   [`${INCREMENT_FETCH}`]: (state, payload) => {