feat(form): Support auto-population of from field with current location

Author: David Emory

lib/actions/config.js

@@ -1,3 +1,6 @@
 import { createAction } from 'redux-actions'
 
 export const setAutoPlan = createAction('SET_AUTOPLAN')
+
+// TODO: this should eventually be handled via mapState
+export const setMapCenter = createAction('SET_MAP_CENTER')

lib/actions/map.js

@@ -31,6 +31,22 @@ export function setLocation (payload) {
   }
 }
 
+/* payload is simply { type: 'from'|'to' }; location filled in automatically */
+
+export function setLocationToCurrent (payload) {
+  return function (dispatch, getState) {
+    const currentPosition = getState().otp.location.currentPosition
+    if (!currentPosition) return
+    payload.location = {
+      lat: currentPosition.coords.latitude,
+      lon: currentPosition.coords.longitude,
+      name: '(Current Location)'
+    }
+    dispatch(settingLocation(payload))
+    dispatch(formChanged())
+  }
+}
+
 export function switchLocations () {
   return function (dispatch, getState) {
     const {from, to} = getState().otp.currentQuery

lib/components/form/location-field.js

@@ -5,7 +5,7 @@ import { FormGroup, FormControl, InputGroup, DropdownButton, MenuItem } from 're
 import { connect } from 'react-redux'
 import { autocomplete } from 'isomorphic-mapzen-search'
 
-import { setLocation, clearLocation } from '../../actions/map'
+import { setLocation, setLocationToCurrent, clearLocation } from '../../actions/map'
 import { addLocationSearch } from '../../actions/location'
 import { distanceStringImperial } from '../../util/distance'
 
@@ -27,7 +27,8 @@ class LocationField extends Component {
     // dispatch
     addLocationSearch: PropTypes.func,
     clearLocation: PropTypes.func,
-    setLocation: PropTypes.func
+    setLocation: PropTypes.func,
+    setLocationToCurrent: PropTypes.func
   }
 
   constructor (props) {
@@ -78,11 +79,7 @@ class LocationField extends Component {
 
     const currentLocationOption = currentPosition !== null
       ? createOption('location-arrow', 'Use Current Location', () => {
-        this.props.setLocation(this.props.type, {
-          lat: currentPosition.coords.latitude,
-          lon: currentPosition.coords.longitude,
-          name: '(Current Location)'
-        })
+        this.props.setLocationToCurrent(this.props.type)
       })
       : null
 
@@ -275,6 +272,7 @@ const mapDispatchToProps = (dispatch, ownProps) => {
   return {
     addLocationSearch: (location) => { dispatch(addLocationSearch({ location })) },
     setLocation: (type, location) => { dispatch(setLocation({ type, location })) },
+    setLocationToCurrent: (type) => { dispatch(setLocationToCurrent({ type })) },
     clearLocation: (type) => { dispatch(clearLocation({ type })) }
   }
 }

lib/index.js

@@ -22,8 +22,9 @@ import ItineraryCarousel from './components/narrative/itinerary-carousel'
 import NarrativeItineraries from './components/narrative/narrative-itineraries'
 import NarrativeItinerary from './components/narrative/narrative-itinerary'
 
-import { setAutoPlan } from './actions/config'
+import { setAutoPlan, setMapCenter } from './actions/config'
 import { getCurrentPosition } from './actions/location'
+import { setLocationToCurrent } from './actions/map'
 import { findNearbyStops } from './actions/api'
 import { setShowExtendedSettings } from './actions/ui'
 
@@ -73,6 +74,8 @@ export {
   findNearbyStops,
   getCurrentPosition,
   setAutoPlan,
+  setLocationToCurrent,
+  setMapCenter,
   setShowExtendedSettings,
 
   // redux utilities

lib/reducers/create-otp-reducer.js

@@ -150,6 +150,11 @@ function createOtpReducer (config, initialQuery) {
 
       case 'SET_AUTOPLAN':
         return update(state, { config: { autoPlan: { $set: action.payload.autoPlan } } })
+      case 'SET_MAP_CENTER':
+        return update(state, { config: { map: {
+          initLat: { $set: action.payload.lat },
+          initLon: { $set: action.payload.lon }
+        } } })
 
       case 'POSITION_RESPONSE':
         return update(state, { location: { currentPosition: { $set: action.payload.position } } })