fix(BaseMap): fix issue where map recentered twice on endpoint marker drag

recentering happens in componentWillReceiveProps. on marker drag, the isFromSet and isToSet props
where being updated unnecessarily. this fix changes them to strict booleans

Conflicts:
	lib/components/map/base-map.js

Author: landonreed

lib/components/map/base-map.js

@@ -21,6 +21,22 @@ class BaseMap extends Component {
     if (!this.props.isFromSet) this.props.setLocation('from', location)
     else if (!this.props.isToSet) this.props.setLocation('to', location)
   }
+  // TODO: make map controlled component
+  _mapBoundsChanged = (e) => {
+    // if (this.state.zoomToTarget) {
+    //   setTimeout(() => { this.setState({zoomToTarget: false}) }, 200)
+    //   return false
+    // } else {
+    // const zoom = e.target.getZoom()
+    const bounds = e.target.getBounds()
+    // if (this.props.mapState.zoom !== zoom) {
+    //   this.props.updateMapState({zoom})
+    // }
+    if (!bounds.equals(this.props.mapState.bounds)) {
+      this.props.updateMapState({bounds: e.target.getBounds()})
+    }
+    // }
+  }
   componentWillReceiveProps (nextProps) {
     // TODO: maybe setting bounds ought to be handled in map props...
     // Pan to to entire itinerary if made active (clicked)
@@ -56,7 +72,29 @@ class BaseMap extends Component {
       children
     } = this.props
     const position = [config.map.initLat, config.map.initLon]
-
+    // const position = [+mapState.lat, +mapState.lon]
+    // const zoom = +mapState.zoom
+    const zoom = config.map.initZoom || 13
+    const bounds = mapState.bounds
+    const mapProps = {
+      ref: 'map',
+      className: 'map',
+      // center: position,
+      // bounds: mapState.bounds || null,
+      // zoom: config.initZoom,
+      // zoom: +mapState.zoom,
+      onClick: this._onClick
+      // onMoveEnd: this._mapBoundsChanged,
+      // onZoomEnd: this._mapBoundsChanged,
+    }
+    if (bounds) {
+      mapProps.bounds = bounds
+    } else if (position && zoom) {
+      mapProps.center = position
+      mapProps.zoom = zoom
+    } else {
+      console.error('no map position/bounds provided!', {position, zoom, bounds})
+    }
     return (
       <Map
         ref='map'
@@ -79,8 +117,9 @@ const mapStateToProps = (state, ownProps) => {
     activeLeg: activeSearch && activeSearch.activeLeg,
     activeStep: activeSearch && activeSearch.activeStep,
     config: state.otp.config,
-    isFromSet: state.otp.currentQuery.from && state.otp.currentQuery.from.lat && state.otp.currentQuery.from.lon,
-    isToSet: state.otp.currentQuery.to && state.otp.currentQuery.to.lat && state.otp.currentQuery.to.lon,
+    mapState: state.otp.mapState,
+    isFromSet: state.otp.currentQuery.from && state.otp.currentQuery.from.lat !== null && state.otp.currentQuery.from.lon !== null,
+    isToSet: state.otp.currentQuery.to && state.otp.currentQuery.to.lat !== null && state.otp.currentQuery.to.lon !== null,
     itinerary: getActiveItinerary(state.otp)
   }
 }