fix(geocoder): Fix geocoder issues from using two different ones.

src/actions/browsochrones.js

@@ -5,9 +5,9 @@ import {
 } from '@conveyal/woonerf/fetch'
 import Browsochrones from 'browsochrones'
 import fetch from 'isomorphic-fetch'
+import {search as geocode} from 'isomorphic-mapzen-search'
 
 import {getAsObject as getHash} from '../utils/hash'
-import {geocode} from '../utils/mapbox-geocoder'
 import messages from '../utils/messages'
 
 import {
@@ -70,13 +70,14 @@ function geocodeQs ({
     .map(async (p) => {
       if (qs[p]) {
         const results = await geocode({
+          apiKey: process.env.MAPZEN_SEARCH_KEY,
           boundary: geocoder.boundary,
-          focusLatlng: geocoder.focusLatlng,
+          focusPoint: geocoder.focusLatlng,
           text: qs[p]
         })
         if (results.features.length > 0) {
           return {
-            label: results.features[0].place_name,
+            label: results.features[0].properties.label,
             latlng: lonlat(results.features[0].geometry.coordinates)
           }
         }

src/actions/index.js

@@ -1,20 +1,21 @@
 import lonlat from '@conveyal/lonlat'
-import Leaflet from 'leaflet'
-import {createAction} from 'redux-actions'
-
 import fetch, {
   incrementFetches as incrementWork,
   decrementFetches as decrementWork
 } from '@conveyal/woonerf/fetch'
+import {reverse} from 'isomorphic-mapzen-search'
+import Leaflet from 'leaflet'
+import {createAction} from 'redux-actions'
 
-import featureToLabel from '../utils/feature-to-label'
 import {setKeyTo} from '../utils/hash'
-import {reverse} from '../utils/mapbox-geocoder'
 
 const END = 'end'
 const START = 'start'
 
-const reverseGeocode = ({latlng}) => reverse(process.env.MAPBOX_ACCESS_TOKEN, latlng)
+const reverseGeocode = ({latlng}) => reverse({
+  apiKey: process.env.MAPZEN_SEARCH_KEY,
+  point: latlng
+})
 
 export const addActionLogItem = createAction('add action log item', (item) => {
   const payload = typeof item === 'string'
@@ -114,7 +115,7 @@ export function updateStart ({
       reverseGeocode({latlng})
         .then(({features}) => {
           if (!features || features.length < 1) return
-          const label = featureToLabel(features[0])
+          const label = features[0].properties.label
           return [
             addActionLogItem(`Set start address to: ${label}`),
             setStartLabel(label)
@@ -312,7 +313,7 @@ export function updateEnd ({
     actions.push(
       setEnd({latlng}),
       reverseGeocode({latlng})
-        .then(({features}) => setEndLabel(featureToLabel(features[0])))
+        .then(({features}) => setEndLabel(features[0].properties.label))
     )
   }
 

src/components/form.js

@@ -1,7 +1,6 @@
 import Pure from '@conveyal/woonerf/components/pure'
 import React from 'react'
 import Geocoder from 'react-select-geocoder'
-import featureToLabel from '../utils/feature-to-label'
 import messages from '../utils/messages'
 
 export default class Form extends Pure {
@@ -20,8 +19,6 @@ export default class Form extends Pure {
           <Geocoder
             apiKey={process.env.MAPZEN_SEARCH_KEY}
             {...geocoder}
-            featureToLabel={featureToLabel}
-            featureToValue={(f) => f.id}
             name='start-address'
             onChange={onChangeStart}
             placeholder={messages.Geocoding.StartPlaceholder}
@@ -36,8 +33,6 @@ export default class Form extends Pure {
               <Geocoder
                 apiKey={process.env.MAPZEN_SEARCH_KEY}
                 {...geocoder}
-                featureToLabel={featureToLabel}
-                featureToValue={(f) => f.id}
                 name='end-address'
                 onChange={onChangeEnd}
                 placeholder={messages.Geocoding.EndPlaceholder}