From 6fd2483cb2a9405f4346a26415e46ad3507fb8f9 Mon Sep 17 00:00:00 2001
From: "ITONE\\bussakorn.wonghom" <>
Date: Wed, 22 Aug 2018 15:46:01 +0700
Subject: [PATCH 01/28] Add indoor events support for Android/iOS

---
 docs/mapview.md                               | 19 +++++
 example/App.js                                |  2 +
 example/examples/IndoorMap.js                 | 72 ++++++++++++++++
 .../android/react/maps/AirMapManager.java     | 14 ++-
 .../airbnb/android/react/maps/AirMapView.java | 74 +++++++++++++++-
 lib/components/MapView.js                     | 13 +++
 lib/ios/AirGoogleMaps/AIRGoogleMap.h          |  3 +
 lib/ios/AirGoogleMaps/AIRGoogleMap.m          |  8 ++
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.h   |  2 +
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.m   | 85 ++++++++++++++++++-
 10 files changed, 287 insertions(+), 5 deletions(-)
 create mode 100644 example/examples/IndoorMap.js

diff --git a/docs/mapview.md b/docs/mapview.md
index edbe23a850..4f055da7a1 100644
--- a/docs/mapview.md
+++ b/docs/mapview.md
@@ -62,6 +62,8 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
 | `onMarkerDragStart` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the user initiates a drag on a marker (if it is draggable)
 | `onMarkerDrag` | `{ coordinate: LatLng, position: Point }` | Callback called continuously as a marker is dragged
 | `onMarkerDragEnd` | `{ coordinate: LatLng, position: Point }` | Callback that is called when a drag on a marker finishes. This is usually the point you will want to setState on the marker's coordinate again
+| `onIndoorLevelActivated` | `IndoorLevel` | Callback that is called when a level on indoor building is activated
+| `onIndoorBuildingFocused` | `IndoorBuilding` | Callback that is called when a indoor building is focused/unfocused
 
 
 
@@ -75,6 +77,7 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
 | `animateToBearing` | `bearing: Number`, `duration: Number` |
 | `animateToViewingAngle` | `angle: Number`, `duration: Number` |
 | `setMapBoundaries` | `northEast: LatLng`, `southWest: LatLng` | `GoogleMaps only`
+| `setIndoorActiveLevelIndex` | `levelIndex: Number` |
 | `fitToElements` | `animated: Boolean` |
 | `fitToSuppliedMarkers` | `markerIDs: String[]`, `animated: Boolean` | If you need to use this in `ComponentDidMount`, make sure you put it in a timeout or it will cause performance problems.
 | `fitToCoordinates` | `coordinates: Array<LatLng>, options: { edgePadding: EdgePadding, animated: Boolean }` | If called in `ComponentDidMount` in android, it will cause an exception. It is recommended to call it from the MapView `onLayout` event.
