npm link maps & add hybrid map type to maps view

quickresolve · May 17, 2016 · 9337963 · 9337963
1 parent a001e78
commit 9337963
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/App/Components/Local.js b/App/Components/Local.js
@@ -15,6 +15,7 @@ import Weather from "./Weather"
 import Trail from './Trail'
 import TrailList from './TrailList'
 import Main from "./Main"
+import Map from "./Map"
 
 
 var Local = React.createClass ({
@@ -37,7 +38,6 @@ var Local = React.createClass ({
     return(
       <View style={styles.container}>
         <MapView style={styles.map}
-          // annotations={this.state.pin}
           showsUserLocation={true}
           region={this.state.region}
           mapType={'hybrid'}
@@ -86,7 +86,7 @@ var Local = React.createClass ({
 
   _onMapsButton(){
     this.props.navigator.push({
-      component: Maps,
+      component: Map,
       name: "Map"
     })
   },

diff --git a/App/Components/Map.js b/App/Components/Map.js
@@ -125,7 +125,7 @@ var Map = React.createClass({
             longitude: -122.3247,
           },
         },
-        
+
         {
             coordinate: {
             latitude: 37.964,
@@ -223,6 +223,7 @@ var Map = React.createClass({
         <MapView
           style={styles.map}
           initialRegion={region}
+          mapType={'hybrid'}
         >
           <MapView.Marker
             ref="m1"

diff --git a/App/Components/Weather.js b/App/Components/Weather.js
@@ -21,6 +21,7 @@ import Trail from './Trail'
 import TrailList from './TrailList'
 import Local from './Local'
 import Main from './Main'
+import Map from './Map'
 
 var moment = require('moment');
 
@@ -213,7 +214,7 @@ renderRow: function(weather) {
 
  _onMapsButton(){
    this.props.navigator.push({
-     component: Maps,
+     component: Map,
      name: "Map"
    })
  },

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "react": "^0.14.8",
     "react-native": "^0.25.1",
     "react-native-icons": "^0.7.1",
-    "react-native-maps": "^0.4.0",
+    "react-native-maps": "^0.4.2",
     "react-native-vector-icons": "^2.0.2"
   }
 }