fix: fix location prop when derived from active search

Author: landonreed

lib/components/form/location-field.js

@@ -19,6 +19,7 @@ import { addLocationSearch, getCurrentPosition } from '../../actions/location'
 import { findNearbyStops } from '../../actions/api'
 import { distanceStringImperial } from '../../util/distance'
 import { formatStoredPlaceName } from '../../util/map'
+import { getActiveSearch } from '../../util/state'
 
 class LocationField extends Component {
   static propTypes = {
@@ -565,9 +566,12 @@ function createTransitStopOption (stop, onSelect, isActive) {
 // connect to redux store
 
 const mapStateToProps = (state, ownProps) => {
+  const activeSearch = getActiveSearch(state.otp)
+  const query = activeSearch ? activeSearch.query : state.otp.currentQuery
+  const location = query[ownProps.type]
   return {
     config: state.otp.config,
-    location: state.otp.currentQuery[ownProps.type],
+    location,
     user: state.otp.user,
     currentPosition: state.otp.location.currentPosition,
     sessionSearches: state.otp.location.sessionSearches,