@@ -161,3 +164,19 @@ type KmlContainer {
   markers: [Marker]
 }
 ```
+
+```
+type IndoorBuilding {
+  underground: boolean,
+  activeLevelIndex: Number,
+  levels: Array<IndoorLevel>,
+}
+```
+
+```
+type IndoorLevel {
+  activeLevelIndex: Number,
+  name: String,
+  shortName: String,
+}
+```
diff --git a/example/App.js b/example/App.js
index 7b6231e61d..9c000ddc95 100644
--- a/example/App.js
+++ b/example/App.js
@@ -42,6 +42,7 @@ import ImageOverlayWithAssets from './examples/ImageOverlayWithAssets';
 import ImageOverlayWithURL from './examples/ImageOverlayWithURL';
 import AnimatedNavigation from './examples/AnimatedNavigation';
 import OnPoiClick from './examples/OnPoiClick';
+import IndoorMap from './examples/IndoorMap';
 
 const IOS = Platform.OS === 'ios';
 const ANDROID = Platform.OS === 'android';
@@ -162,6 +163,7 @@ class App extends React.Component {
       [ImageOverlayWithURL, 'Image Overlay Component with URL', true],
       [AnimatedNavigation, 'Animated Map Navigation', true],
       [OnPoiClick, 'On Poi Click', true],
+      [IndoorMap, 'Indoor Map', true],
     ]
     // Filter out examples that are not yet supported for Google Maps on iOS.
     .filter(example => ANDROID || (IOS && (example[2] || !this.state.useGoogleMaps)))
diff --git a/example/examples/IndoorMap.js b/example/examples/IndoorMap.js
new file mode 100644
index 0000000000..bcb6290bfc
--- /dev/null
+++ b/example/examples/IndoorMap.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import {
+  StyleSheet,
+  View,
+  Dimensions,
+  Button,
+  Alert,
+} from 'react-native';
+ import MapView from 'react-native-maps';
+ const { width, height } = Dimensions.get('window');
+ const ASPECT_RATIO = width / height;
+const LATITUDE = 1.3039991;
+const LONGITUDE = 103.8316911;
+// const LATITUDE = 37.6167451;
+// const LONGITUDE = -122.3876189;
+const LATITUDE_DELTA = 0.003;
+const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO;
+ class IndoorMap extends React.Component {
+  constructor(props) {
+    super(props);
+    this.setIndoorLevel = this.setIndoorLevel.bind(this);
+  }
+   handleIndoorFocus(event) {
+    const { indoorBuilding } = event.nativeEvent;
+    const { defaultLevelIndex, levels } = indoorBuilding;
+    const levelNames = levels.map(lv => lv.name || '');
+    const msg = `Default Level: ${defaultLevelIndex}\nLevels: ${levelNames.toString()}`;
+    Alert.alert(
+      'Indoor building focused',
+      msg
+    );
+  }
+   setIndoorLevel(level) {
+    this.map.setIndoorActiveLevelIndex(level);
+  }
+   render() {
+    return (
+      <View style={styles.container}>
+        <MapView
+          provider={this.props.provider}
+          style={styles.map}
+          initialRegion={{
+            latitude: LATITUDE,
+            longitude: LONGITUDE,
+            latitudeDelta: LATITUDE_DELTA,
+            longitudeDelta: LONGITUDE_DELTA,
+          }}
+          showsIndoors
+          showsIndoorLevelPicker
+          onIndoorBuildingFocused={this.handleIndoorFocus}
+          ref={map => { this.map = map; }}
+        />
+        <Button title="go to level 5" onPress={() => { this.setIndoorLevel(5); }} />
+        <Button title="go to level 1" onPress={() => { this.setIndoorLevel(1); }} />
+      </View>
+    );
+  }
+}
+ IndoorMap.propTypes = {
+  provider: MapView.ProviderPropType,
+};
+ const styles = StyleSheet.create({
+  container: {
+    ...StyleSheet.absoluteFillObject,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+  },
+  map: {
+    ...StyleSheet.absoluteFillObject,
+  },
+});
+ module.exports = IndoorMap;
\ No newline at end of file
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
index ee80725c17..69819f6c83 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
@@ -37,7 +37,8 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   private static final int FIT_TO_SUPPLIED_MARKERS = 6;
   private static final int FIT_TO_COORDINATES = 7;
   private static final int SET_MAP_BOUNDARIES = 8;
-  private static final int ANIMATE_TO_NAVIGATION = 9;
+  private static final int ANIMATE_TO_NAVIGATION = 9; 
+  private static final int SET_INDOOR_ACTIVE_LEVEL_INDEX = 10;
 
 
   private final Map<String, Integer> MAP_TYPES = MapBuilder.of(
@@ -313,6 +314,10 @@ public void receiveCommand(AirMapView view, int commandId, @Nullable ReadableArr
       case SET_MAP_BOUNDARIES:
         view.setMapBoundaries(args.getMap(0), args.getMap(1));
         break;
+
+      case SET_INDOOR_ACTIVE_LEVEL_INDEX:
+        view.setIndoorActiveLevelIndex(args.getInt(0));
+        break;
     }
   }
 
@@ -336,7 +341,9 @@ public Map getExportedCustomDirectEventTypeConstants() {
         "onMarkerDragEnd", MapBuilder.of("registrationName", "onMarkerDragEnd"),
         "onPanDrag", MapBuilder.of("registrationName", "onPanDrag"),
         "onKmlReady", MapBuilder.of("registrationName", "onKmlReady"),
-        "onPoiClick", MapBuilder.of("registrationName", "onPoiClick")
+        "onPoiClick", MapBuilder.of("registrationName", "onPoiClick"),
+        "onIndoorLevelActivated", MapBuilder.of("registrationName", "onIndoorLevelActivated"),
+        "onIndoorBuildingFocused", MapBuilder.of("registrationName", "onIndoorBuildingFocused")
     ));
 
     return map;
@@ -353,7 +360,8 @@ public Map<String, Integer> getCommandsMap() {
         "fitToElements", FIT_TO_ELEMENTS,
         "fitToSuppliedMarkers", FIT_TO_SUPPLIED_MARKERS,
         "fitToCoordinates", FIT_TO_COORDINATES,
-        "animateToNavigation", ANIMATE_TO_NAVIGATION
+        "animateToNavigation", ANIMATE_TO_NAVIGATION,
+        "setIndoorActiveLevelIndex", SET_INDOOR_ACTIVE_LEVEL_INDEX
     );
 
     map.putAll(MapBuilder.of(
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index 5882f8cab4..aad4b62b84 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -27,6 +27,7 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -46,6 +47,9 @@
 import com.google.android.gms.maps.model.PointOfInterest;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.VisibleRegion;
+import com.google.android.gms.maps.model.IndoorBuilding;
+import com.google.android.gms.maps.model.IndoorLevel;
 import com.google.maps.android.data.kml.KmlContainer;
 import com.google.maps.android.data.kml.KmlLayer;
 import com.google.maps.android.data.kml.KmlPlacemark;
@@ -65,7 +69,7 @@
 import static android.support.v4.content.PermissionChecker.checkSelfPermission;
 
 public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
-    GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener {
+    GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
   public GoogleMap map;
   private KmlLayer kmlLayer;
   private ProgressBar mapLoadingProgressBar;
@@ -180,6 +184,7 @@ public void onMapReady(final GoogleMap map) {
     this.map.setInfoWindowAdapter(this);
     this.map.setOnMarkerDragListener(this);
     this.map.setOnPoiClickListener(this);
+    this.map.setOnIndoorStateChangeListener(this);
 
     manager.pushEvent(context, this, "onMapReady", new WritableNativeMap());
 
@@ -1022,6 +1027,73 @@ public void setKmlSrc(String kmlSrc) {
     }
   }
 
+  @Override
+  public void onIndoorBuildingFocused() {
+    IndoorBuilding building = this.map.getFocusedBuilding();
+    if (building != null) {
+      List<IndoorLevel> levels = building.getLevels();
+      int index = 0;
+      WritableArray levelsArray = Arguments.createArray();
+      for (IndoorLevel level : levels) {
+        WritableMap levelMap = Arguments.createMap();
+        levelMap.putInt("index", index);
+        levelMap.putString("name", level.getName());
+        levelMap.putString("shortName", level.getShortName());
+        levelsArray.pushMap(levelMap);
+        index++;
+      }
+      WritableMap event = Arguments.createMap();
+      WritableMap indoorBuilding = Arguments.createMap();
+      indoorBuilding.putArray("levels", levelsArray);
+      indoorBuilding.putInt("activeLevelIndex", building.getActiveLevelIndex());
+      indoorBuilding.putBoolean("underground", building.isUnderground());
+
+      event.putMap("IndoorBuilding", indoorBuilding);
+
+      manager.pushEvent(context, this, "onIndoorBuildingFocused", event);
+    } else {
+      WritableMap event = Arguments.createMap();
+      WritableArray levelsArray = Arguments.createArray();
+      WritableMap indoorBuilding = Arguments.createMap();
+      indoorBuilding.putArray("levels", levelsArray);
+      indoorBuilding.putInt("activeLevelIndex", 0);
+      indoorBuilding.putBoolean("underground", false);
+      
+      event.putMap("IndoorBuilding", indoorBuilding);
+
+      manager.pushEvent(context, this, "onIndoorBuildingFocused", event);
+    }
+  }
+  
+  @Override
+  public void onIndoorLevelActivated(IndoorBuilding building) {
+    int activeLevelIndex = building.getActiveLevelIndex();
+    IndoorLevel level = building.getLevels().get(activeLevelIndex);
+
+    WritableMap event = Arguments.createMap();
+    WritableMap indoorlevel = Arguments.createMap();
+
+    indoorlevel.putInt("activeLevelIndex", activeLevelIndex);
+    indoorlevel.putString("name", level.getName());
+    indoorlevel.putString("shortName", level.getShortName());
+
+    event.putMap("IndoorLevel", indoorlevel);
+
+    manager.pushEvent(context, this, "onIndoorLevelActivated", event);
+  }
+    
+  public void setIndoorActiveLevelIndex(int activeLevelIndex) {
+    IndoorBuilding building = this.map.getFocusedBuilding();
+    if (building != null) {
+      if (activeLevelIndex >= 0 && activeLevelIndex < building.getLevels().size()) {
+        IndoorLevel level = building.getLevels().get(activeLevelIndex);
+        if (level != null) {
+          level.activate();
+        }
+      }
+    }
+  }
+
   private AirMapMarker getMarkerMap(Marker marker) {
     AirMapMarker airMarker = markerMap.get(marker);
 
diff --git a/lib/components/MapView.js b/lib/components/MapView.js
index 50c4d26571..46e6f41d0b 100644
--- a/lib/components/MapView.js
+++ b/lib/components/MapView.js
@@ -455,6 +455,15 @@ const propTypes = {
    */
   kmlSrc: PropTypes.string,
 
+   /**
+   * Callback that is called when a level is activated on a indoor building.
+   */
+  onIndoorLevelActivated: PropTypes.func,
+  
+   /**
+   * Callback that is called when a Building is focused.
+   */
+  onIndoorBuildingFocused: PropTypes.func,
 };
 
 class MapView extends React.Component {
@@ -589,6 +598,10 @@ class MapView extends React.Component {
   setMapBoundaries(northEast, southWest) {
     this._runCommand('setMapBoundaries', [northEast, southWest]);
   }
+  
+  setIndoorActiveLevelIndex(activeLevelIndex) {
+    this._runCommand('setIndoorActiveLevelIndex', [activeLevelIndex]);
+  }
 
   /**
    * Takes a snapshot of the map and saves it to a picture
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.h b/lib/ios/AirGoogleMaps/AIRGoogleMap.h
index af362c27e9..a89db04606 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMap.h
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.h
@@ -32,6 +32,8 @@
 @property (nonatomic, copy) RCTBubblingEventBlock onPoiClick;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeComplete;
+@property (nonatomic, copy) RCTDirectEventBlock onIndoorLevelActivated;
+@property (nonatomic, copy) RCTDirectEventBlock onIndoorBuildingFocused;
 @property (nonatomic, strong) NSMutableArray *markers;
 @property (nonatomic, strong) NSMutableArray *polygons;
 @property (nonatomic, strong) NSMutableArray *polylines;
@@ -48,6 +50,7 @@
 @property (nonatomic, assign) BOOL pitchEnabled;
 @property (nonatomic, assign) BOOL showsUserLocation;
 @property (nonatomic, assign) BOOL showsMyLocationButton;
+@property (nonatomic, assign) BOOL showsIndoors;
 @property (nonatomic, assign) BOOL showsIndoorLevelPicker;
 @property (nonatomic, assign) NSString *kmlSrc;
 
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.m b/lib/ios/AirGoogleMaps/AIRGoogleMap.m
index 4205bd4583..8f91160e18 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMap.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.m
@@ -425,6 +425,14 @@ - (void)setMaxZoomLevel:(CGFloat)maxZoomLevel {
   [self setMinZoom:self.minZoom maxZoom:maxZoomLevel ];
 }
 
+- (void)setShowsIndoors:(BOOL)showsIndoors {
+  self.indoorEnabled = showsIndoors;
+}
+
+- (BOOL)showsIndoors {
+  return self.indoorEnabled;
+}
+
 - (void)setShowsIndoorLevelPicker:(BOOL)showsIndoorLevelPicker {
   self.settings.indoorPicker = showsIndoorLevelPicker;
 }
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h
index ac841c7bf6..48d0c4eb45 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h
@@ -6,7 +6,9 @@
 //
 
 #import <React/RCTViewManager.h>
+#import "AIRGoogleMap.h"
 
 @interface AIRGoogleMapManager : RCTViewManager
+@property (nonatomic, assign) AIRGoogleMap *map;
 
 @end
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
index 4ae089c1fe..1f04a003bd 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -32,7 +32,9 @@
 
 
 @interface AIRGoogleMapManager() <GMSMapViewDelegate>
-
+{
+  BOOL didCallOnMapReady;
+}
 @end
 
 @implementation AIRGoogleMapManager
@@ -44,6 +46,8 @@ - (UIView *)view
   AIRGoogleMap *map = [AIRGoogleMap new];
   map.bridge = self.bridge;
   map.delegate = self;
+  map.indoorDisplay.delegate = self;
+  self.map = map;
   return map;
 }
 
@@ -59,6 +63,7 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showsUserLocation, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showsMyLocationButton, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsIndoors, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showsIndoorLevelPicker, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(customMapStyleString, NSString)
 RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
@@ -73,6 +78,8 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPoiClick, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorLevelActivated, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorBuildingFocused, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(mapType, GMSMapViewType)
 RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, CGFloat)
@@ -393,6 +400,25 @@ - (UIView *)view
   }];
 }
 
+RCT_EXPORT_METHOD(setIndoorActiveLevelIndex:(nonnull NSNumber *)reactTag
+                  levelIndex:(NSInteger) levelIndex)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    id view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[AIRGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    } else {
+      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+      if (!self.map.indoorDisplay) {
+        return;
+      }
+      if ( levelIndex < [self.map.indoorDisplay.activeBuilding.levels count]) {
+        mapView.indoorDisplay.activeLevel = self.map.indoorDisplay.activeBuilding.levels[levelIndex];
+      }
+    }
+  }];
+ }
+
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }
@@ -465,6 +491,63 @@ - (void)mapView:(GMSMapView *)mapView didDragMarker:(GMSMarker *)marker {
   [aMarker.fakeMarker didDragMarker:aMarker];
 }
 
+- (void) didChangeActiveBuilding: (nullable GMSIndoorBuilding *) building {
+  if (!building) {
+    if (!self.map.onIndoorBuildingFocused) {
+      return;
+    }
+    self.map.onIndoorBuildingFocused(@{
+                                      @"indoorBuilding": @{
+                                          @"activeLevelIndex": @0,
+                                          @"underground": @false,
+                                          @"levels": [[NSMutableArray alloc]init]
+                                      }
+    });
+  }
+  NSInteger i = 0;
+  NSMutableArray *arrayLevels = [[NSMutableArray alloc]init];
+  for (GMSIndoorLevel *level in building.levels) {
+    [arrayLevels addObject: @{
+                              @"index": @(i),
+                              @"name" : level.name,
+                              @"shortName" : level.shortName,
+                            }
+    ];
+    i++;
+  }
+  if (!self.map.onIndoorBuildingFocused) {
+    return;
+  }
+  self.map.onIndoorBuildingFocused(@{
+                                    @"IndoorBuilding": @{
+                                        @"activeLevelIndex": @(building.defaultLevelIndex),
+                                        @"underground": @(building.underground),
+                                        @"levels": arrayLevels
+                                    }
+                                  }
+  );
+}
+
+- (void) didChangeActiveLevel: (nullable GMSIndoorLevel *) 	level {
+  if (!self.map.onIndoorLevelActivated || !self.map.indoorDisplay  || !level) {
+    return;
+  }
+  NSInteger i = 0;
+  for (GMSIndoorLevel *buildingLevel in self.map.indoorDisplay.activeBuilding.levels) {
+    if (buildingLevel.name == level.name && buildingLevel.shortName == level.shortName) {
+      break;
+    }
+    i++;
+  }
+  self.map.onIndoorLevelActivated(@{
+                                  @"IndoorLevel": @{
+                                    @"activeLevelIndex": @(i),
+                                    @"name": level.name,
+                                    @"shortName": level.shortName
+                                  }
+  });
+}
+
 - (void)mapView:(GMSMapView *)mapView
     didTapPOIWithPlaceID:(NSString *)placeID
                     name:(NSString *)name

From 38987874ce64f2a8cd5cbf0edf48cc88c85458ee Mon Sep 17 00:00:00 2001
From: "ITONE\\bussakorn.wonghom" <>
Date: Wed, 22 Aug 2018 15:52:01 +0700
Subject: [PATCH 02/28] change variable name

---
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
index 1f04a003bd..a1eac6761c 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -497,7 +497,7 @@ - (void) didChangeActiveBuilding: (nullable GMSIndoorBuilding *) building {
       return;
     }
     self.map.onIndoorBuildingFocused(@{
-                                      @"indoorBuilding": @{
+                                      @"IndoorBuilding": @{
                                           @"activeLevelIndex": @0,
                                           @"underground": @false,
                                           @"levels": [[NSMutableArray alloc]init]

From 770b4b60c4816b4c6fb9eff9a1df2b6fa2922765 Mon Sep 17 00:00:00 2001
From: "ITONE\\bussakorn.wonghom" <>
Date: Wed, 22 Aug 2018 16:15:22 +0700
Subject: [PATCH 03/28] fix indent

---
 example/examples/IndoorMap.js | 125 +++++++++++++++++-----------------
 lib/components/MapView.js     |   8 +--
 2 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/example/examples/IndoorMap.js b/example/examples/IndoorMap.js
index bcb6290bfc..44e4fd3f8e 100644
--- a/example/examples/IndoorMap.js
+++ b/example/examples/IndoorMap.js
@@ -1,72 +1,71 @@
 import React from 'react';
-import {
-  StyleSheet,
-  View,
-  Dimensions,
-  Button,
-  Alert,
-} from 'react-native';
- import MapView from 'react-native-maps';
- const { width, height } = Dimensions.get('window');
- const ASPECT_RATIO = width / height;
+import { StyleSheet, View, Dimensions, Button, Alert } from 'react-native';
+import MapView from 'react-native-maps';
+const { width, height } = Dimensions.get('window');
+const ASPECT_RATIO = width / height;
 const LATITUDE = 1.3039991;
 const LONGITUDE = 103.8316911;
-// const LATITUDE = 37.6167451;
-// const LONGITUDE = -122.3876189;
 const LATITUDE_DELTA = 0.003;
 const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO;
- class IndoorMap extends React.Component {
-  constructor(props) {
-    super(props);
-    this.setIndoorLevel = this.setIndoorLevel.bind(this);
-  }
-   handleIndoorFocus(event) {
-    const { indoorBuilding } = event.nativeEvent;
-    const { defaultLevelIndex, levels } = indoorBuilding;
-    const levelNames = levels.map(lv => lv.name || '');
-    const msg = `Default Level: ${defaultLevelIndex}\nLevels: ${levelNames.toString()}`;
-    Alert.alert(
-      'Indoor building focused',
-      msg
-    );
-  }
-   setIndoorLevel(level) {
-    this.map.setIndoorActiveLevelIndex(level);
-  }
-   render() {
-    return (
-      <View style={styles.container}>
-        <MapView
-          provider={this.props.provider}
-          style={styles.map}
-          initialRegion={{
-            latitude: LATITUDE,
-            longitude: LONGITUDE,
-            latitudeDelta: LATITUDE_DELTA,
-            longitudeDelta: LONGITUDE_DELTA,
-          }}
-          showsIndoors
-          showsIndoorLevelPicker
-          onIndoorBuildingFocused={this.handleIndoorFocus}
-          ref={map => { this.map = map; }}
-        />
-        <Button title="go to level 5" onPress={() => { this.setIndoorLevel(5); }} />
-        <Button title="go to level 1" onPress={() => { this.setIndoorLevel(1); }} />
-      </View>
-    );
-  }
+
+class IndoorMap extends React.Component {
+    constructor(props) {
+        super(props);
+        this.setIndoorLevel = this.setIndoorLevel.bind(this);
+    }
+   
+    handleIndoorFocus(event) {
+        const { indoorBuilding } = event.nativeEvent;
+        const { defaultLevelIndex, levels } = indoorBuilding;
+        const levelNames = levels.map(lv => lv.name || '');
+        const msg = `Default Level: ${defaultLevelIndex}\nLevels: ${levelNames.toString()}`;
+        Alert.alert(
+            'Indoor building focused',
+            msg
+        );
+    }
+    
+    setIndoorLevel(level) {
+        this.map.setIndoorActiveLevelIndex(level);
+    }
+   
+    render() {
+        return (
+        <View style={styles.container}>
+            <MapView
+            provider={this.props.provider}
+            style={styles.map}
+            initialRegion={{
+                latitude: LATITUDE,
+                longitude: LONGITUDE,
+                latitudeDelta: LATITUDE_DELTA,
+                longitudeDelta: LONGITUDE_DELTA,
+            }}
+            showsIndoors
+            showsIndoorLevelPicker
+            onIndoorBuildingFocused={this.handleIndoorFocus}
+            ref={map => { this.map = map; }}
+            />
+            <Button title="go to level 5" onPress={() => { this.setIndoorLevel(5); }} />
+            <Button title="go to level 1" onPress={() => { this.setIndoorLevel(1); }} />
+        </View>
+        );
+    }
 }
- IndoorMap.propTypes = {
+
+IndoorMap.propTypes = {
   provider: MapView.ProviderPropType,
 };
- const styles = StyleSheet.create({
-  container: {
-    ...StyleSheet.absoluteFillObject,
-    justifyContent: 'flex-end',
-    alignItems: 'center',
-  },
-  map: {
-    ...StyleSheet.absoluteFillObject,
-  },
+ 
+const styles = StyleSheet.create({
+    container: {
+        ...StyleSheet.absoluteFillObject,
+        justifyContent: 'flex-end',
+        alignItems: 'center',
+    },
+    map: {
+        ...StyleSheet.absoluteFillObject,
+    },
 });
- module.exports = IndoorMap;
\ No newline at end of file
+
+module.exports = IndoorMap;
\ No newline at end of file
diff --git a/lib/components/MapView.js b/lib/components/MapView.js
index 46e6f41d0b..cd0cd9dba0 100644
--- a/lib/components/MapView.js
+++ b/lib/components/MapView.js
@@ -455,12 +455,12 @@ const propTypes = {
    */
   kmlSrc: PropTypes.string,
 
-   /**
+  /**
    * Callback that is called when a level is activated on a indoor building.
    */
   onIndoorLevelActivated: PropTypes.func,
-  
-   /**
+
+  /**
    * Callback that is called when a Building is focused.
    */
   onIndoorBuildingFocused: PropTypes.func,
@@ -602,7 +602,7 @@ class MapView extends React.Component {
   setIndoorActiveLevelIndex(activeLevelIndex) {
     this._runCommand('setIndoorActiveLevelIndex', [activeLevelIndex]);
   }
-
+  
   /**
    * Takes a snapshot of the map and saves it to a picture
    * file or returns the image as a base64 encoded string.

From 0d757394c1954fbe54ab5c1f1586a430c2d66e94 Mon Sep 17 00:00:00 2001
From: "ITONE\\bussakorn.wonghom" <>
Date: Wed, 22 Aug 2018 16:21:56 +0700
Subject: [PATCH 04/28] fix intendations

---
 example/examples/IndoorMap.js | 105 +++++++++++++++++-----------------
 lib/components/MapView.js     |   4 +-
 2 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/example/examples/IndoorMap.js b/example/examples/IndoorMap.js
index 44e4fd3f8e..9b208410cd 100644
--- a/example/examples/IndoorMap.js
+++ b/example/examples/IndoorMap.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { StyleSheet, View, Dimensions, Button, Alert } from 'react-native';
 import MapView from 'react-native-maps';
+
 const { width, height } = Dimensions.get('window');
 const ASPECT_RATIO = width / height;
 const LATITUDE = 1.3039991;
@@ -9,63 +10,63 @@ const LATITUDE_DELTA = 0.003;
 const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO;
 
 class IndoorMap extends React.Component {
-    constructor(props) {
-        super(props);
-        this.setIndoorLevel = this.setIndoorLevel.bind(this);
-    }
-   
-    handleIndoorFocus(event) {
-        const { indoorBuilding } = event.nativeEvent;
-        const { defaultLevelIndex, levels } = indoorBuilding;
-        const levelNames = levels.map(lv => lv.name || '');
-        const msg = `Default Level: ${defaultLevelIndex}\nLevels: ${levelNames.toString()}`;
-        Alert.alert(
-            'Indoor building focused',
-            msg
-        );
-    }
-    
-    setIndoorLevel(level) {
-        this.map.setIndoorActiveLevelIndex(level);
-    }
-   
-    render() {
-        return (
-        <View style={styles.container}>
-            <MapView
-            provider={this.props.provider}
-            style={styles.map}
-            initialRegion={{
-                latitude: LATITUDE,
-                longitude: LONGITUDE,
-                latitudeDelta: LATITUDE_DELTA,
-                longitudeDelta: LONGITUDE_DELTA,
-            }}
-            showsIndoors
-            showsIndoorLevelPicker
-            onIndoorBuildingFocused={this.handleIndoorFocus}
-            ref={map => { this.map = map; }}
-            />
-            <Button title="go to level 5" onPress={() => { this.setIndoorLevel(5); }} />
-            <Button title="go to level 1" onPress={() => { this.setIndoorLevel(1); }} />
-        </View>
-        );
-    }
+  constructor(props) {
+      super(props);
+      this.setIndoorLevel = this.setIndoorLevel.bind(this);
+  }
+
+  handleIndoorFocus(event) {
+      const { indoorBuilding } = event.nativeEvent;
+      const { defaultLevelIndex, levels } = indoorBuilding;
+      const levelNames = levels.map(lv => lv.name || '');
+      const msg = `Default Level: ${defaultLevelIndex}\nLevels: ${levelNames.toString()}`;
+      Alert.alert(
+          'Indoor building focused',
+          msg
+      );
+  }
+
+  setIndoorLevel(level) {
+      this.map.setIndoorActiveLevelIndex(level);
+  }
+
+  render() {
+      return (
+      <View style={styles.container}>
+          <MapView
+          provider={this.props.provider}
+          style={styles.map}
+          initialRegion={{
+              latitude: LATITUDE,
+              longitude: LONGITUDE,
+              latitudeDelta: LATITUDE_DELTA,
+              longitudeDelta: LONGITUDE_DELTA,
+          }}
+          showsIndoors
+          showsIndoorLevelPicker
+          onIndoorBuildingFocused={this.handleIndoorFocus}
+          ref={map => { this.map = map; }}
+          />
+          <Button title="go to level 5" onPress={() => { this.setIndoorLevel(5); }} />
+          <Button title="go to level 1" onPress={() => { this.setIndoorLevel(1); }} />
+      </View>
+      );
+  }
 }
 
 IndoorMap.propTypes = {
   provider: MapView.ProviderPropType,
 };
- 
+
 const styles = StyleSheet.create({
-    container: {
-        ...StyleSheet.absoluteFillObject,
-        justifyContent: 'flex-end',
-        alignItems: 'center',
-    },
-    map: {
-        ...StyleSheet.absoluteFillObject,
-    },
+  container: {
+    ...StyleSheet.absoluteFillObject,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+  },
+  map: {
+      ...StyleSheet.absoluteFillObject,
+  },
 });
 
-module.exports = IndoorMap;
\ No newline at end of file
+module.exports = IndoorMap;
diff --git a/lib/components/MapView.js b/lib/components/MapView.js
index cd0cd9dba0..9bb62888e3 100644
--- a/lib/components/MapView.js
+++ b/lib/components/MapView.js
@@ -598,11 +598,11 @@ class MapView extends React.Component {
   setMapBoundaries(northEast, southWest) {
     this._runCommand('setMapBoundaries', [northEast, southWest]);
   }
-  
+
   setIndoorActiveLevelIndex(activeLevelIndex) {
     this._runCommand('setIndoorActiveLevelIndex', [activeLevelIndex]);
   }
-  
+
   /**
    * Takes a snapshot of the map and saves it to a picture
    * file or returns the image as a base64 encoded string.

From 3c48209322a981b28a1b73830ae82db65fe7f7ef Mon Sep 17 00:00:00 2001
From: "ITONE\\bussakorn.wonghom" <>
Date: Wed, 22 Aug 2018 16:27:20 +0700
Subject: [PATCH 05/28] fix indentations

---
 example/examples/IndoorMap.js | 44 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/example/examples/IndoorMap.js b/example/examples/IndoorMap.js
index 9b208410cd..01f3911af0 100644
--- a/example/examples/IndoorMap.js
+++ b/example/examples/IndoorMap.js
@@ -11,46 +11,46 @@ const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO;
 
 class IndoorMap extends React.Component {
   constructor(props) {
-      super(props);
-      this.setIndoorLevel = this.setIndoorLevel.bind(this);
+    super(props);
+    this.setIndoorLevel = this.setIndoorLevel.bind(this);
   }
 
   handleIndoorFocus(event) {
-      const { indoorBuilding } = event.nativeEvent;
-      const { defaultLevelIndex, levels } = indoorBuilding;
-      const levelNames = levels.map(lv => lv.name || '');
-      const msg = `Default Level: ${defaultLevelIndex}\nLevels: ${levelNames.toString()}`;
-      Alert.alert(
-          'Indoor building focused',
-          msg
-      );
+    const { indoorBuilding } = event.nativeEvent;
+    const { defaultLevelIndex, levels } = indoorBuilding;
+    const levelNames = levels.map(lv => lv.name || '');
+    const msg = `Default Level: ${defaultLevelIndex}\nLevels: ${levelNames.toString()}`;
+    Alert.alert(
+      'Indoor building focused',
+      msg
+    );
   }
 
   setIndoorLevel(level) {
-      this.map.setIndoorActiveLevelIndex(level);
+    this.map.setIndoorActiveLevelIndex(level);
   }
 
   render() {
-      return (
+    return (
       <View style={styles.container}>
-          <MapView
+        <MapView
           provider={this.props.provider}
           style={styles.map}
           initialRegion={{
-              latitude: LATITUDE,
-              longitude: LONGITUDE,
-              latitudeDelta: LATITUDE_DELTA,
-              longitudeDelta: LONGITUDE_DELTA,
+            latitude: LATITUDE,
+            longitude: LONGITUDE,
+            latitudeDelta: LATITUDE_DELTA,
+            longitudeDelta: LONGITUDE_DELTA,
           }}
           showsIndoors
           showsIndoorLevelPicker
           onIndoorBuildingFocused={this.handleIndoorFocus}
           ref={map => { this.map = map; }}
-          />
-          <Button title="go to level 5" onPress={() => { this.setIndoorLevel(5); }} />
-          <Button title="go to level 1" onPress={() => { this.setIndoorLevel(1); }} />
+        />
+        <Button title="go to level 5" onPress={() => { this.setIndoorLevel(5); }} />
+        <Button title="go to level 1" onPress={() => { this.setIndoorLevel(1); }} />
       </View>
-      );
+    );
   }
 }
 
@@ -65,7 +65,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   map: {
-      ...StyleSheet.absoluteFillObject,
+    ...StyleSheet.absoluteFillObject,
   },
 });
 

From 5a01ef9d4975385c40d0d6ee4c61fa421beccd47 Mon Sep 17 00:00:00 2001
From: "ITONE\\bussakorn.wonghom" <>
Date: Wed, 22 Aug 2018 18:16:11 +0700
Subject: [PATCH 06/28] fix android build failed

---
 .../com/airbnb/android/react/maps/AirMapManager.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
index 69819f6c83..662019a45f 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
@@ -341,7 +341,10 @@ public Map getExportedCustomDirectEventTypeConstants() {
         "onMarkerDragEnd", MapBuilder.of("registrationName", "onMarkerDragEnd"),
         "onPanDrag", MapBuilder.of("registrationName", "onPanDrag"),
         "onKmlReady", MapBuilder.of("registrationName", "onKmlReady"),
-        "onPoiClick", MapBuilder.of("registrationName", "onPoiClick"),
+        "onPoiClick", MapBuilder.of("registrationName", "onPoiClick")
+    ));
+
+    map.putAll(MapBuilder.of(
         "onIndoorLevelActivated", MapBuilder.of("registrationName", "onIndoorLevelActivated"),
         "onIndoorBuildingFocused", MapBuilder.of("registrationName", "onIndoorBuildingFocused")
     ));
@@ -360,12 +363,12 @@ public Map<String, Integer> getCommandsMap() {
         "fitToElements", FIT_TO_ELEMENTS,
         "fitToSuppliedMarkers", FIT_TO_SUPPLIED_MARKERS,
         "fitToCoordinates", FIT_TO_COORDINATES,
-        "animateToNavigation", ANIMATE_TO_NAVIGATION,
-        "setIndoorActiveLevelIndex", SET_INDOOR_ACTIVE_LEVEL_INDEX
+        "animateToNavigation", ANIMATE_TO_NAVIGATION
     );
 
     map.putAll(MapBuilder.of(
-      "setMapBoundaries", SET_MAP_BOUNDARIES
+      "setMapBoundaries", SET_MAP_BOUNDARIES,
+      "setIndoorActiveLevelIndex", SET_INDOOR_ACTIVE_LEVEL_INDEX
     ));
 
     return map;

From 998eb4d730e1659b7de36df1368486deb34cc6f1 Mon Sep 17 00:00:00 2001
From: "ITONE\\bussakorn.wonghom" <>
Date: Wed, 22 Aug 2018 18:16:59 +0700
Subject: [PATCH 07/28] fix iOS won't focus on building

---
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
index a1eac6761c..0633f93477 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -31,7 +31,7 @@
 static NSString *const RCTMapViewKey = @"MapView";
 
 
-@interface AIRGoogleMapManager() <GMSMapViewDelegate>
+@interface AIRGoogleMapManager() <GMSMapViewDelegate, GMSIndoorDisplayDelegate>
 {
   BOOL didCallOnMapReady;
 }

From c928c717afe5bc17046cfc04512d9843572ee081 Mon Sep 17 00:00:00 2001
From: Marcel Kalveram <marcel.kalveram@googlemail.com>
Date: Sat, 8 Sep 2018 18:18:19 +0200
Subject: [PATCH 08/28] add edgePadding to fitToSuppliedMarkers function

---
 docs/mapview.md                                          | 2 +-
 index.d.ts                                               | 2 +-
 .../com/airbnb/android/react/maps/AirMapManager.java     | 2 +-
 .../java/com/airbnb/android/react/maps/AirMapView.java   | 8 +++++++-
 lib/components/MapView.js                                | 9 +++++++--
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.m              | 9 ++++++++-
 lib/ios/AirMaps/AIRMapManager.m                          | 9 ++++++++-
 7 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/docs/mapview.md b/docs/mapview.md
index 471e8d981a..6d2b06cfd0 100644
--- a/docs/mapview.md
+++ b/docs/mapview.md
@@ -75,7 +75,7 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
 | `animateToViewingAngle` | `angle: Number`, `duration: Number` |
 | `setMapBoundaries` | `northEast: LatLng`, `southWest: LatLng` | `GoogleMaps only`
 | `fitToElements` | `animated: Boolean` |
-| `fitToSuppliedMarkers` | `markerIDs: String[]`, `animated: Boolean` | If you need to use this in `ComponentDidMount`, make sure you put it in a timeout or it will cause performance problems.
+| `fitToSuppliedMarkers` | `markerIDs: String[], options: { edgePadding: EdgePadding, animated: Boolean }` | If you need to use this in `ComponentDidMount`, make sure you put it in a timeout or it will cause performance problems.
 | `fitToCoordinates` | `coordinates: Array<LatLng>, options: { edgePadding: EdgePadding, animated: Boolean }` | If called in `ComponentDidMount` in android, it will cause an exception. It is recommended to call it from the MapView `onLayout` event.
 | `pointForCoordinate` | `coordinate: LatLng` | Converts a map coordinate to a view coordinate (`Point`). Returns a `Promise<Point>`.
 | `coordinateForPoint` | `point: Point` | Converts a view coordinate (`Point`) to a map coordinate. Returns a `Promise<Coordinate>`.
diff --git a/index.d.ts b/index.d.ts
index ab350f158d..94926e93ee 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -220,7 +220,7 @@ declare module "react-native-maps" {
         animateToBearing(bearing: number, duration?: number): void;
         animateToViewingAngle(angle: number, duration?: number): void;
         fitToElements(animated: boolean): void;
-        fitToSuppliedMarkers(markers: string[], animated: boolean): void;
+        fitToSuppliedMarkers(markers: string[], options?: { edgePadding?: EdgePadding, animated?: boolean }): void;
         fitToCoordinates(coordinates?: LatLng[], options?: { edgePadding?: EdgePadding, animated?: boolean }): void;
         setMapBoundaries(northEast: LatLng, southWest: LatLng): void;
         takeSnapshot(options?: SnapshotOptions): Promise<string>;
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
index 43651f7e24..23a7a20db2 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
@@ -290,7 +290,7 @@ public void receiveCommand(AirMapView view, int commandId, @Nullable ReadableArr
         break;
 
       case FIT_TO_SUPPLIED_MARKERS:
-        view.fitToSuppliedMarkers(args.getArray(0), args.getBoolean(1));
+        view.fitToSuppliedMarkers(args.getArray(0), args.getMap(1), args.getBoolean(2));
         break;
 
       case FIT_TO_COORDINATES:
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index 6da24f6abc..a9ed1ab014 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -665,7 +665,7 @@ public void fitToElements(boolean animated) {
     }
   }
 
-  public void fitToSuppliedMarkers(ReadableArray markerIDsArray, boolean animated) {
+  public void fitToSuppliedMarkers(ReadableArray markerIDsArray, ReadableMap edgePadding, boolean animated) {
     if (map == null) return;
 
     LatLngBounds.Builder builder = new LatLngBounds.Builder();
@@ -693,6 +693,12 @@ public void fitToSuppliedMarkers(ReadableArray markerIDsArray, boolean animated)
     if (addedPosition) {
       LatLngBounds bounds = builder.build();
       CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
+      
+      if (edgePadding != null) {
+        map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
+          edgePadding.getInt("right"), edgePadding.getInt("bottom"));
+      }   
+      
       if (animated) {
         map.animateCamera(cu);
       } else {
diff --git a/lib/components/MapView.js b/lib/components/MapView.js
index b848beb4ee..dde8d8a793 100644
--- a/lib/components/MapView.js
+++ b/lib/components/MapView.js
@@ -569,8 +569,13 @@ class MapView extends React.Component {
     this._runCommand('fitToElements', [animated]);
   }
 
-  fitToSuppliedMarkers(markers, animated) {
-    this._runCommand('fitToSuppliedMarkers', [markers, animated]);
+  fitToSuppliedMarkers(markers, options = {}) {
+    const {
+      edgePadding = { top: 0, right: 0, bottom: 0, left: 0 },
+      animated = true,
+    } = options;
+
+    this._runCommand('fitToSuppliedMarkers', [markers, edgePadding, animated]);
   }
 
   fitToCoordinates(coordinates = [], options = {}) {
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
index 2f768f976a..9bd49595d1 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -175,6 +175,7 @@ - (UIView *)view
 
 RCT_EXPORT_METHOD(fitToSuppliedMarkers:(nonnull NSNumber *)reactTag
                   markers:(nonnull NSArray *)markers
+                  edgePadding:(nonnull NSDictionary *)edgePadding
                   animated:(BOOL)animated)
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
@@ -197,7 +198,13 @@ - (UIView *)view
       for (AIRGoogleMapMarker *marker in filteredMarkers)
         bounds = [bounds includingCoordinate:marker.realMarker.position];
 
-      [mapView animateWithCameraUpdate:[GMSCameraUpdate fitBounds:bounds withPadding:55.0f]];
+      // Set Map viewport
+      CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+      CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+      CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+      CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+      [mapView animateWithCameraUpdate:[GMSCameraUpdate fitBounds:bounds withPadding:55.0f withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)]];
     }
   }];
 }
diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m
index b7fe67c0c3..edff6e2b0d 100644
--- a/lib/ios/AirMaps/AIRMapManager.m
+++ b/lib/ios/AirMaps/AIRMapManager.m
@@ -226,6 +226,7 @@ - (UIView *)view
 
 RCT_EXPORT_METHOD(fitToSuppliedMarkers:(nonnull NSNumber *)reactTag
                   markers:(nonnull NSArray *)markers
+                  edgePadding:(nonnull NSDictionary *)edgePadding
                   animated:(BOOL)animated)
 {
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
@@ -244,7 +245,13 @@ - (UIView *)view
 
             NSArray *filteredMarkers = [mapView.annotations filteredArrayUsingPredicate:filterMarkers];
 
-            [mapView showAnnotations:filteredMarkers animated:animated];
+            CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+            CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+            CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+            CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+            [mapView showAnnotations:filteredMarkers edgePadding:UIEdgeInsetsMake(top, left, bottom, right) animated:animated];
+            
         }
     }];
 }

From 47867bb617743d9caec24246503dcf3ff868f348 Mon Sep 17 00:00:00 2001
From: Yusuke Ohashi <steveohashi@gmail.com>
Date: Fri, 7 Sep 2018 21:00:45 +0900
Subject: [PATCH 09/28] Fix a peer dependencies warning

- update peer dependencies
- modified version notation of react-native.
- use the release version of react
---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 08a2174fc4..a80b4561df 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,8 @@
     "mapkit"
   ],
   "peerDependencies": {
-    "react": "^16.0",
-    "react-native": "^0.51 || ^0.52 || ^0.53 || ^0.54 || ^0.55",
+    "react": ">= 16.0 || < 17.0",
+    "react-native": ">= 0.51",
     "prop-types": "^15.0 || ^16.0"
   },
   "devDependencies": {
@@ -48,7 +48,7 @@
     "gitbook-cli": "^2.3.0",
     "lodash": "^4.17.2",
     "prop-types": "^15.5.10",
-    "react": "^16.3.0-alpha.1",
+    "react": "^16.3.2",
     "react-native": "^0.54"
   },
   "rnpm": {

From 710dca49a515f0f781f51fcc6997af43da9923cc Mon Sep 17 00:00:00 2001
From: Alexander Veligurov <aveligurov@gmail.com>
Date: Tue, 11 Sep 2018 16:00:22 -0300
Subject: [PATCH 10/28] hotfix PR #2478

---
 .../src/main/java/com/airbnb/android/react/maps/AirMapView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index 73ebf11cba..33075d8f10 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -189,7 +189,7 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
       attacherGroup.setClipBounds(new Rect(0, 0, 0, 0));
     }
-    attacherGroup.setOverflow(ViewProps.HIDDEN);
+    attacherGroup.setOverflow("hidden");
     addView(attacherGroup);
   }
 

From 21208c4cb7ebae5fe8640becb54dc7c0ebf91606 Mon Sep 17 00:00:00 2001
From: Leon Guo <leonguo@Mac-mini.local>
Date: Fri, 21 Sep 2018 09:42:15 +0800
Subject: [PATCH 11/28] Added flag to make sure that there has an Observer of
 view.

---
 lib/ios/AirMaps/AIRMapManager.m | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m
index f39e2110d5..3640d6022d 100644
--- a/lib/ios/AirMaps/AIRMapManager.m
+++ b/lib/ios/AirMaps/AIRMapManager.m
@@ -37,7 +37,9 @@ @interface AIRMapManager() <MKMapViewDelegate>
 
 @end
 
-@implementation AIRMapManager
+@implementation AIRMapManager{
+   BOOL _hasObeserver;
+}
   
 RCT_EXPORT_MODULE()
 
@@ -704,11 +706,12 @@ - (void)mapView:(AIRMap *)mapView
         if (mapView.onMarkerDragEnd) mapView.onMarkerDragEnd(event);
         if (marker.onDragEnd) marker.onDragEnd(event);
 
-        [view removeObserver:self forKeyPath:@"center"];
+       if(_hasObeserver) [view removeObserver:self forKeyPath:@"center"];
+        _hasObeserver = NO;
     } else if (newState == MKAnnotationViewDragStateStarting) {
         // MapKit doesn't emit continuous drag events. To get around this, we are going to use KVO.
         [view addObserver:self forKeyPath:@"center" options:NSKeyValueObservingOptionNew context:&kDragCenterContext];
-
+        _hasObeserver = YES;
         if (mapView.onMarkerDragStart) mapView.onMarkerDragStart(event);
         if (marker.onDragStart) marker.onDragStart(event);
     }

From 38b9d54ae805c29c97d1140602419b93dec291b1 Mon Sep 17 00:00:00 2001
From: Leon Guo <leonguo@Mac-mini.local>
Date: Fri, 21 Sep 2018 11:13:18 +0800
Subject: [PATCH 12/28] fix spelling mistakes

---
 lib/ios/AirMaps/AIRMapManager.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m
index 3640d6022d..6fb25db5bc 100644
--- a/lib/ios/AirMaps/AIRMapManager.m
+++ b/lib/ios/AirMaps/AIRMapManager.m
@@ -38,7 +38,7 @@ @interface AIRMapManager() <MKMapViewDelegate>
 @end
 
 @implementation AIRMapManager{
-   BOOL _hasObeserver;
+   BOOL _hasObserver;
 }
   
 RCT_EXPORT_MODULE()
@@ -706,12 +706,12 @@ - (void)mapView:(AIRMap *)mapView
         if (mapView.onMarkerDragEnd) mapView.onMarkerDragEnd(event);
         if (marker.onDragEnd) marker.onDragEnd(event);
 
-       if(_hasObeserver) [view removeObserver:self forKeyPath:@"center"];
-        _hasObeserver = NO;
+       if(_hasObserver) [view removeObserver:self forKeyPath:@"center"];
+        _hasObserver = NO;
     } else if (newState == MKAnnotationViewDragStateStarting) {
         // MapKit doesn't emit continuous drag events. To get around this, we are going to use KVO.
         [view addObserver:self forKeyPath:@"center" options:NSKeyValueObservingOptionNew context:&kDragCenterContext];
-        _hasObeserver = YES;
+        _hasObserver = YES;
         if (mapView.onMarkerDragStart) mapView.onMarkerDragStart(event);
         if (marker.onDragStart) marker.onDragStart(event);
     }

From 78a36ac3727d9781187b008d255fc365b7873f94 Mon Sep 17 00:00:00 2001
From: Daniel Cohen Gindi <Danielgindi@gmail.com>
Date: Fri, 21 Sep 2018 10:49:49 +0300
Subject: [PATCH 13/28] Performance improvements for tracksViewChanges (#2487)

* Avoid unnecessary redraws and bitmap allocations

* Avoid drawing empty background of ViewAttacherGroup

* Moved some ViewAttacherGroup initialization to constructor

* Some documentation

* Added missing `setTracksViewChanges` (to allow disabling tracksViewChanges)

* Added new `redraw` method on MapMarker to cause a redraw of custom marker

* Let it render one more time when toggling tracksViewChanges to false
---
 docs/marker.md                                |   1 +
 .../android/react/maps/AirMapMarker.java      | 100 ++++++++++++++----
 .../react/maps/AirMapMarkerManager.java       |  19 +++-
 .../airbnb/android/react/maps/AirMapView.java |  14 +--
 .../android/react/maps/ViewAttacherGroup.java |  13 +++
 .../react/maps/ViewChangesTracker.java        |   4 +-
 lib/components/MapMarker.js                   |   6 +-
 lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h    |   1 +
 lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m    |  20 ++++
 .../AirGoogleMaps/AIRGoogleMapMarkerManager.m |  12 +++
 10 files changed, 153 insertions(+), 37 deletions(-)

diff --git a/docs/marker.md b/docs/marker.md
index 8df3a3f2ad..36e506e162 100644
--- a/docs/marker.md
+++ b/docs/marker.md
@@ -44,6 +44,7 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
 | `showCallout` |  | Shows the callout for this marker
 | `hideCallout` |  | Hides the callout for this marker
 | `animateMarkerToCoordinate` | `coordinate: LatLng, duration: number` | Animates marker movement. **Note**: Android only
+| `redraw` |  | Causes a redraw of the marker. Useful when there are updates to the marker and `tracksViewChanges` comes with a cost that is too high.
 
 
 
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
index 70c9615aec..42138d9ec6 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
@@ -4,6 +4,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -75,6 +76,7 @@ public class AirMapMarker extends AirMapFeature {
 
   private boolean tracksViewChanges = true;
   private boolean tracksViewChangesActive = false;
+  private boolean hasViewChanges = true;
 
   private boolean hasCustomMarkerView = false;
 
@@ -108,7 +110,7 @@ public void onFinalImageSet(
               CloseableReference.closeSafely(imageReference);
             }
           }
-          update();
+          update(true);
         }
       };
 
@@ -150,12 +152,12 @@ public void setCoordinate(ReadableMap coordinate) {
     if (marker != null) {
       marker.setPosition(position);
     }
-    update();
+    update(false);
   }
 
   public void setIdentifier(String identifier) {
     this.identifier = identifier;
-    update();
+    update(false);
   }
 
   public String getIdentifier() {
@@ -167,7 +169,7 @@ public void setTitle(String title) {
     if (marker != null) {
       marker.setTitle(title);
     }
-    update();
+    update(false);
   }
 
   public void setSnippet(String snippet) {
@@ -175,7 +177,7 @@ public void setSnippet(String snippet) {
     if (marker != null) {
       marker.setSnippet(snippet);
     }
-    update();
+    update(false);
   }
 
   public void setRotation(float rotation) {
@@ -183,7 +185,7 @@ public void setRotation(float rotation) {
     if (marker != null) {
       marker.setRotation(rotation);
     }
-    update();
+    update(false);
   }
 
   public void setFlat(boolean flat) {
@@ -191,7 +193,7 @@ public void setFlat(boolean flat) {
     if (marker != null) {
       marker.setFlat(flat);
     }
-    update();
+    update(false);
   }
 
   public void setDraggable(boolean draggable) {
@@ -199,7 +201,7 @@ public void setDraggable(boolean draggable) {
     if (marker != null) {
       marker.setDraggable(draggable);
     }
-    update();
+    update(false);
   }
 
   public void setZIndex(int zIndex) {
@@ -207,7 +209,7 @@ public void setZIndex(int zIndex) {
     if (marker != null) {
       marker.setZIndex(zIndex);
     }
-    update();
+    update(false);
   }
 
   public void setOpacity(float opacity) {
@@ -215,12 +217,12 @@ public void setOpacity(float opacity) {
     if (marker != null) {
       marker.setAlpha(opacity);
     }
-    update();
+    update(false);
   }
 
   public void setMarkerHue(float markerHue) {
     this.markerHue = markerHue;
-    update();
+    update(false);
   }
 
   public void setAnchor(double x, double y) {
@@ -230,7 +232,7 @@ public void setAnchor(double x, double y) {
     if (marker != null) {
       marker.setAnchor(anchorX, anchorY);
     }
-    update();
+    update(false);
   }
 
   public void setCalloutAnchor(double x, double y) {
@@ -240,7 +242,7 @@ public void setCalloutAnchor(double x, double y) {
     if (marker != null) {
       marker.setInfoWindowAnchor(calloutAnchorX, calloutAnchorY);
     }
-    update();
+    update(false);
   }
 
   public void setTracksViewChanges(boolean tracksViewChanges) {
@@ -257,18 +259,36 @@ private void updateTracksViewChanges() {
       ViewChangesTracker.getInstance().addMarker(this);
     } else {
       ViewChangesTracker.getInstance().removeMarker(this);
+
+      // Let it render one more time to avoid race conditions.
+      // i.e. Image onLoad ->
+      //      ViewChangesTracker may not get a chance to render ->
+      //      setState({ tracksViewChanges: false }) ->
+      //      image loaded but not rendered.
+      updateMarkerIcon();
     }
   }
 
-  public boolean updateCustomMarkerIcon() {
+  public boolean updateCustomForTracking() {
     if (!tracksViewChangesActive)
       return false;
 
-    marker.setIcon(getIcon());
+    updateMarkerIcon();
 
     return true;
   }
 
+  public void updateMarkerIcon() {
+    if (!hasViewChanges) return;
+
+    if (!hasCustomMarkerView) {
+      // No more updates for this, as it's a simple icon
+      hasViewChanges = false;
+    }
+
+    marker.setIcon(getIcon());
+  }
+
   public LatLng interpolate(float fraction, LatLng a, LatLng b) {
     double lat = (b.latitude - a.latitude) * fraction + a.latitude;
     double lng = (b.longitude - a.longitude) * fraction + a.longitude;
@@ -293,9 +313,11 @@ public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
   }
 
   public void setImage(String uri) {
+    hasViewChanges = true;
+
     if (uri == null) {
       iconBitmapDescriptor = null;
-      update();
+      update(true);
     } else if (uri.startsWith("http://") || uri.startsWith("https://") ||
         uri.startsWith("file://") || uri.startsWith("asset://")) {
       ImageRequest imageRequest = ImageRequestBuilder
@@ -323,7 +345,7 @@ public void setImage(String uri) {
               drawable.draw(canvas);
           }
       }
-      update();
+      update(true);
     }
   }
 
@@ -344,7 +366,21 @@ public void addView(View child, int index) {
       hasCustomMarkerView = true;
       updateTracksViewChanges();
     }
-    update();
+    update(true);
+  }
+
+  @Override
+  public void requestLayout() {
+    super.requestLayout();
+
+    if (getChildCount() == 0) {
+      if (hasCustomMarkerView) {
+        hasCustomMarkerView = false;
+        clearDrawableCache();
+        updateTracksViewChanges();
+        update(true);
+      }
+    }
   }
 
   @Override
@@ -404,12 +440,13 @@ private MarkerOptions fillMarkerOptions(MarkerOptions options) {
     return options;
   }
 
-  public void update() {
+  public void update(boolean updateIcon) {
     if (marker == null) {
       return;
     }
 
-    marker.setIcon(getIcon());
+    if (updateIcon)
+      updateMarkerIcon();
 
     if (anchorIsSet) {
       marker.setAnchor(anchorX, anchorY);
@@ -427,14 +464,33 @@ public void update() {
   public void update(int width, int height) {
     this.width = width;
     this.height = height;
-    update();
+
+    update(true);
+  }
+
+  private Bitmap mLastBitmapCreated = null;
+
+  private void clearDrawableCache() {
+    mLastBitmapCreated = null;
   }
 
   private Bitmap createDrawable() {
     int width = this.width <= 0 ? 100 : this.width;
     int height = this.height <= 0 ? 100 : this.height;
     this.buildDrawingCache();
-    Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+
+    // Do not create the doublebuffer-bitmap each time. reuse it to save memory.
+    Bitmap bitmap = mLastBitmapCreated;
+
+    if (bitmap == null ||
+            bitmap.isRecycled() ||
+            bitmap.getWidth() != width ||
+            bitmap.getHeight() != height) {
+      bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+      mLastBitmapCreated = bitmap;
+    } else {
+      bitmap.eraseColor(Color.TRANSPARENT);
+    }
 
     Canvas canvas = new Canvas(bitmap);
     this.draw(canvas);
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarkerManager.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarkerManager.java
index 080abad71c..ccd7e05c21 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarkerManager.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarkerManager.java
@@ -23,6 +23,7 @@ public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
   private static final int SHOW_INFO_WINDOW = 1;
   private static final int HIDE_INFO_WINDOW = 2;
   private static final int ANIMATE_MARKER_TO_COORDINATE = 3;
+  private static final int REDRAW = 4;
 
   public AirMapMarkerManager() {
   }
@@ -133,6 +134,11 @@ public void setOpacity(AirMapMarker view, float opacity) {
     view.setOpacity(opacity);
   }
 
+  @ReactProp(name = "tracksViewChanges", defaultBoolean = true)
+  public void setTracksViewChanges(AirMapMarker view, boolean tracksViewChanges) {
+    view.setTracksViewChanges(tracksViewChanges);
+  }
+
   @Override
   public void addView(AirMapMarker parent, View child, int index) {
     // if an <Callout /> component is a child, then it is a callout view, NOT part of the
@@ -141,14 +147,14 @@ public void addView(AirMapMarker parent, View child, int index) {
       parent.setCalloutView((AirMapCallout) child);
     } else {
       super.addView(parent, child, index);
-      parent.update();
+      parent.update(true);
     }
   }
 
   @Override
   public void removeViewAt(AirMapMarker parent, int index) {
     super.removeViewAt(parent, index);
-    parent.update();
+    parent.update(true);
   }
 
   @Override
@@ -157,7 +163,8 @@ public Map<String, Integer> getCommandsMap() {
     return MapBuilder.of(
         "showCallout", SHOW_INFO_WINDOW,
         "hideCallout", HIDE_INFO_WINDOW,
-        "animateMarkerToCoordinate",  ANIMATE_MARKER_TO_COORDINATE
+        "animateMarkerToCoordinate", ANIMATE_MARKER_TO_COORDINATE,
+        "redraw", REDRAW
     );
   }
 
@@ -176,7 +183,7 @@ public void receiveCommand(AirMapMarker view, int commandId, @Nullable ReadableA
       case HIDE_INFO_WINDOW:
         ((Marker) view.getFeature()).hideInfoWindow();
         break;
-      
+
       case ANIMATE_MARKER_TO_COORDINATE:
         region = args.getMap(0);
         duration = args.getInt(1);
@@ -185,6 +192,10 @@ public void receiveCommand(AirMapMarker view, int commandId, @Nullable ReadableA
         lat = region.getDouble("latitude");
         view.animateToCoodinate(new LatLng(lat, lng), duration);
         break;
+
+      case REDRAW:
+        view.updateMarkerIcon();
+        break;
     }
   }
 
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index 33075d8f10..7f5532efca 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -183,13 +183,6 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
     attacherLayoutParams.leftMargin = 99999999;
     attacherLayoutParams.topMargin = 99999999;
     attacherGroup.setLayoutParams(attacherLayoutParams);
-    attacherGroup.setVisibility(VISIBLE);
-    attacherGroup.setAlpha(0.0f);
-    attacherGroup.setRemoveClippedSubviews(false);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      attacherGroup.setClipBounds(new Rect(0, 0, 0, 0));
-    }
-    attacherGroup.setOverflow("hidden");
     addView(attacherGroup);
   }
 
@@ -540,9 +533,16 @@ public void addFeature(View child, int index) {
       annotation.addToMap(map);
       features.add(index, annotation);
 
+      // Allow visibility event to be triggered later
       int visibility = annotation.getVisibility();
       annotation.setVisibility(INVISIBLE);
+
+      // Add to the parent group
       attacherGroup.addView(annotation);
+
+      // Trigger visibility event if necessary.
+      // With some testing, seems like it is not always
+      //   triggered just by being added to a parent view.
       annotation.setVisibility(visibility);
 
       Marker marker = (Marker) annotation.getFeature();
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/ViewAttacherGroup.java b/lib/android/src/main/java/com/airbnb/android/react/maps/ViewAttacherGroup.java
index 2f9d5332c2..30477c0a97 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/ViewAttacherGroup.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/ViewAttacherGroup.java
@@ -1,13 +1,26 @@
 package com.airbnb.android.react.maps;
 
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Build;
 
+import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.view.ReactViewGroup;
 
 public class ViewAttacherGroup extends ReactViewGroup {
 
   public ViewAttacherGroup(Context context) {
     super(context);
+
+    this.setWillNotDraw(true);
+    this.setVisibility(VISIBLE);
+    this.setAlpha(0.0f);
+    this.setRemoveClippedSubviews(false);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      this.setClipBounds(new Rect(0, 0, 0, 0));
+    }
+    this.setOverflow("hidden"); // Change to ViewProps.HIDDEN until RN 0.57 is base
   }
 
   // This should make it more performant, avoid trying to hard to overlap layers with opacity.
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/ViewChangesTracker.java b/lib/android/src/main/java/com/airbnb/android/react/maps/ViewChangesTracker.java
index f5a299de59..8094b135d2 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/ViewChangesTracker.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/ViewChangesTracker.java
@@ -60,7 +60,7 @@ public boolean containsMarker(AirMapMarker marker) {
 
   public void update() {
     for (AirMapMarker marker : markers) {
-      if (!marker.updateCustomMarkerIcon()) {
+      if (!marker.updateCustomForTracking()) {
         markersToRemove.add(marker);
       }
     }
@@ -68,7 +68,7 @@ public void update() {
     // Remove markers that are not active anymore
     if (markersToRemove.size() > 0) {
       markers.removeAll(markersToRemove);
-      markersToRemove.clear();;
+      markersToRemove.clear();
     }
   }
 
diff --git a/lib/components/MapMarker.js b/lib/components/MapMarker.js
index ef0d103ff2..37d3cd5b73 100644
--- a/lib/components/MapMarker.js
+++ b/lib/components/MapMarker.js
@@ -172,8 +172,6 @@ const propTypes = {
 
   /**
    * Sets whether this marker should track view changes true.
-   *
-   * @platform ios
    */
 
   tracksViewChanges: PropTypes.bool,
@@ -264,6 +262,10 @@ class MapMarker extends React.Component {
     this._runCommand('animateMarkerToCoordinate', [coordinate, duration || 500]);
   }
 
+  redraw() {
+    this._runCommand('redraw', []);
+  }
+
   _getHandle() {
     return findNodeHandle(this.marker);
   }
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h
index 7cc2f76a2b..1a4c4ff67e 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h
@@ -39,6 +39,7 @@
 
 - (void)showCalloutView;
 - (void)hideCalloutView;
+- (void)redraw;
 - (UIView *)markerInfoContents;
 - (UIView *)markerInfoWindow;
 - (void)didTapInfoWindowOfMarker:(AIRGMSMarker *)marker;
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m
index b5db8c696d..9108b793cc 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m
@@ -115,6 +115,26 @@ - (void)hideCalloutView {
   [_realMarker.map setSelectedMarker:Nil];
 }
 
+- (void)redraw {
+  if (!_realMarker.iconView) return;
+  
+  BOOL oldValue = _realMarker.tracksViewChanges;
+  
+  if (oldValue == YES)
+  {
+    // Immediate refresh, like right now. Not waiting for next frame.
+    UIView *view = _realMarker.iconView;
+    _realMarker.iconView = nil;
+    _realMarker.iconView = view;
+  }
+  else
+  {
+    // Refresh according to docs
+    _realMarker.tracksViewChanges = YES;
+    _realMarker.tracksViewChanges = NO;
+  }
+}
+
 - (UIView *)markerInfoContents {
   if (self.calloutView && !self.calloutView.tooltip) {
     return self.calloutView;
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m
index 050d7614cb..2937bd5b0f 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m
@@ -70,6 +70,18 @@ - (UIView *)view
     }
   }];
 }
+
+RCT_EXPORT_METHOD(redraw:(nonnull NSNumber *)reactTag)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    id view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[AIRGoogleMapMarker class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+    } else {
+      [(AIRGoogleMapMarker *) view redraw];
+    }
+  }];
+}
 @end
 
 #endif

From 1aee143302129f3811f1753155600bd041b5214d Mon Sep 17 00:00:00 2001
From: marcelkalveram <marcel.kalveram@googlemail.com>
Date: Mon, 1 Oct 2018 19:20:42 +0200
Subject: [PATCH 14/28] fix fitToSuppliedMarkers function (#2524)

Fixes https://github.com/react-community/react-native-maps/issues/2513
---
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.m | 2 +-
 lib/ios/AirMaps/AIRMapManager.m             | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
index e784ddffb3..fa6cc2505b 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -236,7 +236,7 @@ - (UIView *)view
       CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
       CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
 
-      [mapView animateWithCameraUpdate:[GMSCameraUpdate fitBounds:bounds withPadding:55.0f withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)]];
+      [mapView animateWithCameraUpdate:[GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)]];
     }
   }];
 }
diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m
index 7cee23be99..0c4fcfea43 100644
--- a/lib/ios/AirMaps/AIRMapManager.m
+++ b/lib/ios/AirMaps/AIRMapManager.m
@@ -271,12 +271,7 @@ - (UIView *)view
 
             NSArray *filteredMarkers = [mapView.annotations filteredArrayUsingPredicate:filterMarkers];
 
-            CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
-            CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
-            CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
-            CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
-
-            [mapView showAnnotations:filteredMarkers edgePadding:UIEdgeInsetsMake(top, left, bottom, right) animated:animated];
+            [mapView showAnnotations:filteredMarkers animated:animated];
             
         }
     }];

From a45f7a74ed138deb616b6081b4ea5f9355e29710 Mon Sep 17 00:00:00 2001
From: Elias Toivanen <elias.a.toivanen@gmail.com>
Date: Thu, 11 Oct 2018 12:58:01 +0300
Subject: [PATCH 15/28] Improve installation docs (#2541)

* Improve installation docs

* PR comment fixes
---
 docs/installation.md | 307 +++++++++++++++++++++++++++----------------
 1 file changed, 193 insertions(+), 114 deletions(-)

diff --git a/docs/installation.md b/docs/installation.md
index 27c6818a72..6d4f8047fa 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -1,30 +1,50 @@
 # Installation
 
-First, download the library from npm:
+Install the library from npm:
 
-```
+```sh
 npm install react-native-maps --save
 ```
 
