refactor(poi): Dont reverse geocode when labels are available

conveyal · Dec 5, 2018 · be8714b · be8714b
1 parent 5bd2386
commit be8714b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/components/application.js b/src/components/application.js
@@ -244,7 +244,9 @@ export default class Application extends Component<Props, State> {
             setEndPosition={p.updateEndPosition}
             setStartPosition={p.updateStartPosition}
             start={p.geocoder.start}
+            updateEnd={p.updateEnd}
             updateMap={p.updateMap}
+            updateStart={p.updateStart}
           />
         </div>
         <Dock showSpinner={p.ui.fetches > 0} componentError={this.state.componentError}>

diff --git a/src/components/map.js b/src/components/map.js
@@ -69,7 +69,9 @@ type Props = {
   setEndPosition: LonLat => void,
   setStartPosition: LonLat => void,
   start: null | Location,
+  updateEnd: () => void,
   updateMap: any => void,
+  updateStart: () => void,
   zoom: number
 }
 
@@ -153,19 +155,25 @@ export default class Map extends PureComponent<Props, State> {
   }
 
   _setEnd = (): void => {
-    const {lastClickedPosition} = this.state
-    this._clearState()
-    if (lastClickedPosition) {
-      this.props.setEndPosition(lonlat(lastClickedPosition))
+    const p = this.props
+    const s = this.state
+    if (s.lastClickedPosition) {
+      const position = lonlat(s.lastClickedPosition)
+      if (s.lastClickedLabel) p.updateEnd({label: s.lastClickedLabel, position})
+      else p.setEndPosition(position)
     }
+    this._clearState()
   }
 
   _setStart = (): void => {
-    const {lastClickedPosition} = this.state
-    this._clearState()
-    if (lastClickedPosition) {
-      this.props.setStartPosition(lonlat(lastClickedPosition))
+    const p = this.props
+    const s = this.state
+    if (s.lastClickedPosition) {
+      const position = lonlat(s.lastClickedPosition)
+      if (s.lastClickedLabel) p.updateStart({label: s.lastClickedLabel, position})
+      else p.setStartPosition(position)
     }
+    this._clearState()
   }
 
   _setZoom = (e: MapEvent) => {