Fetch other station locations from map pin

ryancoughlin · Apr 8, 2017 · be2ba3d · be2ba3d
1 parent 462707b
commit be2ba3d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 32 deletions.
diff --git a/app/components/map.js b/app/components/map.js
@@ -21,7 +21,6 @@ export default class Map extends Component {
 
   componentDidMount() {
     navigator.geolocation.getCurrentPosition((position) => {
-      console.log(position.coords)
       this.setState({
         userLocation: {
           latitude: position.coords.latitude,
@@ -35,12 +34,6 @@ export default class Map extends Component {
     })
   }
 
-  pushStationDetail(station) {
-    Actions.stationDetail({
-      ...station,
-    })
-  }
-
   render() {
     const { stations, userLocation } = this.state
 
@@ -74,7 +67,10 @@ export default class Map extends Component {
               height={98}
               onPress={() => {
                 Actions.stationDetail({
-                  ...station,
+                  location: {
+                    latitude: station.location[0],
+                    longitude: station.location[1],
+                  },
                 })
               }}
             >

diff --git a/app/components/station-detail/index.js b/app/components/station-detail/index.js
@@ -20,13 +20,6 @@ const StationDetail = class extends Component {
   constructor(props) {
     super(props)
 
-    if (props) {
-      this.state = {
-        city: props.name,
-      }
-    }
-
-
     this.handleAppStateChange = this.handleAppStateChange.bind(this)
 
     this.state = {
@@ -35,14 +28,10 @@ const StationDetail = class extends Component {
   }
 
   componentDidMount() {
-    this.findCurrentLocation()
+    this.requestLoctionInformation()
     AppState.addEventListener('change', this.handleAppStateChange)
   }
 
-  componentWillReceiveProps(nextProps) {
-    console.log(nextProps)
-  }
-
   componentWillUnmount() {
     AppState.removeEventListener('change', this.handleAppStateChange)
   }
@@ -55,15 +44,17 @@ const StationDetail = class extends Component {
     }
 
     if (appState === 'active' && this.state.previousState !== 'active') {
-      this.findCurrentLocation()
+      this.requestLoctionInformation()
     }
   }
 
-  findCurrentLocation() {
-    fetchLocation().then((location) => {
-      this.props.fetchTideData(location)
-      this.props.findCityName(location)
-    })
+  requestLoctionInformation() {
+    if (this.props.location) {
+      this.props.fetchTideData(this.props.location)
+      this.props.findCityName(this.props.location)
+    } else {
+      this.findCurrentLocation()
+    }
   }
 
   render() {

diff --git a/index.ios.js b/index.ios.js
@@ -43,13 +43,24 @@ class Salty extends Component {
                 initial
                 key="stationDetail"
                 component={StationDetail}
+                rightTitle="Find"
+                onRight={() => Actions.map()}
+                type="reset"
               />
               <Scene
                 key="map"
-                component={Map}
                 leftTitle="Close"
+                direction="vertical"
                 onLeft={() => Actions.pop()}
-              />
+              >
+                <Scene
+                  titleStyle={BaseStyle.navigationTitle}
+                  key="mapModal"
+                  title="Find a Station"
+                  component={Map}
+                />
+              </Scene>
+
               <Scene
                 key="tideList"
                 direction="vertical"
@@ -62,7 +73,6 @@ class Salty extends Component {
                   key="tideListModal"
                   title="Tide Tables"
                   component={TideList}
-                  direction="vertical"
                   panHandlers={null}
                 />
               </Scene>

diff --git a/package.json b/package.json
@@ -14,11 +14,11 @@
     "react-native": "^0.42.0",
     "react-native-config": "^0.1.2",
     "react-native-geocoder": "^0.4.6",
-    "react-native-maps": "^0.13.0",
+    "react-native-maps": "^0.14.0",
     "react-native-router-flux": "^3.38.0",
     "react-native-splash-screen": "^2.0.0",
-    "react-native-svg": "^4.4.1",
-    "victory-native": "^0.7.1",
+    "react-native-svg": "^5.1.5",
+    "victory-native": "^0.7.2",
     "react-redux": "^5.0.3",
     "redux": "^3.6.0",
     "redux-logger": "^3.0.0",