+The library ships with platform native code that needs to be compiled
+together with React Native. This requires you to configure your build
+tools.
+
+The actual map implementation depends on the platform. On Android, one
+has to use [Google
+Maps](https://developers.google.com/maps/documentation/), which in turn
+requires you to obtain an API key for the [Android
+SDK](https://developers.google.com/maps/documentation/android-sdk/signup).
 
-## Get a Google Maps API key
+On iOS, one can choose between Google Maps or the native [Apple
+Maps](https://developer.apple.com/documentation/mapkit/) implementation. 
 
-Go to https://developers.google.com/maps/documentation/ios-sdk/get-api-key and https://developers.google.com/maps/documentation/android-api/signup to get your keys for both iOS and Android.
+When using Google Maps on iOS, you need to also register for the [iOS
+SDK](https://developers.google.com/maps/documentation/ios-sdk/get-api-key)
+and include the Google Maps library in your build. The native Apple Maps
+based implementation works out-of-the-box and is therefore simpler to
+use at the price of missing some of the features supported by the Google
+Maps backend.
 
-Make sure that Google Maps Android API and Google Maps SDK for iOS are enabled for the current project.
-https://console.developers.google.com/apis/library/maps-android-backend.googleapis.com/
-https://console.developers.google.com/apis/library/maps-ios-backend.googleapis.com
+## Build configuration on iOS
 
-Without an API key the Google Maps map won't render anything.
+### Using React Native Link
 
+Run `react-native link react-native-maps` after which you should be able
+to use this library on iOS. Note that by default this will use Apple
+Maps and you will miss some of the features provided by Google (see the
+instruction on manually enabling Google Maps below).
 
-## iOS - CocoaPods
+### Using CocoaPods
 
-Setup your `Podfile` (found at `/ios/Podfile` as below, replace all references to `_YOUR_PROJECT_TARGET_` with your project target (it's the same as project name by default), and then run `pod install` while in the `ios` folder.
+> If the CocoaPods package manager is new to you, please first review
+> its [installation guide](https://guides.cocoapods.org/using/getting-started.html)
 
-Please make sure to use `.xcworkspace`, not `.xcproject` after that.
+Setup your `Podfile` (found at `ios/Podfile` as below, replacing all
+references to `_YOUR_PROJECT_TARGET_` with your project target (it's the
+same as project name by default).
 
-~~~
+```ruby
 # Uncomment the next line to define a global platform for your project
 # platform :ios, '9.0'
 
@@ -61,9 +81,9 @@ target '_YOUR_PROJECT_TARGET_' do
 
   # react-native-maps dependencies
   pod 'react-native-maps', path: rn_maps_path
-  pod 'react-native-google-maps', path: rn_maps_path  # Remove this line if you don't want to support GoogleMaps on iOS
-  pod 'GoogleMaps'  # Remove this line if you don't want to support GoogleMaps on iOS
-  pod 'Google-Maps-iOS-Utils' # Remove this line if you don't want to support GoogleMaps on iOS
+  # pod 'react-native-google-maps', path: rn_maps_path  # Unomment this line if you want to support GoogleMaps on iOS
+  # pod 'GoogleMaps'  # Uncomment this line if you want to support GoogleMaps on iOS
+  # pod 'Google-Maps-iOS-Utils' # Uncomment this line if you want to support GoogleMaps on iOS
 end
 
 post_install do |installer|
@@ -78,23 +98,20 @@ post_install do |installer|
     end
   end
 end
-~~~
-
-## iOS - ReactNative Link
+```
 
-Run `react-native link react-native-maps`. Note that by default this will use
-Apple Maps and that the configuration of Google Maps will be more difficult.
+Then run in the `ios` folder
 
-Functionality that depends on `Google-Maps-iOS-Utils` has been disabled for this
-configuration via runtime errors due to the fact that this framework is not
-available for download as a pre-compiled binary. An exception will be raised if
-you try to use the following features:
+```sh
+pod install 
+```
 
-- Making markers via KML files
+and open the produced workspace file (`.xcworkspace`) in XCode to build your project.
 
-## If you want to use Google maps
+### Enabling Google Maps on iOS
 
-Add to `ios/_YOUR_PROJECT_NAME_/AppDelegate.m:
+If you want to enable Google Maps on iOS, obtain the Google API key and
+edit your `AppDelegate.m` as follows:
 
 ```objc
 + #import <GoogleMaps/GoogleMaps.h>
@@ -108,14 +125,20 @@ Add to `ios/_YOUR_PROJECT_NAME_/AppDelegate.m:
 ...
 ```
 
-This should be the **first line** of the method.
+The `[GMSServices provideAPIKey]` should be the **first call** of the method.
 
-#### If you are not using CocoaPods
+Then, do either of the following
 
-If you installed via `react-native-link`, add the following to your
-`package.json` and replace the `REPLACE_ME_RELATIVE_PATH_TO_GOOGLE_MAPS_INSTALL`
-with the relative path from your project root to the directory in which you
-installed the Google Maps frameworks:
+1. If you are using CocoaPods to manage your dependecies, uncomment the
+lines related to Google Maps from the `Podfile` and run `pod install`.
+
+2. If you used React Native link, you may include Google Maps manually as a
+XCode framework following the instructions from [SDK docs -> Install
+manually](https://developers.google.com/maps/documentation/ios-sdk/start). Then, to link this library to the framework, add the following to your
+`package.json` and replace the
+`REPLACE_ME_RELATIVE_PATH_TO_GOOGLE_MAPS_INSTALL` with the relative path
+from your project root to the directory in which you installed the
+Google Maps frameworks:
 
 ```json
 {
@@ -128,15 +151,19 @@ installed the Google Maps frameworks:
 
 Re-run `npm install` or `yarn` to ensure the `postinstall` script is run.
 
+## Build configuration on Android
 
-## Notes on running on a real ios device
-
-The steps are as described in https://facebook.github.io/react-native/docs/running-on-device.html , however instead of opening the .xcodeproj file you should open .xcworkspace file.
+Ensure your build files match the following requirements:
 
+1. Define the `react-native-maps` project in `android/settings.gradle`:
 
-## Android
+```groovy
+...
+include ':react-native-maps'
+project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
+```
 
-1. In your `android/app/build.gradle` add:
+2. Add the `react-native-maps` as an dependency of your app in `android/app/build.gradle`:
 
 ```groovy
 ...
@@ -146,7 +173,10 @@ dependencies {
 }
 ```
 
-If you've defined *[project-wide properties](https://developer.android.com/studio/build/gradle-tips.html)* (**recommended**) in your root `build.gradle`, this library will detect the presence of the following properties:
+If you've defined *[project-wide
+properties](https://developer.android.com/studio/build/gradle-tips.html)*
+(**recommended**) in your root `build.gradle`, this library will detect
+the presence of the following properties:
 
 ```groovy
 buildscript {...}
@@ -165,7 +195,9 @@ ext {
 }
 ```
 
-   If you do **not** have *project-wide properties* defined and have a different play-services version than the one included in this library, use the following instead (switch 10.0.1 for the desired version):
+If you do **not** have *project-wide properties* defined and have a
+different play-services version than the one included in this library,
+use the following instead (switch 10.0.1 for the desired version):
 
 ```groovy
 ...
@@ -180,14 +212,6 @@ dependencies {
 }
 ```
 
-2. In your `android/settings.gradle` add:
-
-```groovy
-...
-include ':react-native-maps'
-project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
-```
-
 3. Specify your Google Maps API Key:
 
    Add your API key to your manifest file (`android/app/src/main/AndroidManifest.xml`):
@@ -200,9 +224,17 @@ project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../
      android:value="Your Google maps API Key Here"/>
 </application>
 ```
-   > Note: As shown above, com.google.android.geo.API_KEY is the recommended metadata name for the API key. A key with this name can be used to authenticate to multiple Google Maps-based APIs on the Android platform, including the Google Maps Android API. For backwards compatibility, the API also supports the name com.google.android.maps.v2.API_KEY. This legacy name allows authentication to the Android Maps API v2 only. An application can specify only one of the API key metadata names. If both are specified, the API throws an exception.
-Source: https://developers.google.com/maps/documentation/android-api/signup
+> Note: As shown above, `com.google.android.geo.API_KEY` is the
+> recommended metadata name for the API key. A key with this name can be
+> used to authenticate to multiple Google Maps-based APIs on the Android
+> platform, including the Google Maps Android API. For backwards
+> compatibility, the API also supports the name
+> `com.google.android.maps.v2.API_KEY`. This legacy name allows
+> authentication to the Android Maps API v2 only. An application can
+> specify only one of the API key metadata names. If both are specified,
+> the API throws an exception.
 
+Source: https://developers.google.com/maps/documentation/android-api/signup
 
 4. Add `import com.airbnb.android.react.maps.MapsPackage;` and `new MapsPackage()` in your `MainApplication.java` :
 
@@ -218,38 +250,38 @@ import com.airbnb.android.react.maps.MapsPackage;
     }
 ```
 
-
 5. Ensure that you have Google Play Services installed:
-  * For Genymotion you can follow [these instructions](https://www.genymotion.com/help/desktop/faq/#google-play-services).
-  * For a physical device you need to search on Google for 'Google Play Services'. There will be a link that takes you to the Play Store and from there you will see a button to update it (do not search within the Play Store).
+
+  * For the Genymotion emulator, you can follow [these instructions](https://www.genymotion.com/help/desktop/faq/#google-play-services).
+  * For a physical device you need to search on Google for 'Google Play
+    Services'. There will be a link that takes you to the Play Store and
+    from there you will see a button to update it (do not search within the
+    Play Store).
+
 
 ## Troubleshooting
 
-If you have a blank map issue, ([#118](https://github.com/airbnb/react-native-maps/issues/118), [#176](https://github.com/airbnb/react-native-maps/issues/176), [#684](https://github.com/airbnb/react-native-maps/issues/684)), try the following lines :
+### The map background is blank (Google Maps)
 
-### On iOS:
+If google logo/markers/polylines etc are displayed but the map
+background is otherwise blank, this is likely an API key issue. Verify
+your API keys and their restrictions. Ensure the native `provideAPIKey`
+call is the first line of `didFinishLaunchingWithOptions`.
 
-If google logo/markers/polylines etc are displayed, this is likely an API key issue. Verify your API keys and their restrictions. Ensure the native `provideAPIKey` call is the first line of `didFinishLaunchingWithOptions`.
+Ensure also that the relevant Google APIs have been enabled for your
+project from the URLs below:
 
-If you use Xcode with version less than 9 you may get `use of undeclared identifier 'MKMapTypeMutedStandard'` or `Entry, ":CFBundleIdentifier", Does Not Exist` errors. In this case you have to update your Xcode.
+- [Google Maps SDK Android](https://console.developers.google.com/apis/library/maps-android-backend.googleapis.com/)
+- [Google Maps SDK iOS (if required)](https://console.developers.google.com/apis/library/maps-ios-backend.googleapis.com)
 
-### On Android:
+For reference, you may read the relevant issue reports: ([#118](https://github.com/airbnb/react-native-maps/issues/118), [#176](https://github.com/airbnb/react-native-maps/issues/176), [#684](https://github.com/airbnb/react-native-maps/issues/684)).
 
-1. Be sure to have `new MapsPackage()` in your `MainApplication.java` :
+### No map whatsoever
+
+Ensure the map component and its container have viewport dimensions. An
+example is below:
 
-```java
-import com.airbnb.android.react.maps.MapsPackage;
-...
-    @Override
-    protected List<ReactPackage> getPackages() {
-        return Arrays.<ReactPackage>asList(
-                new MainReactPackage(),
-                new MapsPackage()
-        );
-    }
-```
 
-1. Set this Stylesheet in your map component
 ```jsx
 import MapView from 'react-native-maps';
 ...
@@ -266,56 +298,103 @@ const styles = StyleSheet.create({
  },
 });
 
-export default class MyApp extends React.Component {
- render() {
-   const { region } = this.props;
-   console.log(region);
-
-   return (
-     <View style ={styles.container}>
-       <MapView
-         style={styles.map}
-         region={{
-           latitude: 37.78825,
-           longitude: -122.4324,
-           latitudeDelta: 0.015,
-           longitudeDelta: 0.0121,
-         }}
-       >
-       </MapView>
-     </View>
-   );
- }
-}
-```
-1. Run "android" and make sure all packages are up-to-date.
-1.  If not installed yet, you have to install the following packages :
-    - Extras / Google Play services
-    - Extras / Google Repository
-    - Android 6.0 (API 23) / Google APIs Intel x86 Atom System Image Rev. 19
-    - Android SDK Build-tools 23.0.3
-1. Go to [Google API Console](https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend) and select your project, or create one.
-Then, once enabled, select `Go to credentials`.
-Select `Google Maps Android API` and create a new key.
-Enter the name of the API key and create it.
-
-1. Clean the cache :
-```
-watchman watch-del-all
-npm cache clean
+export default () => (
+   <View style={styles.container}>
+     <MapView
+       style={styles.map}
+       region={{
+         latitude: 37.78825,
+         longitude: -122.4324,
+         latitudeDelta: 0.015,
+         longitudeDelta: 0.0121,
+       }}
+     >
+     </MapView>
+   </View>
+);
 ```
 
-1. When starting emulator, make sure you have enabled `Wipe user data`.
+### Build issues with Google Maps iOS Utils (iOS)
 
-1. Run `react-native run-android`
+If your XCode project uses dynamic frameworks (e.g. you also have Swift
+code in your project), you cannot install `Google-Maps-iOS-Utils` with
+CocoaPods. The issue and a workaround for it has been documented
+[here](https://github.com/googlemaps/google-maps-ios-utils/blob/master/Swift.md).
 
-1. If you encounter `com.android.dex.DexException: Multiple dex files define Landroid/support/v7/appcompat/R$anim`, then clear build folder.
-```
+### Runtime errors on iOS (Apple Maps)
+
+If you are trying to mount the map with the `GOOGLE_PROVIDER` during
+runtime, but your build has been configured for the Apple Maps backend,
+a runtime exception will be raised.
+
+In addition, when using Apple Maps, some Google-only functionalities
+have been disabled via runtime errors.
+
+An exception will be raised if you try to use advanced features that
+depend on the [Google Maps SDK for
+iOS](https://github.com/googlemaps/google-maps-ios-utils). These include
+
+- Making markers from KML files
+- Heatmap rendering
+- Marker clustering
+- etc.
+
+### Clearing caches
+
+Run these commands to clean caches
+
+```sh
+# NPM
+watchman watch-del-all
+npm cache clean
+
+# Android, if you encounter `com.android.dex.DexException: Multiple dex files define Landroid/support/v7/appcompat/R$anim`, then clear build folder.
 cd android
 ./gradlew clean
 cd ..
 ```
 
-1. If you are using Android Virtual Devices (AVD), ensure that `Use Host GPU` is checked in the settings for your virtual device.
+### When using XCode &lt;9
+
+If you use Xcode with version less than 9 you may get `use of undeclared
+identifier 'MKMapTypeMutedStandard'` or `Entry, ":CFBundleIdentifier",
+Does Not Exist` errors. In this case you have to update your Xcode.
+
+### When using Android studio
+
+Make sure your Android studio is up to date and set up following the
+[React Native
+docs](https://facebook.github.io/react-native/docs/getting-started.html).
+
+In particular, the following packages have to be installed:
+
+  - Extras / Google Play services
+  - Extras / Google Repository
+  - Android 6.0 (API 23) / Google APIs Intel x86 Atom System Image Rev. 19
+  - Android SDK Build-tools 23.0.3
+
+### No native module found exception on Android
+
+Be sure to have `new MapsPackage()` in your `MainApplication.java` :
+
+```java
+import com.airbnb.android.react.maps.MapsPackage;
+...
+    @Override
+    protected List<ReactPackage> getPackages() {
+        return Arrays.<ReactPackage>asList(
+                new MainReactPackage(),
+                new MapsPackage()
+        );
+    }
+```
+
+### Android emulator issues
 
-1. If using an emulator and the only thing that shows up on the screen is the message: `[APPNAME] won't run without Google Play services which are not supported by your device.`, you need to change the emulator CPU/ABI setting to a system image that includes Google APIs.  These may need to be downloaded from the Android SDK Manager first.
+- When starting Android emulator, make sure you have enabled `Wipe user data`.
+- If you are using Android Virtual Devices (AVD), ensure that `Use Host GPU` is checked in the settings for your virtual device.
+- If using an emulator and the only thing that shows up on the screen is
+  the message: `[APPNAME] won't run without Google Play services which
+  are not supported by your device.`, you need to change the emulator
+  CPU/ABI setting to a system image that includes Google APIs.  These may
+  need to be downloaded from the Android SDK Manager first.

From eb295df20058eaacc5b057c738a19bf49e7cf46f Mon Sep 17 00:00:00 2001
From: Shane Reid <shane.reid17@gmail.com>
Date: Thu, 11 Oct 2018 11:13:46 +0100
Subject: [PATCH 16/28] =?UTF-8?q?Fix=20for=20=E2=80=9CThe=20specified=20ch?=
 =?UTF-8?q?ild=20already=20has=20a=20parent=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/airbnb/android/react/maps/AirMapView.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index a02bb46520..bef67ddcb8 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -542,6 +542,13 @@ public void addFeature(View child, int index) {
       int visibility = annotation.getVisibility();
       annotation.setVisibility(INVISIBLE);
 
+      // Remove from a view group if already present, prevent "specified child
+      // already had a parent" error.
+      ViewGroup annotationParent = (ViewGroup)annotation.getParent();
+      if (annotationParent != null) {
+        annotationParent.removeView(annotation);
+      }
+
       // Add to the parent group
       attacherGroup.addView(annotation);
 

From 0e38786ef718d83571c1852e35fa42528e2c4377 Mon Sep 17 00:00:00 2001
From: Todor1 <1@todor.one>
Date: Thu, 11 Oct 2018 18:46:15 +0300
Subject: [PATCH 17/28] [0.22.0] Release (#2535)

* CHANGELOG wip

* CHANGELOG wip2

* CHANGELOG wip3

* bump version

* bump versions in Podfile.lock and gradle.properties

* Update CHANGELOG.md

* Update CHANGELOG.md
---
 CHANGELOG.md                  | 43 ++++++++++++++++++++++++++++++++++-
 example/ios/Podfile.lock      |  4 ++--
 lib/android/gradle.properties |  2 +-
 package.json                  |  2 +-
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4793ed145d..ab9547431c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,46 @@
 # Change Log
+
+## 0.22.0 (October 11, 2018)
+* Common: [#2049](https://github.com/react-community/react-native-maps/pull/2049) Added `animateToNavigation` method to `MapView`
+* Common: [#2207](https://github.com/react-community/react-native-maps/pull/2207), [#2232](https://github.com/react-community/react-native-maps/pull/2232) Added `timestamp` property to `onUserLocationChange` event callback
+* Common: [#2479](https://github.com/react-community/react-native-maps/pull/2479), [#2524](https://github.com/react-community/react-native-maps/pull/2524) Added `edgePadding` to `fitToSuppliedMarkers` function
+* Common: [#2448](https://github.com/react-community/react-native-maps/pull/2448) Added custom indoor picker level
+* Common: [#2238](https://github.com/react-community/react-native-maps/pull/2238) Support the `asset://` scheme for images
+* Common: [#2136](https://github.com/react-community/react-native-maps/pull/2136), [#2184](https://github.com/react-community/react-native-maps/pull/2184) Modifications/Enhancements to MapView.UrlTile
+* Common: [#2039](https://github.com/react-community/react-native-maps/pull/2039) Fix for `pointForCoordinate` and `coordinateForPoint`
+* Common: [#2217](https://github.com/react-community/react-native-maps/pull/2217) Using `ColorPropType` to validate all color props more accurately
+* iOS: [#2396](https://github.com/react-community/react-native-maps/pull/2396) Added installation for iOS via `react-native link`
+* iOS: [#2243](https://github.com/react-community/react-native-maps/pull/2243) Added support of `lineDashPattern` polyline props to iOS Google Maps
+* iOS: [#2149](https://github.com/react-community/react-native-maps/pull/2149) Added `paddingAdjustmentBehavior` for Google Maps on iOS
+* iOS: [#2231](https://github.com/react-community/react-native-maps/pull/2231) Prefix DummyView class
+* iOS: [#2229](https://github.com/react-community/react-native-maps/pull/2229) Use global imports for new Pods dependencies in AIRGoogleMap
+* iOS: [#2248](https://github.com/react-community/react-native-maps/pull/2248) Make tiles display at the same physical size regardless of pixel density on iOS devices
+* iOS: [#2306](https://github.com/react-community/react-native-maps/pull/2306) Prefix or eliminate globals in AIRMapMarker
+* iOS: [#2351](https://github.com/react-community/react-native-maps/pull/2351) Added support for `calloutAnchor` with Google Maps on iOS
+* iOS: [#2501](https://github.com/react-community/react-native-maps/pull/2501) Fixed issue that app crashes after trigger Marker `onDragEnd`
+* iOS: [#2359](https://github.com/react-community/react-native-maps/pull/2359) Fixed zIndex didn't work on map moving on iOS 11
+* iOS: [#2185](https://github.com/react-community/react-native-maps/pull/2185) Fixed Xcode warnings for format, pointer type, unused var
+* iOS: [#2154](https://github.com/react-community/react-native-maps/pull/2154) Fixed CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF warnings
+* iOS: [#2341](https://github.com/react-community/react-native-maps/pull/2341) Fixed warnings about `self`
+* Android: [#2224](https://github.com/react-community/react-native-maps/pull/2224) Respect `tappable` prop on Android
+* Android: [#2390](https://github.com/react-community/react-native-maps/pull/2390) Consider pixel density in coordinate<->point conversion
+* Android: [#2477](https://github.com/react-community/react-native-maps/pull/2477), [#2487](https://github.com/react-community/react-native-maps/pull/2487) Implemented `tracksViewChanges` on Android
+* Android: [#2478](https://github.com/react-community/react-native-maps/pull/2478) Let `onVisibilityChanged()` be called on children (mainly fixes `Image` issues)
+* Android: [#2375](https://github.com/react-community/react-native-maps/pull/2375) Fixed `lineCap` of Polyline
+* Android: [#2320](https://github.com/react-community/react-native-maps/pull/2320) Fixed custom marker updates on Android
+* Android: [#2197](https://github.com/react-community/react-native-maps/pull/2197) Fixed overlay removal bug
+* Android: [#2317](https://github.com/react-community/react-native-maps/pull/2317) Fixed disabling the toolbar and my location button
+* Android: [#2472](https://github.com/react-community/react-native-maps/pull/2472) Fixed compilation error due to minSDK in manifest
+* Android: [#2172](https://github.com/react-community/react-native-maps/pull/2172) Fixed crash for Android API level below 18 on isFromMockProvider
+* Internal: [#2462](https://github.com/react-community/react-native-maps/pull/2462) Fixed packager script path in `pacakage.json`
+* Internal: [#2480](https://github.com/react-community/react-native-maps/pull/2480) Fix peer dependencies
+* TypeScript: [#2165](https://github.com/react-community/react-native-maps/pull/2165) Typings improvements & fixes
+* Docs: [#2541](https://github.com/react-community/react-native-maps/pull/2541) Vastly improved installation guideline
+* Docs: [#2171](https://github.com/react-community/react-native-maps/pull/2171) Add 'none' option to docs for `mapType` of `MapView`
+* Docs: [#2174](https://github.com/react-community/react-native-maps/pull/2174) Add opacity to `Marker` API docs
+* Docs: [#2181](https://github.com/react-community/react-native-maps/pull/2181), [#2219](https://github.com/react-community/react-native-maps/pull/2219) Add note about mandatory `NSLocationWhenInUseUsageDescription`
+* Docs: [#2381](https://github.com/react-community/react-native-maps/pull/2381), [#2358](https://github.com/react-community/react-native-maps/pull/2358), [#2363](https://github.com/react-community/react-native-maps/pull/2363), [#2429](https://github.com/react-community/react-native-maps/pull/2429), [#2425](https://github.com/react-community/react-native-maps/pull/2425) Documentation improvements
+
 ## 0.21.0 (March 31, 2018)
 * Common: [#2030](https://github.com/react-community/react-native-maps/pull/2030) Broadened peer-dependency support
 * Common: [#2035](https://github.com/react-community/react-native-maps/pull/2035), [#2113](https://github.com/react-community/react-native-maps/pull/2113), & [#2141](https://github.com/react-community/react-native-maps/pull/2141) Typescript improvements and fixes
@@ -22,7 +64,6 @@
 * Common: [hotfix PROVIDER_GOOGLE](https://github.com/react-community/react-native-maps/commit/cd868ea7b33a04c8bdd5e909cf134a133b2cb316)
 * iOS: [#2019](https://github.com/airbnb/react-native-maps/pull/2019) Exposing the maximumZ property to AIRMapUrlTile
 
-
 ## 0.20.0 (February 9, 2018)
 * Common: [#1889](https://github.com/airbnb/react-native-maps/pull/1889) Fix for 'Animated.Region undefined constructor' in recent react-native version.
 * iOS: [#1853](https://github.com/airbnb/react-native-maps/pull/1853) Fixed onMapReady no longer getting called on iOS
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 43e7bb7123..c04c25ea10 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -29,11 +29,11 @@ PODS:
     - GoogleMaps/Base
   - React (0.54.2):
     - React/Core (= 0.54.2)
-  - react-native-google-maps (0.21.0):
+  - react-native-google-maps (0.22.0):
     - Google-Maps-iOS-Utils (= 2.1.0)
     - GoogleMaps (= 2.5.0)
     - React
-  - react-native-maps (0.21.0):
+  - react-native-maps (0.22.0):
     - React
   - React/Core (0.54.2):
     - yoga (= 0.54.2.React)
diff --git a/lib/android/gradle.properties b/lib/android/gradle.properties
index f9aa44da00..9104a00b79 100644
--- a/lib/android/gradle.properties
+++ b/lib/android/gradle.properties
@@ -1,5 +1,5 @@
 VERSION_CODE=4
-VERSION_NAME=0.21.0
+VERSION_NAME=0.22.0
 GROUP=com.airbnb.android
 
 POM_DESCRIPTION=React Native Map view component for Android
diff --git a/package.json b/package.json
index a80b4561df..6b96018265 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "React Native Mapview component for iOS + Android",
   "main": "index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "run:packager": "./node_modules/react-native/scripts/packager.sh",

From c0d46a3b84b003a8b04c96cede106337da37feed Mon Sep 17 00:00:00 2001
From: Michael Lefkowitz <1746853+lfkwtz@users.noreply.github.com>
Date: Fri, 19 Oct 2018 16:44:29 -0500
Subject: [PATCH 18/28] update to clarify cacheEnabled is apple maps only

---
 docs/mapview.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/mapview.md b/docs/mapview.md
index 0602c8e120..d9b59111a8 100644
--- a/docs/mapview.md
+++ b/docs/mapview.md
@@ -31,7 +31,7 @@
 | `scrollEnabled` | `Boolean` | `true` | If `false` the user won't be able to change the map region being displayed.
 | `pitchEnabled` | `Boolean` | `true` | If `false` the user won't be able to adjust the camera’s pitch angle.
 | `toolbarEnabled` | `Boolean` | `true` | `Android only` If `false` will hide 'Navigate' and 'Open in Maps' buttons on marker press
-| `cacheEnabled` | `Boolean` | `false` | If `true` map will be cached and displayed as an image instead of being interactable, for performance usage.
+| `cacheEnabled` | `Boolean` | `false` | If `true` map will be cached and displayed as an image instead of being interactable, for performance usage. **Note:** Apple Maps only
 | `loadingEnabled` | `Boolean` | `false` | If `true` a loading indicator will show while the map is loading.
 | `loadingIndicatorColor` | `Color` | `#606060` | Sets loading indicator color, default to `#606060`.
 | `loadingBackgroundColor` | `Color` | `#FFFFFF` | Sets loading background color, default to `#FFFFFF`.

From b870c0bcf18bffbec309941daf4274167af83223 Mon Sep 17 00:00:00 2001
From: Salah Ghanim <salah.ghanim@gmail.com>
Date: Mon, 22 Oct 2018 15:00:58 +0200
Subject: [PATCH 19/28] r2507: remove marker: Attempt to invoke virtual method
 'void
 com.google.android.gms.maps.model.setIcon(com.google.android.gms.maps.model.BitmapDescription)'
 on a null object reference #: remove marker: Attempt to invoke virtual method
 'void
 com.google.android.gms.maps.model.setIcon(com.google.android.gms.maps.model.BitmapDescription)'
 on a null object reference (#2555)

* null check is enough
---
 .../java/com/airbnb/android/react/maps/AirMapMarker.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
index 42138d9ec6..faf63a8ee0 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
@@ -285,8 +285,9 @@ public void updateMarkerIcon() {
       // No more updates for this, as it's a simple icon
       hasViewChanges = false;
     }
-
-    marker.setIcon(getIcon());
+    if (marker != null) {
+      marker.setIcon(getIcon());
+    }
   }
 
   public LatLng interpolate(float fraction, LatLng a, LatLng b) {

From 1844d46902629e2caa55527d5bff48a550d92525 Mon Sep 17 00:00:00 2001
From: Ashwin Nayar <mailtoashwinnayar+github@gmail.com>
Date: Mon, 22 Oct 2018 19:06:31 +0530
Subject: [PATCH 20/28] Specify how to use Google Maps (#2550)

* Specify how to use Google Maps

Installation docs do not mention that `{PROVIDER_GOOGLE}` needs to be added in order to make Google Maps work.

* Update instructions for Google Maps on iOS
---
 docs/installation.md | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/docs/installation.md b/docs/installation.md
index 6d4f8047fa..4baa0bc30f 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -140,16 +140,29 @@ manually](https://developers.google.com/maps/documentation/ios-sdk/start). Then,
 from your project root to the directory in which you installed the
 Google Maps frameworks:
 
-```json
-{
-  "name": "your-app",
-  "scripts": {
-    "postinstall": "./node_modules/react-native-maps/enable-google-maps REPLACE_ME_RELATIVE_PATH_TO_GOOGLE_MAPS_INSTALL"
-  }
-}
-```
-
-Re-run `npm install` or `yarn` to ensure the `postinstall` script is run.
+    ```json
+    {
+      "name": "your-app",
+      "scripts": {
+        "postinstall": "./node_modules/react-native-maps/enable-google-maps REPLACE_ME_RELATIVE_PATH_TO_GOOGLE_MAPS_INSTALL"
+      }
+    }
+    ```
+
+    Re-run `npm install` or `yarn` to ensure the `postinstall` script is run.
+
+3. Import and add `{PROVIDER_GOOGLE}` to your JavaScript:
+    ```javascript
+      import MapView, { PROVIDER_GOOGLE } from 'react-native-maps';
+      ...
+      
+      <MapView
+         provider={PROVIDER_GOOGLE}
+         style={styles.map}
+         ...
+      >
+      
+    ```
 
 ## Build configuration on Android
 
@@ -283,7 +296,7 @@ example is below:
 
 
 ```jsx
-import MapView from 'react-native-maps';
+import MapView, { PROVIDER_GOOGLE } from 'react-native-maps'; // remove PROVIDER_GOOGLE import if not using Google Maps
 ...
 const styles = StyleSheet.create({
  container: {
@@ -301,6 +314,7 @@ const styles = StyleSheet.create({
 export default () => (
    <View style={styles.container}>
      <MapView
+       provider={PROVIDER_GOOGLE} // remove if not using Google Maps
        style={styles.map}
        region={{
          latitude: 37.78825,

From aa565cde4fb835777027c5464ce29db349478280 Mon Sep 17 00:00:00 2001
From: jmheik <jmheik@gmail.com>
Date: Thu, 8 Nov 2018 12:36:46 +0200
Subject: [PATCH 21/28] Move dev only deps to devDependencies. (#2548)

---
 package.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6b96018265..3ecb201f98 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,9 @@
   },
   "devDependencies": {
     "babel-eslint": "^6.1.2",
+    "babel-plugin-module-resolver": "^2.3.0",
     "babel-preset-airbnb": "^1.1.1",
+    "babel-preset-react-native": "1.9.0",
     "eslint": "^3.3.1",
     "eslint-config-airbnb": "^10.0.1",
     "eslint-plugin-import": "^1.14.0",
@@ -55,9 +57,5 @@
     "android": {
       "sourceDir": "./lib/android"
     }
-  },
-  "dependencies": {
-    "babel-plugin-module-resolver": "^2.3.0",
-    "babel-preset-react-native": "1.9.0"
   }
 }

From c7a55f5e2b3b7854e248d35baf8dbd716a95350c Mon Sep 17 00:00:00 2001
From: Fedir Ushakov <1@todor.one>
Date: Thu, 8 Nov 2018 19:58:57 +0200
Subject: [PATCH 22/28] [0.22.1] Release (#2574)

* prepare for release 0.22.1

* add latest commit
---
 CHANGELOG.md                  | 8 ++++++++
 example/ios/Podfile.lock      | 4 ++--
 lib/android/gradle.properties | 2 +-
 package.json                  | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab9547431c..e747a551ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.22.1 (November 8, 2018)
+* Common: [#2548](https://github.com/react-community/react-native-maps/pull/2548) Moved `babel-plugin-module-resolver` and `babel-preset-react-native` from dependencies to devDependencies
+* Android: [#2555](https://github.com/react-community/react-native-maps/pull/2555) Fixed [#2507](https://github.com/react-community/react-native-maps/issues/2507)
+* Android: [#2545](https://github.com/react-community/react-native-maps/pull/2545) Fixed “The specified child already has a parent”
+* Docs: [#2541](https://github.com/react-community/react-native-maps/pull/2541) Improve installation docs
+* Docs: [#2550](https://github.com/react-community/react-native-maps/pull/2550) Specify how to use Google Maps
+* Docs: [#2559](https://github.com/react-community/react-native-maps/pull/2559) Clarify cacheEnabled is apple maps only
+
 ## 0.22.0 (October 11, 2018)
 * Common: [#2049](https://github.com/react-community/react-native-maps/pull/2049) Added `animateToNavigation` method to `MapView`
 * Common: [#2207](https://github.com/react-community/react-native-maps/pull/2207), [#2232](https://github.com/react-community/react-native-maps/pull/2232) Added `timestamp` property to `onUserLocationChange` event callback
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index c04c25ea10..64301c48cd 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -29,11 +29,11 @@ PODS:
     - GoogleMaps/Base
   - React (0.54.2):
     - React/Core (= 0.54.2)
-  - react-native-google-maps (0.22.0):
+  - react-native-google-maps (0.22.1):
     - Google-Maps-iOS-Utils (= 2.1.0)
     - GoogleMaps (= 2.5.0)
     - React
-  - react-native-maps (0.22.0):
+  - react-native-maps (0.22.1):
     - React
   - React/Core (0.54.2):
     - yoga (= 0.54.2.React)
diff --git a/lib/android/gradle.properties b/lib/android/gradle.properties
index 9104a00b79..22d135f6e0 100644
--- a/lib/android/gradle.properties
+++ b/lib/android/gradle.properties
@@ -1,5 +1,5 @@
 VERSION_CODE=4
-VERSION_NAME=0.22.0
+VERSION_NAME=0.22.1
 GROUP=com.airbnb.android
 
 POM_DESCRIPTION=React Native Map view component for Android
diff --git a/package.json b/package.json
index 3ecb201f98..eb347689a9 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "React Native Mapview component for iOS + Android",
   "main": "index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "run:packager": "./node_modules/react-native/scripts/packager.sh",

From df9f7359082f6f2fcc318f53255a6e76d2794005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C5=A0mitala?= <radovan.smitala@gmail.com>
Date: Thu, 22 Nov 2018 18:24:05 +0100
Subject: [PATCH 23/28] Get visible map bounding box (#2571)

* Get visible map bounding box

* Fix CI and add docs

* Fix empty space

* Fix hashmap for Android getMapBoundaries

* Separate iOS getMapBoundaries between View and Manager

* Add android support

* Fix preview design

* Revert mapview.md to original format

* Example bubble fix

* Remove accidentaly imported some react modules in AirMapManager.java
---
 docs/mapview.md                               |  3 +-
 example/App.js                                |  2 +
 example/examples/MapBoundaries.js             | 93 +++++++++++++++++++
 .../android/react/maps/AirMapModule.java      | 39 ++++++++
 .../airbnb/android/react/maps/AirMapView.java | 11 +++
 lib/components/MapView.js                     | 14 +++
 lib/ios/AirGoogleMaps/AIRGoogleMap.h          |  1 +
 lib/ios/AirGoogleMaps/AIRGoogleMap.m          | 20 ++++
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.m   | 25 +++++
 lib/ios/AirMaps/AIRMap.h                      |  1 +
 lib/ios/AirMaps/AIRMap.m                      | 19 ++++
 lib/ios/AirMaps/AIRMapManager.m               | 35 ++++++-
 12 files changed, 257 insertions(+), 6 deletions(-)
 create mode 100644 example/examples/MapBoundaries.js

diff --git a/docs/mapview.md b/docs/mapview.md
index d9b59111a8..ebaf0c21d7 100644
--- a/docs/mapview.md
+++ b/docs/mapview.md
@@ -76,6 +76,7 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
 | `animateToCoordinate` | `coordinate: LatLng`, `duration: Number` |
 | `animateToBearing` | `bearing: Number`, `duration: Number` |
 | `animateToViewingAngle` | `angle: Number`, `duration: Number` |
+| `getMapBoundaries` | | `Promise<{northEast: LatLng, southWest: LatLng}>`
 | `setMapBoundaries` | `northEast: LatLng`, `southWest: LatLng` | `GoogleMaps only`
 | `setIndoorActiveLevelIndex` | `levelIndex: Number` |
 | `fitToElements` | `animated: Boolean` |
@@ -179,4 +180,4 @@ type IndoorLevel {
   name: String,
   shortName: String,
 }
-```
+```
\ No newline at end of file
diff --git a/example/App.js b/example/App.js
index 9c000ddc95..8509ad431d 100644
--- a/example/App.js
+++ b/example/App.js
@@ -25,6 +25,7 @@ import DefaultMarkers from './examples/DefaultMarkers';
 import CustomMarkers from './examples/CustomMarkers';
 import CachedMap from './examples/CachedMap';
 import LoadingMap from './examples/LoadingMap';
+import MapBoundaries from './examples/MapBoundaries';
 import TakeSnapshot from './examples/TakeSnapshot';
 import FitToSuppliedMarkers from './examples/FitToSuppliedMarkers';
 import FitToCoordinates from './examples/FitToCoordinates';
@@ -148,6 +149,7 @@ class App extends React.Component {
       [TakeSnapshot, 'Take Snapshot', true, '(incomplete)'],
       [CachedMap, 'Cached Map'],
       [LoadingMap, 'Map with loading'],
+      [MapBoundaries, 'Get visible map boundaries', true],
       [FitToSuppliedMarkers, 'Focus Map On Markers', true],
       [FitToCoordinates, 'Fit Map To Coordinates', true],
       [LiteMapView, 'Android Lite MapView'],
diff --git a/example/examples/MapBoundaries.js b/example/examples/MapBoundaries.js
new file mode 100644
index 0000000000..ebe4e07303
--- /dev/null
+++ b/example/examples/MapBoundaries.js
@@ -0,0 +1,93 @@
+import React from 'react';
+import { StyleSheet, View, Text, Dimensions } from 'react-native';
+
+import MapView, { ProviderPropType } from 'react-native-maps';
+
+const { width, height } = Dimensions.get('window');
+
+const ASPECT_RATIO = width / height;
+const LATITUDE = 37.78825;
+const LONGITUDE = -122.4324;
+const LATITUDE_DELTA = 0.0922;
+const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO;
+
+class MapBoundaries extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      region: {
+        latitude: LATITUDE,
+        longitude: LONGITUDE,
+        latitudeDelta: LATITUDE_DELTA,
+        longitudeDelta: LONGITUDE_DELTA,
+      },
+      mapBoundaries: null,
+    };
+  }
+
+  async onRegionChangeComplete() {
+    this.setState({
+      mapBoundaries: await this.map.getMapBoundaries(),
+    });
+  }
+
+  render() {
+    return (
+      <View style={styles.container}>
+        <MapView
+          ref={ref => {
+            this.map = ref;
+          }}
+          provider={this.props.provider}
+          style={styles.map}
+          initialRegion={this.state.region}
+          onRegionChangeComplete={() => this.onRegionChangeComplete()}
+        />
+        <View style={styles.buttonContainer}>
+          <View style={styles.bubble}>
+            <Text>{JSON.stringify(this.state.mapBoundaries)}</Text>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}
+
+MapBoundaries.propTypes = {
+  provider: ProviderPropType,
+};
+
+const styles = StyleSheet.create({
+  container: {
+    ...StyleSheet.absoluteFillObject,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+  },
+  map: {
+    ...StyleSheet.absoluteFillObject,
+  },
+  bubble: {
+    backgroundColor: 'rgba(255,255,255,0.7)',
+    paddingHorizontal: 18,
+    paddingVertical: 12,
+    borderRadius: 20,
+  },
+  latlng: {
+    width: 200,
+    alignItems: 'stretch',
+  },
+  button: {
+    width: 80,
+    paddingHorizontal: 12,
+    alignItems: 'center',
+    marginHorizontal: 10,
+  },
+  buttonContainer: {
+    flexDirection: 'row',
+    marginVertical: 20,
+    backgroundColor: 'transparent',
+  },
+});
+
+export default MapBoundaries;
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java
index 3940b4cf5c..9903aa48a3 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java
@@ -215,4 +215,43 @@ public void execute(NativeViewHierarchyManager nvhm)
       }
     });
   }
+
+  @ReactMethod
+  public void getMapBoundaries(final int tag, final Promise promise) {
+    final ReactApplicationContext context = getReactApplicationContext();
+
+    UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
+    uiManager.addUIBlock(new UIBlock()
+    {
+      @Override
+      public void execute(NativeViewHierarchyManager nvhm)
+      {
+        AirMapView view = (AirMapView) nvhm.resolveView(tag);
+        if (view == null) {
+          promise.reject("AirMapView not found");
+          return;
+        }
+        if (view.map == null) {
+          promise.reject("AirMapView.map is not valid");
+          return;
+        }
+
+        double[][] boundaries = view.getMapBoundaries();
+
+        WritableMap coordinates = new WritableNativeMap();
+        WritableMap northEastHash = new WritableNativeMap();
+        WritableMap southWestHash = new WritableNativeMap();
+
+        northEastHash.putDouble("longitude", boundaries[0][0]);
+        northEastHash.putDouble("latitude", boundaries[0][1]);
+        southWestHash.putDouble("longitude", boundaries[1][0]);
+        southWestHash.putDouble("latitude", boundaries[1][1]);
+
+        coordinates.putMap("northEast", northEastHash);
+        coordinates.putMap("southWest", southWestHash);
+
+        promise.resolve(coordinates);
+      }
+    });
+  }
 }
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index bef67ddcb8..fe95aeea17 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -787,6 +787,17 @@ public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePad
         0); // Without this, the Google logo is moved up by the value of edgePadding.bottom
   }
 
+  public double[][] getMapBoundaries() {
+    LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
+    LatLng northEast = bounds.northeast;
+    LatLng southWest = bounds.southwest;
+
+    return new double[][] {
+      {northEast.longitude, northEast.latitude},
+      {southWest.longitude, southWest.latitude}
+    };
+  }
+
   public void setMapBoundaries(ReadableMap northEast, ReadableMap southWest) {
     if (map == null) return;
 
diff --git a/lib/components/MapView.js b/lib/components/MapView.js
index 6eed70cf6b..152e2236f2 100644
--- a/lib/components/MapView.js
+++ b/lib/components/MapView.js
@@ -600,6 +600,20 @@ class MapView extends React.Component {
     this._runCommand('fitToCoordinates', [coordinates, edgePadding, animated]);
   }
 
+  /**
+   * Get visible boudaries
+   *
+   * @return Promise Promise with the bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
+   */
+  async getMapBoundaries() {
+    if (Platform.OS === 'android') {
+      return NativeModules.AirMapModule.getMapBoundaries(this._getHandle());
+    } else if (Platform.OS === 'ios') {
+      return this._runCommand('getMapBoundaries', []);
+    }
+    return Promise.reject('getMapBoundaries not supported on this platform');
+  }
+
   setMapBoundaries(northEast, southWest) {
     this._runCommand('setMapBoundaries', [northEast, southWest]);
   }
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.h b/lib/ios/AirGoogleMaps/AIRGoogleMap.h
index 962eeabc4a..1bd52f7453 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMap.h
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.h
@@ -65,6 +65,7 @@
 - (void)didChangeCameraPosition:(GMSCameraPosition *)position;
 - (void)idleAtCameraPosition:(GMSCameraPosition *)position;
 - (void)didTapPOIWithPlaceID:(NSString *)placeID name:(NSString *) name location:(CLLocationCoordinate2D) location;
+- (NSArray *)getMapBoundaries;
 
 + (MKCoordinateRegion)makeGMSCameraPositionFromMap:(GMSMapView *)map andGMSCameraPosition:(GMSCameraPosition *)position;
 + (GMSCameraPosition*)makeGMSCameraPositionFromMap:(GMSMapView *)map andMKCoordinateRegion:(MKCoordinateRegion)region;
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.m b/lib/ios/AirGoogleMaps/AIRGoogleMap.m
index 44fd24cc85..ebd95d74b5 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMap.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.m
@@ -195,6 +195,26 @@ - (void)removeReactSubview:(id<RCTComponent>)subview {
 }
 #pragma clang diagnostic pop
 
+- (NSArray *)getMapBoundaries
+{
+    GMSVisibleRegion visibleRegion = self.projection.visibleRegion;
+    GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithRegion:visibleRegion];
+    
+    CLLocationCoordinate2D northEast = bounds.northEast;
+    CLLocationCoordinate2D southWest = bounds.southWest;
+    
+    return @[
+        @[
+            [NSNumber numberWithDouble:northEast.longitude],
+            [NSNumber numberWithDouble:northEast.latitude]
+        ],
+        @[
+            [NSNumber numberWithDouble:southWest.longitude],
+            [NSNumber numberWithDouble:southWest.latitude]
+        ]
+    ];
+}
+
 - (void)didMoveToWindow {
   if (_didMoveToWindow) return;
   _didMoveToWindow = true;
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
index fa6cc2505b..acc7329e47 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -391,6 +391,31 @@ - (UIView *)view
   }];
 }
 
+RCT_EXPORT_METHOD(getMapBoundaries:(nonnull NSNumber *)reactTag
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    id view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[AIRGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    } else {
+        NSArray *boundingBox = [view getMapBoundaries];
+
+        resolve(@{
+          @"northEast" : @{
+            @"longitude" : boundingBox[0][0],
+            @"latitude" : boundingBox[0][1]
+          },
+          @"southWest" : @{
+            @"longitude" : boundingBox[1][0],
+            @"latitude" : boundingBox[1][1]
+          }
+        });
+    }
+  }];
+}
+
 RCT_EXPORT_METHOD(setMapBoundaries:(nonnull NSNumber *)reactTag
                   northEast:(CLLocationCoordinate2D)northEast
                   southWest:(CLLocationCoordinate2D)southWest)
diff --git a/lib/ios/AirMaps/AIRMap.h b/lib/ios/AirMaps/AIRMap.h
index 1d5f92cdcc..f3b483c421 100644
--- a/lib/ios/AirMaps/AIRMap.h
+++ b/lib/ios/AirMaps/AIRMap.h
@@ -64,5 +64,6 @@ extern const NSInteger AIRMapMaxZoomLevel;
 - (void)cacheViewIfNeeded;
 - (void)beginLoading;
 - (void)finishLoading;
+- (NSArray *)getMapBoundaries;
 
 @end
diff --git a/lib/ios/AirMaps/AIRMap.m b/lib/ios/AirMaps/AIRMap.m
index 1e3e76193b..53c5b6e258 100644
--- a/lib/ios/AirMaps/AIRMap.m
+++ b/lib/ios/AirMaps/AIRMap.m
@@ -223,6 +223,25 @@ - (NSTimeInterval)calloutView:(SMCalloutView *)calloutView delayForRepositionWit
 
 #pragma mark Accessors
 
+- (NSArray *)getMapBoundaries
+{
+    MKMapRect mapRect = self.visibleMapRect;
+    
+    CLLocationCoordinate2D northEast = MKCoordinateForMapPoint(MKMapPointMake(MKMapRectGetMaxX(mapRect), mapRect.origin.y));
+    CLLocationCoordinate2D southWest = MKCoordinateForMapPoint(MKMapPointMake(mapRect.origin.x, MKMapRectGetMaxY(mapRect)));
+
+    return @[
+        @[
+            [NSNumber numberWithDouble:northEast.longitude],
+            [NSNumber numberWithDouble:northEast.latitude]
+        ],
+        @[
+            [NSNumber numberWithDouble:southWest.longitude],
+            [NSNumber numberWithDouble:southWest.latitude]
+        ]
+    ];
+}
+
 - (void)setShowsUserLocation:(BOOL)showsUserLocation
 {
     if (self.showsUserLocation != showsUserLocation) {
diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m
index 0c4fcfea43..e35bd22bc1 100644
--- a/lib/ios/AirMaps/AIRMapManager.m
+++ b/lib/ios/AirMaps/AIRMapManager.m
@@ -40,7 +40,7 @@ @interface AIRMapManager() <MKMapViewDelegate>
 @implementation AIRMapManager{
    BOOL _hasObserver;
 }
-  
+
 RCT_EXPORT_MODULE()
 
 - (UIView *)view
@@ -131,6 +131,31 @@ - (UIView *)view
 
 #pragma mark exported MapView methods
 
+RCT_EXPORT_METHOD(getMapBoundaries:(nonnull NSNumber *)reactTag
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[AIRMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+        } else {
+            NSArray *boundingBox = [view getMapBoundaries];
+
+            resolve(@{
+                @"northEast" : @{
+                    @"longitude" : boundingBox[0][0],
+                    @"latitude" : boundingBox[0][1]
+                },
+                @"southWest" : @{
+                    @"longitude" : boundingBox[1][0],
+                    @"latitude" : boundingBox[1][1]
+                }
+            });
+        }
+    }];
+}
+
 RCT_EXPORT_METHOD(animateToNavigation:(nonnull NSNumber *)reactTag
         withRegion:(MKCoordinateRegion)region
         withBearing:(CGFloat)bearing
@@ -272,7 +297,7 @@ - (UIView *)view
             NSArray *filteredMarkers = [mapView.annotations filteredArrayUsingPredicate:filterMarkers];
 
             [mapView showAnnotations:filteredMarkers animated:animated];
-            
+
         }
     }];
 }
@@ -362,7 +387,7 @@ - (UIView *)view
                                                              [coordinate[@"longitude"] doubleValue]
                                                              )
                                               toPointToView:mapView];
-            
+
             resolve(@{
                       @"x": @(touchPoint.x),
                       @"y": @(touchPoint.y),
@@ -388,7 +413,7 @@ - (UIView *)view
                                                              [point[@"y"] doubleValue]
                                                              )
                                                  toCoordinateFromView:mapView];
-            
+
             resolve(@{
                       @"latitude": @(coordinate.latitude),
                       @"longitude": @(coordinate.longitude),
@@ -538,7 +563,7 @@ - (void)handleMapTap:(UITapGestureRecognizer *)recognizer {
                 }
             }
         }
-        
+
         if ([overlay isKindOfClass:[AIRMapOverlay class]]) {
             AIRMapOverlay *imageOverlay = (AIRMapOverlay*) overlay;
             if (MKMapRectContainsPoint(imageOverlay.boundingMapRect, mapPoint)) {

From 2dc19530484c51fb1f0189f589f068c982d2db88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Elsd=C3=B6rfer?= <michael@elsdoerfer.info>
Date: Fri, 23 Nov 2018 14:51:11 +0000
Subject: [PATCH 24/28] Provide a camera system (#2563)

* Add initialCamera and camera props.

* Support camera and initialCamera properties on Android.

* Declare camera and initialCamera properties in JS.

* Add animateCamera, setCamera, getCamera on iOS/Mapkit.

Deprecate the old animateTo* methods and warn on use.

* Add an example for camera control.

* Add animateCamera, setCamera, getCamera  on iOS/GMaps.

* Support setCamera, animateCamera, getCamera in Android.

* Fix eslint errors.

* Update documentation.

* Remove use of deprecated methods from examples.

* Fix crash in animateCamera() if duration not given.

* Add new methods and props to TypeScript typings.

* Fix bug in Android method map setup.
---
 docs/mapview.md                               |  33 ++++-
 example/App.js                                |   2 +
 example/examples/AnimatedNavigation.js        |   2 +-
 example/examples/CameraControl.js             | 126 ++++++++++++++++++
 example/examples/DisplayLatLng.js             |   6 +-
 index.d.ts                                    |  13 ++
 .../android/react/maps/AirMapManager.java     |  30 ++++-
 .../android/react/maps/AirMapModule.java      |  38 ++++++
 .../airbnb/android/react/maps/AirMapView.java |  70 ++++++++++
 lib/components/MapView.js                     |  58 ++++++++
 lib/ios/AirGoogleMaps/AIRGoogleMap.h          |   2 +
 lib/ios/AirGoogleMaps/AIRGoogleMap.m          |  28 +++-
 lib/ios/AirGoogleMaps/AIRGoogleMapManager.m   |  60 +++++++++
 .../AirGoogleMaps/RCTConvert+GMSMapViewType.h |   2 +-
 .../AirGoogleMaps/RCTConvert+GMSMapViewType.m |  53 ++++++++
 lib/ios/AirMaps/AIRMap.h                      |   1 +
 lib/ios/AirMaps/AIRMap.m                      |  14 ++
 lib/ios/AirMaps/AIRMapManager.m               |  99 ++++++++++++++
 lib/ios/AirMaps/RCTConvert+AirMap.h           |   2 +
 lib/ios/AirMaps/RCTConvert+AirMap.m           |  30 +++++
 20 files changed, 654 insertions(+), 15 deletions(-)
 create mode 100644 example/examples/CameraControl.js

diff --git a/docs/mapview.md b/docs/mapview.md
index ebaf0c21d7..f933d89c6a 100644
--- a/docs/mapview.md
+++ b/docs/mapview.md
@@ -7,6 +7,8 @@
 | `provider` | `string` |  | The map framework to use. <br/><br/>Either `"google"` for GoogleMaps, otherwise `null` or `undefined` to use the native map framework (`MapKit` in iOS and `GoogleMaps` in android).
 | `region` | `Region` |  | The region to be displayed by the map. <br/><br/>The region is defined by the center coordinates and the span of coordinates to display.
 | `initialRegion` | `Region` |  | The initial region to be displayed by the map.  Use this prop instead of `region` only if you don't want to control the viewport of the map besides the initial region.<br/><br/> Changing this prop after the component has mounted will not result in a region change.<br/><br/> This is similar to the `initialValue` prop of a text input.
+| `camera` | `Camera` |  | The camera view the map should display. If you use this, the `region` property is ignored.
+| `initialCamera` | `Camera` |  | Like `initialRegion`, use this prop instead of `camera` only if you don't want to control the viewport of the map besides the initial camera setting.<br/><br/> Changing this prop after the component has mounted will not result in a region change.<br/><br/> This is similar to the `initialValue` prop of a text input.
 | `mapPadding` | `EdgePadding` |  | Adds custom padding to each side of the map. Useful when map elements/markers are obscured. **Note** Google Maps only.
 | `paddingAdjustmentBehavior` | 'always'\|'automatic'\|'never' | 'never' | Indicates how/when to affect padding with safe area insets (`GoogleMaps` in iOS only)
 | `liteMode` | `Boolean` | `false` | Enable lite mode. **Note**: Android only.
@@ -71,11 +73,14 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
 
 | Method Name | Arguments | Notes
 |---|---|---|
-| `animateToNavigation` | `location: LatLng`, `bearing: Number`, `angle: Number`, `duration: Number` |
+| `getCamera` | | Returns a `Camera` structure indicating the current camera configuration.
+| `animateCamera` | `camera: Camera`, `{ duration: Number }` | Animate the camera to a new view. You can pass a partial camera object here; any property not given will remain unmodified.
+| `setCamera` | `camera: Camera`, `{ duration: Number }` | Like `animateCamera`, but sets the new view instantly, without an animation.
 | `animateToRegion` | `region: Region`, `duration: Number` |
-| `animateToCoordinate` | `coordinate: LatLng`, `duration: Number` |
-| `animateToBearing` | `bearing: Number`, `duration: Number` |
-| `animateToViewingAngle` | `angle: Number`, `duration: Number` |
+| `animateToNavigation` | `location: LatLng`, `bearing: Number`, `angle: Number`, `duration: Number` | Deprecated. Use `animateCamera` instead.
+| `animateToCoordinate` | `coordinate: LatLng`, `duration: Number` | Deprecated. Use `animateCamera` instead.
+| `animateToBearing` | `bearing: Number`, `duration: Number` | Deprecated. Use `animateCamera` instead.
+| `animateToViewingAngle` | `angle: Number`, `duration: Number` | Deprecated. Use `animateCamera` instead.
 | `getMapBoundaries` | | `Promise<{northEast: LatLng, southWest: LatLng}>`
 | `setMapBoundaries` | `northEast: LatLng`, `southWest: LatLng` | `GoogleMaps only`
 | `setIndoorActiveLevelIndex` | `levelIndex: Number` |
@@ -98,6 +103,26 @@ type Region {
 }
 ```
 
+```
+type Camera = {
+    center: {
+       latitude: number,
+       longitude: number,
+   },
+   pitch: number,
+   heading: number
+
+   // Only on iOS MapKit, in meters. The property is ignored by Google Maps.
+   altitude: number.
+
+   // Only when using Google Maps.
+   zoom: number
+}
+```
+
+Note that when using the `Camera`, MapKit on iOS and Google Maps differ in how the height is specified. For a cross-platform app, it is necessary
+to specify both the zoom level and the altitude separately.
+
 ```
 type LatLng {
   latitude: Number,
diff --git a/example/App.js b/example/App.js
index 8509ad431d..cea488d0d7 100644
--- a/example/App.js
+++ b/example/App.js
@@ -44,6 +44,7 @@ import ImageOverlayWithURL from './examples/ImageOverlayWithURL';
 import AnimatedNavigation from './examples/AnimatedNavigation';
 import OnPoiClick from './examples/OnPoiClick';
 import IndoorMap from './examples/IndoorMap';
+import CameraControl from './examples/CameraControl';
 
 const IOS = Platform.OS === 'ios';
 const ANDROID = Platform.OS === 'android';
@@ -166,6 +167,7 @@ class App extends React.Component {
       [AnimatedNavigation, 'Animated Map Navigation', true],
       [OnPoiClick, 'On Poi Click', true],
       [IndoorMap, 'Indoor Map', true],
+      [CameraControl, 'CameraControl', true],
     ]
     // Filter out examples that are not yet supported for Google Maps on iOS.
     .filter(example => ANDROID || (IOS && (example[2] || !this.state.useGoogleMaps)))
diff --git a/example/examples/AnimatedNavigation.js b/example/examples/AnimatedNavigation.js
index ce7b85f99b..4b853539a0 100644
--- a/example/examples/AnimatedNavigation.js
+++ b/example/examples/AnimatedNavigation.js
@@ -43,7 +43,7 @@ export default class NavigationMap extends Component {
   updateMap() {
     const { curPos, prevPos, curAng } = this.state;
     const curRot = this.getRotation(prevPos, curPos);
-    this.map.animateToNavigation(curPos, curRot, curAng);
+    this.map.animateCamera({ heading: curRot, center: curPos, pitch: curAng });
   }
 
   render() {
diff --git a/example/examples/CameraControl.js b/example/examples/CameraControl.js
new file mode 100644
index 0000000000..dc746bc935
--- /dev/null
+++ b/example/examples/CameraControl.js
@@ -0,0 +1,126 @@
+import React from 'react';
+import {
+  StyleSheet,
+  View,
+  TouchableOpacity,
+  Text,
+  Alert,
+} from 'react-native';
+
+import MapView, { ProviderPropType } from 'react-native-maps';
+
+const LATITUDE = 37.78825;
+const LONGITUDE = -122.4324;
+
+
+class CameraControl extends React.Component {
+  async getCamera() {
+    const camera = await this.map.getCamera();
+    Alert.alert(
+      'Current camera',
+      JSON.stringify(camera),
+      [
+        { text: 'OK' },
+      ],
+      { cancelable: true }
+    );
+  }
+
+  async setCamera() {
+    const camera = await this.map.getCamera();
+    // Note that we do not have to pass a full camera object to setCamera().
+    // Similar to setState(), we can pass only the properties you like to change.
+    this.map.setCamera({
+      heading: camera.heading + 10,
+    });
+  }
+
+  async animateCamera() {
+    const camera = await this.map.getCamera();
+    camera.heading += 40;
+    camera.pitch += 10;
+    camera.altitude += 1000;
+    camera.zoom -= 1;
+    camera.center.latitude += 0.5;
+    this.map.animateCamera(camera, { duration: 2000 });
+  }
+
+  render() {
+    return (
+      <View style={styles.container}>
+        <MapView
+          provider={this.props.provider}
+          ref={ref => {
+            this.map = ref;
+          }}
+          style={styles.map}
+          initialCamera={{
+            center: {
+              latitude: LATITUDE,
+              longitude: LONGITUDE,
+            },
+            pitch: 45,
+            heading: 90,
+            altitude: 1000,
+            zoom: 10,
+          }}
+        />
+        <View style={styles.buttonContainer}>
+          <TouchableOpacity
+            onPress={() => this.getCamera()}
+            style={[styles.bubble, styles.button]}
+          >
+            <Text>Get current camera</Text>
+          </TouchableOpacity>
+          <TouchableOpacity
+            onPress={() => this.setCamera()}
+            style={[styles.bubble, styles.button]}
+          >
+            <Text>Set Camera</Text>
+          </TouchableOpacity>
+          <TouchableOpacity
+            onPress={() => this.animateCamera()}
+            style={[styles.bubble, styles.button]}
+          >
+            <Text>Animate Camera</Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+    );
+  }
+}
+
+CameraControl.propTypes = {
+  provider: ProviderPropType,
+};
+
+
+const styles = StyleSheet.create({
+  container: {
+    ...StyleSheet.absoluteFillObject,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+  },
+  map: {
+    ...StyleSheet.absoluteFillObject,
+  },
+  bubble: {
+    backgroundColor: 'rgba(255,255,255,0.7)',
+    paddingHorizontal: 18,
+    paddingVertical: 12,
+    borderRadius: 20,
+  },
+  button: {
+    marginTop: 12,
+    paddingHorizontal: 12,
+    alignItems: 'center',
+    marginHorizontal: 10,
+  },
+  buttonContainer: {
+    flexDirection: 'column',
+    marginVertical: 20,
+    backgroundColor: 'transparent',
+  },
+});
+
+export default CameraControl;
diff --git a/example/examples/DisplayLatLng.js b/example/examples/DisplayLatLng.js
index a896bc53da..5117bde6fe 100644
--- a/example/examples/DisplayLatLng.js
+++ b/example/examples/DisplayLatLng.js
@@ -44,15 +44,15 @@ class DisplayLatLng extends React.Component {
   }
 
   animateRandomCoordinate() {
-    this.map.animateToCoordinate(this.randomCoordinate());
+    this.map.animateCamera({ center: this.randomCoordinate() });
   }
 
   animateToRandomBearing() {
-    this.map.animateToBearing(this.getRandomFloat(-360, 360));
+    this.map.animateCamera({ heading: this.getRandomFloat(-360, 360) });
   }
 
   animateToRandomViewingAngle() {
-    this.map.animateToViewingAngle(this.getRandomFloat(0, 90));
+    this.map.animateCamera({ pitch: this.getRandomFloat(0, 90) });
   }
 
   getRandomFloat(min, max) {
diff --git a/index.d.ts b/index.d.ts
index f395660c05..07045485e7 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -21,6 +21,14 @@ declare module "react-native-maps" {
         longitude: number;
     }
 
+    export interface Camera {
+        center: LatLng;
+        heading: number;
+        pitch: number;
+        zoom: number;
+        altitude: number;
+    }
+
     export interface Point {
         x: number;
         y: number;
@@ -186,6 +194,8 @@ declare module "react-native-maps" {
         mapType?: MapTypes;
         region?: Region;
         initialRegion?: Region;
+        camera?: Camera;
+        initialCamera?: Camera;
         liteMode?: boolean;
         mapPadding?: EdgePadding;
         maxDelta?: number;
@@ -215,6 +225,9 @@ declare module "react-native-maps" {
     }
 
     export default class MapView extends React.Component<MapViewProps, any> {
+        getCamera(): Promise<Camera>;
+        setCamera(camera: Partial<Camera>);
+        animateCamera(camera: Partial<Camera>, opts?: {duration?: number});
         animateToNavigation(location: LatLng, bearing: number, angle: number, duration?: number): void;
         animateToRegion(region: Region, duration?: number): void;
         animateToCoordinate(latLng: LatLng, duration?: number): void;
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
index 92260c5b0a..637b52eaad 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
@@ -39,6 +39,8 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   private static final int SET_MAP_BOUNDARIES = 8;
   private static final int ANIMATE_TO_NAVIGATION = 9; 
   private static final int SET_INDOOR_ACTIVE_LEVEL_INDEX = 10;
+  private static final int SET_CAMERA = 11;
+  private static final int ANIMATE_CAMERA = 12;
 
 
   private final Map<String, Integer> MAP_TYPES = MapBuilder.of(
@@ -88,6 +90,16 @@ public void setInitialRegion(AirMapView view, ReadableMap initialRegion) {
     view.setInitialRegion(initialRegion);
   }
 
+  @ReactProp(name = "camera")
+  public void setCamera(AirMapView view, ReadableMap camera) {
+    view.setCamera(camera);
+  }
+
+  @ReactProp(name = "initialCamera")
+  public void setInitialCamera(AirMapView view, ReadableMap initialCamera) {
+    view.setInitialCamera(initialCamera);
+  }
+
   @ReactProp(name = "mapType")
   public void setMapType(AirMapView view, @Nullable String mapType) {
     int typeId = MAP_TYPES.get(mapType);
@@ -252,8 +264,20 @@ public void receiveCommand(AirMapView view, int commandId, @Nullable ReadableArr
     float bearing;
     float angle;
     ReadableMap region;
+    ReadableMap camera;
 
     switch (commandId) {
+      case SET_CAMERA:
+        camera = args.getMap(0);
+        view.animateToCamera(camera, 0);
+        break;
+
+      case ANIMATE_CAMERA:
+        camera = args.getMap(0);
+        duration = args.getInt(1);
+        view.animateToCamera(camera, duration);
+        break;
+
       case ANIMATE_TO_NAVIGATION:
         region = args.getMap(0);
         lng = region.getDouble("longitude");
@@ -356,6 +380,8 @@ public Map getExportedCustomDirectEventTypeConstants() {
   @Override
   public Map<String, Integer> getCommandsMap() {
     Map<String, Integer> map = this.CreateMap(
+        "setCamera", SET_CAMERA,
+        "animateCamera", ANIMATE_CAMERA,
         "animateToRegion", ANIMATE_TO_REGION,
         "animateToCoordinate", ANIMATE_TO_COORDINATE,
         "animateToViewingAngle", ANIMATE_TO_VIEWING_ANGLE,
@@ -375,7 +401,7 @@ public Map<String, Integer> getCommandsMap() {
   }
 
   public static <K, V> Map<K, V> CreateMap(
-  K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8) {
+  K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9, K k10, V v10) {
     Map map = new HashMap<K, V>();
     map.put(k1, v1);
     map.put(k2, v2);
@@ -385,6 +411,8 @@ public static <K, V> Map<K, V> CreateMap(
     map.put(k6, v6);
     map.put(k7, v7);
     map.put(k8, v8);
+    map.put(k9, v9);
+    map.put(k10, v10);
     return map;
   }
 
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java
index 9903aa48a3..c9ee80350f 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java
@@ -19,6 +19,7 @@
 import com.facebook.react.uimanager.UIManagerModule;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 
 import java.io.ByteArrayOutputStream;
@@ -140,6 +141,43 @@ public void onSnapshotReady(@Nullable Bitmap snapshot) {
     });
   }
 
+  @ReactMethod
+  public void getCamera(final int tag, final Promise promise) {
+    final ReactApplicationContext context = getReactApplicationContext();
+
+    UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
+    uiManager.addUIBlock(new UIBlock()
+    {
+      @Override
+      public void execute(NativeViewHierarchyManager nvhm)
+      {
+        AirMapView view = (AirMapView) nvhm.resolveView(tag);
+        if (view == null) {
+          promise.reject("AirMapView not found");
+          return;
+        }
+        if (view.map == null) {
+          promise.reject("AirMapView.map is not valid");
+          return;
+        }
+
+        CameraPosition position = view.map.getCameraPosition();
+
+        WritableMap centerJson = new WritableNativeMap();
+        centerJson.putDouble("latitude", position.target.latitude);
+        centerJson.putDouble("longitude", position.target.longitude);
+
+        WritableMap cameraJson = new WritableNativeMap();
+        cameraJson.putMap("center", centerJson);
+        cameraJson.putDouble("heading", (double)position.bearing);
+        cameraJson.putDouble("zoom", (double)position.zoom);
+        cameraJson.putDouble("pitch", (double)position.tilt);
+
+        promise.resolve(cameraJson);
+      }
+    });
+  }
+
   @ReactMethod
   public void pointForCoordinate(final int tag, ReadableMap coordinate, final Promise promise) {
     final ReactApplicationContext context = getReactApplicationContext();
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index fe95aeea17..1751c2f544 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -83,11 +83,13 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   private final int baseMapPadding = 50;
 
   private LatLngBounds boundsToMove;
+  private CameraUpdate cameraToSet;
   private boolean showUserLocation = false;
   private boolean handlePanDrag = false;
   private boolean moveOnMarkerPress = true;
   private boolean cacheEnabled = false;
   private boolean initialRegionSet = false;
+  private boolean initialCameraSet = false;
   private LatLngBounds cameraLastIdleBounds;
   private int cameraMoveReason = 0;
 
@@ -426,6 +428,13 @@ public void setInitialRegion(ReadableMap initialRegion) {
     }
   }
 
+  public void setInitialCamera(ReadableMap initialCamera) {
+    if (!initialCameraSet && initialCamera != null) {
+      setCamera(initialCamera);
+      initialCameraSet = true;
+    }
+  }
+
   public void setRegion(ReadableMap region) {
     if (region == null) return;
 
@@ -450,6 +459,35 @@ public void setRegion(ReadableMap region) {
     }
   }
 
+  public void setCamera(ReadableMap camera) {
+    if (camera == null) return;
+
+    CameraPosition.Builder builder = new CameraPosition.Builder();
+
+    ReadableMap center = camera.getMap("center");
+    if (center != null) {
+      Double lng = center.getDouble("longitude");
+      Double lat = center.getDouble("latitude");
+      builder.target(new LatLng(lat, lng));
+    }
+
+    builder.tilt((float)camera.getDouble("pitch"));
+    builder.bearing((float)camera.getDouble("heading"));
+    builder.zoom(camera.getInt("zoom"));
+
+    CameraUpdate update = CameraUpdateFactory.newCameraPosition(builder.build());
+
+    if (super.getHeight() <= 0 || super.getWidth() <= 0) {
+      // in this case, our map has not been laid out yet, so we save the camera update in a
+      // local variable. As soon as layout occurs, we will move the camera to the saved update.
+      // Note that if we tried to move to the camera now, it would trigger an exception.
+      cameraToSet = update;
+    } else {
+      map.moveCamera(update);
+      cameraToSet = null;
+    }
+  }
+
   public void setShowsUserLocation(boolean showUserLocation) {
     this.showUserLocation = showUserLocation; // hold onto this for lifecycle handling
     if (hasPermissions()) {
@@ -649,6 +687,38 @@ public void updateExtraData(Object extraData) {
       }
 
       boundsToMove = null;
+      cameraToSet = null;
+    }
+    else if (cameraToSet != null) {
+      map.moveCamera(cameraToSet);
+      cameraToSet = null;
+    }
+  }
+
+  public void animateToCamera(ReadableMap camera, int duration) {
+    if (map == null) return;
+    CameraPosition.Builder builder = new CameraPosition.Builder(map.getCameraPosition());
+    if (camera.hasKey("zoom")) {
+      builder.zoom((float)camera.getDouble("zoom"));
+    }
+    if (camera.hasKey("heading")) {
+      builder.bearing((float)camera.getDouble("heading"));
+    }
+    if (camera.hasKey("pitch")) {
+      builder.tilt((float)camera.getDouble("pitch"));
+    }
+    if (camera.hasKey("center")) {
+      ReadableMap center = camera.getMap("center");
+      builder.target(new LatLng(center.getDouble("latitude"), center.getDouble("longitude")));
+    }
+
+    CameraUpdate update = CameraUpdateFactory.newCameraPosition(builder.build());
+
+    if (duration <= 0) {
+      map.moveCamera(update);
+    }
+    else {
+      map.animateCamera(update, duration, null);
     }
   }
 
diff --git a/lib/components/MapView.js b/lib/components/MapView.js
index 152e2236f2..73872c195e 100644
--- a/lib/components/MapView.js
+++ b/lib/components/MapView.js
@@ -49,6 +49,22 @@ const viewConfig = {
   },
 };
 
+
+/**
+ * Defines the map camera.
+ */
+const CameraShape = PropTypes.shape({
+  center: PropTypes.shape({
+    latitude: PropTypes.number.isRequired,
+    longitude: PropTypes.number.isRequired,
+  }),
+  pitch: PropTypes.number.isRequired,
+  heading: PropTypes.number.isRequired,
+  altitude: PropTypes.number.isRequired,
+  zoom: PropTypes.number.isRequired,
+});
+
+
 // if ViewPropTypes is not defined fall back to View.propType (to support RN < 0.44)
 const viewPropTypes = ViewPropTypes || View.propTypes;
 
@@ -307,6 +323,27 @@ const propTypes = {
     longitudeDelta: PropTypes.number.isRequired,
   }),
 
+  /**
+   * The camera view the map should use.
+   *
+   * Use the camera system, instead of the region system, if you need control over
+   * the pitch or heading.
+   */
+  camera: CameraShape,
+
+  /**
+   * The initial camera view the map should use.  Use this prop instead of `camera`
+   * only if you don't want to control the camera of the map besides the initial view.
+   *
+   * Use the camera system, instead of the region system, if you need control over
+   * the pitch or heading.
+   *
+   * Changing this prop after the component has mounted will not result in a camera change.
+   *
+   * This is similar to the `initialValue` prop of a text input.
+   */
+  initialCamera: CameraShape,
+
   /**
    * A Boolean indicating whether to use liteMode for android
    * Default value is `false`
@@ -558,7 +595,25 @@ class MapView extends React.Component {
     }
   }
 
+  getCamera() {
+    if (Platform.OS === 'android') {
+      return NativeModules.AirMapModule.getCamera(this._getHandle());
+    } else if (Platform.OS === 'ios') {
+      return this._runCommand('getCamera', []);
+    }
+    return Promise.reject('getCamera not supported on this platform');
+  }
+
+  setCamera(camera) {
+    this._runCommand('setCamera', [camera]);
+  }
+
+  animateCamera(camera, opts) {
+    this._runCommand('animateCamera', [camera, (opts && opts.duration) || 500]);
+  }
+
   animateToNavigation(location, bearing, angle, duration) {
+    console.warn('animateToNavigation() is deprecated, use animateCamera() instead');
     this._runCommand('animateToNavigation', [location, bearing, angle, duration || 500]);
   }
 
@@ -567,14 +622,17 @@ class MapView extends React.Component {
   }
 
   animateToCoordinate(latLng, duration) {
+    console.warn('animateToCoordinate() is deprecated, use animateCamera() instead');
     this._runCommand('animateToCoordinate', [latLng, duration || 500]);
   }
 
   animateToBearing(bearing, duration) {
+    console.warn('animateToBearing() is deprecated, use animateCamera() instead');
     this._runCommand('animateToBearing', [bearing, duration || 500]);
   }
 
   animateToViewingAngle(angle, duration) {
+    console.warn('animateToViewingAngle() is deprecated, use animateCamera() instead');
     this._runCommand('animateToViewingAngle', [angle, duration || 500]);
   }
 
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.h b/lib/ios/AirGoogleMaps/AIRGoogleMap.h
index 1bd52f7453..41c5b691f7 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMap.h
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.h
@@ -21,6 +21,8 @@
 @property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, assign) MKCoordinateRegion initialRegion;
 @property (nonatomic, assign) MKCoordinateRegion region;
+@property (nonatomic, assign) GMSCameraPosition *cameraProp;   // Because the base class already has a "camera" prop.
+@property (nonatomic, assign) GMSCameraPosition *initialCamera;
 @property (nonatomic, assign) NSString *customMapStyleString;
 @property (nonatomic, assign) UIEdgeInsets mapPadding;
 @property (nonatomic, assign) NSString *paddingAdjustmentBehaviorString;
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.m b/lib/ios/AirGoogleMaps/AIRGoogleMap.m
index ebd95d74b5..3aedf19229 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMap.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.m
@@ -57,7 +57,7 @@ @implementation AIRGoogleMap
   NSMutableArray<UIView *> *_reactSubviews;
   MKCoordinateRegion _initialRegion;
   MKCoordinateRegion _region;
-  BOOL _initialRegionSetOnLoad;
+  BOOL _initialCameraSetOnLoad;
   BOOL _didCallOnMapReady;
   BOOL _didMoveToWindow;
 }
@@ -72,9 +72,11 @@ - (instancetype)init
     _circles = [NSMutableArray array];
     _tiles = [NSMutableArray array];
     _overlays = [NSMutableArray array];
+    _initialCamera = nil;
+    _cameraProp = nil;
     _initialRegion = MKCoordinateRegionMake(CLLocationCoordinate2DMake(0.0, 0.0), MKCoordinateSpanMake(0.0, 0.0));
     _region = MKCoordinateRegionMake(CLLocationCoordinate2DMake(0.0, 0.0), MKCoordinateSpanMake(0.0, 0.0));
-    _initialRegionSetOnLoad = false;
+    _initialCameraSetOnLoad = false;
     _didCallOnMapReady = false;
     _didMoveToWindow = false;
 
@@ -219,7 +221,10 @@ - (void)didMoveToWindow {
   if (_didMoveToWindow) return;
   _didMoveToWindow = true;
 
-  if (_initialRegion.span.latitudeDelta != 0.0 &&
+  if (_initialCamera != nil) {
+    self.camera = _initialCamera;
+  }
+  else if (_initialRegion.span.latitudeDelta != 0.0 &&
       _initialRegion.span.longitudeDelta != 0.0) {
     self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_initialRegion];
   } else if (_region.span.latitudeDelta != 0.0 &&
@@ -231,18 +236,31 @@ - (void)didMoveToWindow {
 }
 
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
-  if (_initialRegionSetOnLoad) return;
+  if (_initialCameraSetOnLoad) return;
   _initialRegion = initialRegion;
-  _initialRegionSetOnLoad = _didMoveToWindow;
+  _initialCameraSetOnLoad = _didMoveToWindow;
   self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:initialRegion];
 }
 
+- (void)setInitialCamera:(GMSCameraPosition*)initialCamera {
+    if (_initialCameraSetOnLoad) return;
+    _initialCamera = initialCamera;
+    _initialCameraSetOnLoad = _didMoveToWindow;
+    self.camera = initialCamera;
+}
+
 - (void)setRegion:(MKCoordinateRegion)region {
   // TODO: The JS component is repeatedly setting region unnecessarily. We might want to deal with that in here.
   _region = region;
   self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self  andMKCoordinateRegion:region];
 }
 
+- (void)setCameraProp:(GMSCameraPosition*)camera {
+    _initialCamera = camera;
+    self.camera = camera;
+}
+
+
 - (void)didPrepareMap {
   if (_didCallOnMapReady) return;
   _didCallOnMapReady = true;
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
index acc7329e47..b4cb8f8830 100644
--- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
+++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
@@ -53,6 +53,8 @@ - (UIView *)view
   return map;
 }
 
+RCT_EXPORT_VIEW_PROPERTY(initialCamera, GMSCameraPosition)
+RCT_REMAP_VIEW_PROPERTY(camera, cameraProp, GMSCameraPosition)
 RCT_EXPORT_VIEW_PROPERTY(initialRegion, MKCoordinateRegion)
 RCT_EXPORT_VIEW_PROPERTY(region, MKCoordinateRegion)
 RCT_EXPORT_VIEW_PROPERTY(showsBuildings, BOOL)
@@ -87,6 +89,64 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(kmlSrc, NSString)
 
+RCT_EXPORT_METHOD(getCamera:(nonnull NSNumber *)reactTag
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[AIRGoogleMap class]]) {
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view], NULL);
+        } else {
+            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+            resolve(@{
+                      @"center": @{
+                              @"latitude": @(mapView.camera.target.latitude),
+                              @"longitude": @(mapView.camera.target.longitude),
+                              },
+                      @"pitch": @(mapView.camera.viewingAngle),
+                      @"heading": @(mapView.camera.bearing),
+                      @"zoom": @(mapView.camera.zoom),
+                    });
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
+                  camera:(id)json)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[AIRGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+        } else {
+            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+            GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
+            [mapView setCamera:camera];
+        }
+    }];
+}
+
+
+RCT_EXPORT_METHOD(animateCamera:(nonnull NSNumber *)reactTag
+                  withCamera:(id)json
+                  withDuration:(CGFloat)duration)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[AIRGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+        } else {
+            [CATransaction begin];
+            [CATransaction setAnimationDuration:duration/1000];
+            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+            GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
+            [mapView animateToCameraPosition:camera];
+            [CATransaction commit];
+        }
+    }];
+}
+
 RCT_EXPORT_METHOD(animateToNavigation:(nonnull NSNumber *)reactTag
                   withRegion:(MKCoordinateRegion)region
                   withBearing:(CGFloat)bearing
diff --git a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h
index 27eec257fc..9926e9db39 100644
--- a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h
+++ b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h
@@ -11,7 +11,7 @@
 #import <React/RCTConvert.h>
 
 @interface RCTConvert (GMSMapViewType)
-
++ (GMSCameraPosition*)GMSCameraPositionWithDefaults:(id)json existingCamera:(GMSCameraPosition*)existingCamera;
 @end
 
 #endif
diff --git a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m
index 5a332f53be..8b1736138c 100644
--- a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m
+++ b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m
@@ -9,6 +9,7 @@
 #import "RCTConvert+GMSMapViewType.h"
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTConvert.h>
+#import <React/RCTConvert+CoreLocation.h>
 
 @implementation RCTConvert (GMSMapViewType)
   RCT_ENUM_CONVERTER(GMSMapViewType,
@@ -21,6 +22,58 @@ @implementation RCTConvert (GMSMapViewType)
       @"none": @(kGMSTypeNone)
     }
   ), kGMSTypeTerrain, intValue)
+
+
++ (GMSCameraPosition*)GMSCameraPosition:(id)json
+{
+    json = [self NSDictionary:json];
+    return [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:nil];
+}
+
++ (GMSCameraPosition*)GMSCameraPositionWithDefaults:(id)json existingCamera:(GMSCameraPosition*)existingCamera
+{
+    CLLocationDegrees latitude = 0;
+    CLLocationDegrees longitude = 0;
+    double viewingAngle = 0;
+    double zoom = 0;
+    double bearing = 0;
+
+    if (existingCamera != nil) {
+        viewingAngle = existingCamera.viewingAngle;
+        latitude = existingCamera.target.latitude;
+        longitude = existingCamera.target.longitude;
+        zoom = 0;
+        bearing = 0;
+    }
+
+    if (json[@"center"]) {
+        CLLocationCoordinate2D target = [self CLLocationCoordinate2D:json[@"center"]];
+        latitude = target.latitude;
+        longitude = target.longitude;
+    }
+
+    if (json[@"pitch"]) {
+        viewingAngle = [self double:json[@"pitch"]];
+    }
+
+    // zoomAtCoordinate:forMeters:perPoints is offered by the SDK, which would allow
+    // us to support the "altitude" property of the camera as an alternative to "zoom".
+    // However, I am not clear on what the "perPoints" argument does...
+    if (json[@"zoom"]) {
+        zoom = [self double:json[@"zoom"]];
+    }
+
+    if (json[@"heading"]) {
+        bearing = [self double:json[@"heading"]];
+    }
+
+    return [GMSCameraPosition cameraWithLatitude:latitude
+                                       longitude:longitude
+                                            zoom:zoom
+                                         bearing:bearing
+                                    viewingAngle:viewingAngle];
+}
+
 @end
 
 #endif
diff --git a/lib/ios/AirMaps/AIRMap.h b/lib/ios/AirMaps/AIRMap.h
index f3b483c421..7efb953c34 100644
--- a/lib/ios/AirMaps/AIRMap.h
+++ b/lib/ios/AirMaps/AIRMap.h
@@ -38,6 +38,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 @property (nonatomic, assign) UIEdgeInsets legalLabelInsets;
 @property (nonatomic, strong) NSTimer *regionChangeObserveTimer;
 @property (nonatomic, assign) MKCoordinateRegion initialRegion;
+@property (nonatomic, assign) MKMapCamera *initialCamera;
 @property (nonatomic, assign) CGFloat minZoomLevel;
 @property (nonatomic, assign) CGFloat maxZoomLevel;
 
diff --git a/lib/ios/AirMaps/AIRMap.m b/lib/ios/AirMaps/AIRMap.m
index 53c5b6e258..0ace347953 100644
--- a/lib/ios/AirMaps/AIRMap.m
+++ b/lib/ios/AirMaps/AIRMap.m
@@ -49,6 +49,7 @@ @implementation AIRMap
     UIView *_legalLabel;
     CLLocationManager *_locationManager;
     BOOL _initialRegionSet;
+    BOOL _initialCameraSet;
 
     // Array to manually track RN subviews
     //
@@ -295,6 +296,19 @@ - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
     }
 }
 
+- (void)setCamera:(MKMapCamera*)camera animated:(BOOL)animated
+{
+    [super setCamera:camera animated:animated];
+}
+
+
+- (void)setInitialCamera:(MKMapCamera*)initialCamera {
+    if (!_initialCameraSet) {
+        _initialCameraSet = YES;
+        [self setCamera:initialCamera animated:NO];
+    }
+}
+
 - (void)setCacheEnabled:(BOOL)cacheEnabled {
     _cacheEnabled = cacheEnabled;
     if (self.cacheEnabled && self.cacheImageView.image == nil) {
diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m
index e35bd22bc1..1ccb879af7 100644
--- a/lib/ios/AirMaps/AIRMapManager.m
+++ b/lib/ios/AirMaps/AIRMapManager.m
@@ -112,6 +112,17 @@ - (UIView *)view
     [view setInitialRegion:[RCTConvert MKCoordinateRegion:json]];
     view.ignoreRegionChanges = originalIgnore;
 }
+RCT_CUSTOM_VIEW_PROPERTY(initialCamera, MKMapCamera, AIRMap)
+{
+    if (json == nil) return;
+    
+    // don't emit region change events when we are setting the initialCamera
+    BOOL originalIgnore = view.ignoreRegionChanges;
+    view.ignoreRegionChanges = YES;
+    [view setInitialCamera:[RCTConvert MKMapCamera:json]];
+    view.ignoreRegionChanges = originalIgnore;
+}
+
 
 RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, CGFloat)
@@ -128,6 +139,17 @@ - (UIView *)view
     view.ignoreRegionChanges = originalIgnore;
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(camera, MKMapCamera*, AIRMap)
+{
+    if (json == nil) return;
+    
+    // don't emit region change events when we are setting the camera
+    BOOL originalIgnore = view.ignoreRegionChanges;
+    view.ignoreRegionChanges = YES;
+    [view setCamera:[RCTConvert MKMapCamera:json] animated:NO];
+    view.ignoreRegionChanges = originalIgnore;
+}
+
 
 #pragma mark exported MapView methods
 
@@ -156,6 +178,83 @@ - (UIView *)view
     }];
 }
 
+
+
+RCT_EXPORT_METHOD(getCamera:(nonnull NSNumber *)reactTag
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        AIRMap *mapView = (AIRMap *)view;
+        if (![view isKindOfClass:[AIRMap class]]) {
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting AIRMap, got: %@", view], NULL);
+        } else {
+            MKMapCamera *camera = [mapView camera];
+            resolve(@{
+                      @"center": @{
+                              @"latitude": @(camera.centerCoordinate.latitude),
+                              @"longitude": @(camera.centerCoordinate.longitude),
+                      },
+                      @"pitch": @(camera.pitch),
+                      @"heading": @(camera.heading),
+                      @"altitude": @(camera.altitude),
+            });
+        }
+    }];
+}
+
+
+RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
+                  camera:(id)json)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[AIRMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+        } else {
+            AIRMap *mapView = (AIRMap *)view;
+
+            // Merge the changes given with the current camera
+            MKMapCamera *camera = [RCTConvert MKMapCameraWithDefaults:json existingCamera:[mapView camera]];
+
+            // don't emit region change events when we are setting the camera
+            BOOL originalIgnore = mapView.ignoreRegionChanges;
+            mapView.ignoreRegionChanges = YES;
+            [mapView setCamera:camera animated:NO];
+            mapView.ignoreRegionChanges = originalIgnore;
+        }
+    }];
+}
+
+
+RCT_EXPORT_METHOD(animateCamera:(nonnull NSNumber *)reactTag
+                  withCamera:(id)json
+                  withDuration:(CGFloat)duration)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[AIRMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+        } else {
+            AIRMap *mapView = (AIRMap *)view;
+
+            // Merge the changes given with the current camera
+            MKMapCamera *camera = [RCTConvert MKMapCameraWithDefaults:json existingCamera:[mapView camera]];
+
+            // don't emit region change events when we are setting the camera
+            BOOL originalIgnore = mapView.ignoreRegionChanges;
+            mapView.ignoreRegionChanges = YES;
+            [AIRMap animateWithDuration:duration/1000 animations:^{
+                [mapView setCamera:camera animated:YES];
+            } completion:^(BOOL finished){
+                mapView.ignoreRegionChanges = originalIgnore;
+            }];
+        }
+    }];
+}
+
+
 RCT_EXPORT_METHOD(animateToNavigation:(nonnull NSNumber *)reactTag
         withRegion:(MKCoordinateRegion)region
         withBearing:(CGFloat)bearing
diff --git a/lib/ios/AirMaps/RCTConvert+AirMap.h b/lib/ios/AirMaps/RCTConvert+AirMap.h
index fc1059d911..6098377552 100644
--- a/lib/ios/AirMaps/RCTConvert+AirMap.h
+++ b/lib/ios/AirMaps/RCTConvert+AirMap.h
@@ -11,6 +11,8 @@
 
 + (MKCoordinateSpan)MKCoordinateSpan:(id)json;
 + (MKCoordinateRegion)MKCoordinateRegion:(id)json;
++ (MKMapCamera*)MKMapCamera:(id)json;
++ (MKMapCamera*)MKMapCameraWithDefaults:(id)json existingCamera:(MKMapCamera*)camera;
 + (MKMapType)MKMapType:(id)json;
 
 @end
diff --git a/lib/ios/AirMaps/RCTConvert+AirMap.m b/lib/ios/AirMaps/RCTConvert+AirMap.m
index 42c9161933..338ed8b849 100644
--- a/lib/ios/AirMaps/RCTConvert+AirMap.m
+++ b/lib/ios/AirMaps/RCTConvert+AirMap.m
@@ -27,6 +27,36 @@ + (MKCoordinateRegion)MKCoordinateRegion:(id)json
   };
 }
 
++ (MKMapCamera*)MKMapCamera:(id)json
+{
+    json = [self NSDictionary:json];
+    return [RCTConvert MKMapCameraWithDefaults:json existingCamera:nil];
+}
+
++ (MKMapCamera*)MKMapCameraWithDefaults:(id)json existingCamera:(MKMapCamera*)camera
+{
+    json = [self NSDictionary:json];
+    if (camera == nil) {
+        camera = [[MKMapCamera alloc] init];
+    } else {
+        camera = [camera copy];
+    }
+    if (json[@"center"]) {
+        camera.centerCoordinate = [self CLLocationCoordinate2D:json[@"center"]];
+    }
+    if (json[@"pitch"]) {
+        camera.pitch = [self double:json[@"pitch"]];
+    }
+    if (json[@"altitude"]) {
+        camera.altitude = [self double:json[@"altitude"]];
+    }
+    if (json[@"heading"]) {
+        camera.heading = [self double:json[@"heading"]];
+    }
+    return camera;
+}
+
+
 RCT_ENUM_CONVERTER(MKMapType, (@{
   @"standard": @(MKMapTypeStandard),
   @"satellite": @(MKMapTypeSatellite),

From e84b35c46b198b68100b126c3909a1914539080e Mon Sep 17 00:00:00 2001
From: Bussakorn Wonghom <bussakorn.wonghom@gmail.com>
Date: Fri, 23 Nov 2018 21:51:38 +0700
Subject: [PATCH 25/28] [Android] Fix app crash in Android if building found
 but cannot getActiveLevelIndex (#2598)

## check building is not null
## check activeLevelIndex is in array's bound
---
 .../main/java/com/airbnb/android/react/maps/AirMapView.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
index 1751c2f544..1bc6d65d87 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java
@@ -1189,7 +1189,13 @@ public void onIndoorBuildingFocused() {
   
   @Override
   public void onIndoorLevelActivated(IndoorBuilding building) {
+    if (building == null) {
+      return;
+    }
     int activeLevelIndex = building.getActiveLevelIndex();
+    if (activeLevelIndex < 0 || activeLevelIndex >= building.getLevels().size()) {
+      return;
+    }
     IndoorLevel level = building.getLevels().get(activeLevelIndex);
 
     WritableMap event = Arguments.createMap();

From 5d17d395bea207cb422fdf965e8a8e4c80f0fc1e Mon Sep 17 00:00:00 2001
From: Yusuke Shibahara <unosk.s@gmail.com>
Date: Mon, 3 Dec 2018 20:10:29 +0900
Subject: [PATCH 26/28] Fix type definition error (#2607)

Fix below errors:

- 'setCamera', which lacks return-type annotation, implicitly has an 'any' return type.
- 'animateCamera', which lacks return-type annotation, implicitly has an 'any' return type.
---
 index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 07045485e7..5d63e4b633 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -226,8 +226,8 @@ declare module "react-native-maps" {
 
     export default class MapView extends React.Component<MapViewProps, any> {
         getCamera(): Promise<Camera>;
-        setCamera(camera: Partial<Camera>);
-        animateCamera(camera: Partial<Camera>, opts?: {duration?: number});
+        setCamera(camera: Partial<Camera>): void;
+        animateCamera(camera: Partial<Camera>, opts?: {duration?: number}): void;
         animateToNavigation(location: LatLng, bearing: number, angle: number, duration?: number): void;
         animateToRegion(region: Region, duration?: number): void;
         animateToCoordinate(latLng: LatLng, duration?: number): void;

From c68fadbda7410d6153bd9da885b068940167c6b3 Mon Sep 17 00:00:00 2001
From: Yusuke Shibahara <unosk.s@gmail.com>
Date: Mon, 3 Dec 2018 20:23:10 +0900
Subject: [PATCH 27/28] [iOS GoogleMap] Fix animateCamera (#2608)

Fixed a bug that
zoom and heading will always be 0 if they are not included in the argument of animateCamera
---
 lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m
index 8b1736138c..e768807f33 100644
--- a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m
+++ b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m
@@ -42,8 +42,8 @@ + (GMSCameraPosition*)GMSCameraPositionWithDefaults:(id)json existingCamera:(GMS
         viewingAngle = existingCamera.viewingAngle;
         latitude = existingCamera.target.latitude;
         longitude = existingCamera.target.longitude;
-        zoom = 0;
-        bearing = 0;
+        zoom = existingCamera.zoom;
+        bearing = existingCamera.bearing;
     }
 
     if (json[@"center"]) {

From ccd48792b74ba810b0e01c60dfc2b5c42f191e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C5=A0mitala?= <radovan.smitala@gmail.com>
Date: Fri, 7 Dec 2018 13:40:41 +0100
Subject: [PATCH 28/28] Calculate bounding box from region (#2615)

* Add helper method for getting bounding box from region

* Awaiting promise in async method, add typescript definition

* Fix eslint
---
 index.d.ts                      |  1 +
 lib/components/MapView.js       | 24 ++++++++++++++++++++++--
 lib/ios/AirMaps/AIRMapManager.m |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 5d63e4b633..ac1586c0bd 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -237,6 +237,7 @@ declare module "react-native-maps" {
         fitToSuppliedMarkers(markers: string[], options?: { edgePadding?: EdgePadding, animated?: boolean }): void;
         fitToCoordinates(coordinates?: LatLng[], options?: { edgePadding?: EdgePadding, animated?: boolean }): void;
         setMapBoundaries(northEast: LatLng, southWest: LatLng): void;
+        getMapBoundaries(): {northEast: LatLng; southWest: LatLng};
         takeSnapshot(options?: SnapshotOptions): Promise<string>;
     }
 
diff --git a/lib/components/MapView.js b/lib/components/MapView.js
index 73872c195e..929d76d7ab 100644
--- a/lib/components/MapView.js
+++ b/lib/components/MapView.js
@@ -665,9 +665,9 @@ class MapView extends React.Component {
    */
   async getMapBoundaries() {
     if (Platform.OS === 'android') {
-      return NativeModules.AirMapModule.getMapBoundaries(this._getHandle());
+      return await NativeModules.AirMapModule.getMapBoundaries(this._getHandle());
     } else if (Platform.OS === 'ios') {
-      return this._runCommand('getMapBoundaries', []);
+      return await this._runCommand('getMapBoundaries', []);
     }
     return Promise.reject('getMapBoundaries not supported on this platform');
   }
@@ -791,6 +791,26 @@ class MapView extends React.Component {
     return Promise.reject('coordinateForPoint not supported on this platform');
   }
 
+  /**
+   * Get bounding box from region
+   *
+   * @param region Region
+   *
+   * @return Object Object bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
+   */
+  boundingBoxForRegion(region) {
+    return {
+      northEast: {
+        latitude: region.latitude + (region.latitudeDelta / 2),
+        longitude: region.longitude + (region.longitudeDelta / 2),
+      },
+      southWest: {
+        latitude: region.latitude - (region.latitudeDelta / 2),
+        longitude: region.longitude - (region.longitudeDelta / 2),
+      },
+    };
+  }
+
   _uiManagerCommand(name) {
     return NativeModules.UIManager[getAirMapName(this.props.provider)].Commands[name];
   }
diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m
index 1ccb879af7..da5213d69f 100644
--- a/lib/ios/AirMaps/AIRMapManager.m
+++ b/lib/ios/AirMaps/AIRMapManager.m
@@ -939,7 +939,7 @@ - (void)mapView:(AIRMap *)mapView regionDidChangeAnimated:(__unused BOOL)animate
 - (void)mapViewWillStartRenderingMap:(AIRMap *)mapView
 {
     if (!mapView.hasStartedRendering) {
-      mapView.onMapReady(@{}); 
+      mapView.onMapReady(@{});
       mapView.hasStartedRendering = YES;
     }
     [mapView beginLoading];