Make MAP_TYPES constant, don't pass none mapType to iOS

Author: Spike Brehm

components/MapView.js

@@ -16,6 +16,19 @@ import MapCircle from './MapCircle';
 import MapCallout from './MapCallout';
 import MapUrlTile from './MapUrlTile';
 
+const MAP_TYPES = {
+  STANDARD: 'standard',
+  SATELLITE: 'satellite',
+  HYBRID: 'hybrid',
+  TERRAIN: 'terrain',
+  NONE: 'none',
+};
+
+const ANDROID_ONLY_MAP_TYPES = [
+  MAP_TYPES.TERRAIN,
+  MAP_TYPES.NONE,
+];
+
 const viewConfig = {
   uiViewClassName: 'AIRMap',
   validAttributes: {
@@ -172,13 +185,7 @@ const propTypes = {
    * - hybrid: satellite view with roads and points of interest overlayed
    * - terrain: (Android only) topographic view
    */
-  mapType: PropTypes.oneOf([
-    'standard',
-    'satellite',
-    'hybrid',
-    'terrain',
-    'none',
-  ]),
+  mapType: PropTypes.oneOf(Object.values(MAP_TYPES)),
 
   /**
    * The region to be displayed by the map.
@@ -452,8 +459,8 @@ class MapView extends React.Component {
         onMapReady: this._onMapReady,
         onLayout: this._onLayout,
       };
-      if (Platform.OS === 'ios' && props.mapType === 'terrain') {
-        props.mapType = 'standard';
+      if (Platform.OS === 'ios' && ANDROID_ONLY_MAP_TYPES.includes(props.mapType)) {
+        props.mapType = MAP_TYPES.STANDARD;
       }
       props.handlePanDrag = !!props.onPanDrag;
     } else {
@@ -488,6 +495,8 @@ class MapView extends React.Component {
 MapView.propTypes = propTypes;
 MapView.viewConfig = viewConfig;
 
+MapView.MAP_TYPES = MAP_TYPES;
+
 const AIRMap = requireNativeComponent('AIRMap', MapView, {
   nativeOnly: {
     onChange: true,

example/examples/CustomTiles.js

@@ -6,7 +6,7 @@ import {
   Dimensions,
 } from 'react-native';
 
-import MapView from 'react-native-maps';
+import MapView, { MAP_TYPES } from 'react-native-maps';
 
 const { width, height } = Dimensions.get('window');
 
@@ -35,7 +35,7 @@ class CustomTiles extends React.Component {
     return (
       <View style={styles.container}>
         <MapView
-          mapType="none"
+          mapType={MAP_TYPES.NONE}
           style={styles.map}
           initialRegion={region}
         >

example/examples/DisplayLatLng.js

@@ -7,7 +7,7 @@ import {
   TouchableOpacity,
 } from 'react-native';
 
-import MapView from 'react-native-maps';
+import MapView, { MAP_TYPES } from 'react-native-maps';
 
 const { width, height } = Dimensions.get('window');
 
@@ -57,7 +57,7 @@ class DisplayLatLng extends React.Component {
       <View style={styles.container}>
         <MapView
           ref={ref => { this.map = ref; }}
-          mapType="terrain"
+          mapType={MAP_TYPES.TERRAIN}
           style={styles.map}
           region={this.state.region}
           onRegionChange={region => this.onRegionChange(region)}