react-native-maps 2.0.0-beta.8 → 2.0.0-beta.9

package/android/src/main/java/com/rnmaps/maps/MapManager.java

@@ -274,6 +274,11 @@ public class MapManager extends ViewGroupManager<MapView> {
     }
   }
 
+  @ReactProp(name = "boundary")
+  public void setBoundary(MapView view, ReadableMap boundary) {
+    view.setBoundary(boundary);
+  }
+
   @Override
   public void receiveCommand(@NonNull MapView view, String commandId, @Nullable ReadableArray args) {
     ReadableMap camera;
@@ -287,13 +292,6 @@ public class MapManager extends ViewGroupManager<MapView> {
         view.animateToCamera(camera, 0);
         break;
 
-      case "setMapBoundaries":
-        if(args == null) {
-          break;
-        }
-        view.setMapBoundaries(args.getMap(0), args.getMap(1));
-        break;
-
       case "setIndoorActiveLevelIndex":
         if(args == null) {
           break;

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -110,6 +110,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private boolean initialCameraSet = false;
   private LatLngBounds cameraLastIdleBounds;
   private int cameraMoveReason = 0;
+  private LatLngBounds boundary;
 
   private static final String[] PERMISSIONS = new String[]{
       "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
@@ -500,7 +501,42 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
   }
 
+  public void setBoundary(ReadableMap boundary) {
+    if(boundary == null) {
+      this.boundary = null;
+      if(map != null) {
+        // consumers can pass null to clear boundary
+        map.setLatLngBoundsForCameraTarget(null);
+      }
+    } else {
+      LatLngBounds.Builder builder = new LatLngBounds.Builder();
+
+      ReadableMap northEast = boundary.getMap("northEast");
+      ReadableMap southWest = boundary.getMap("southWest");
+
+      double neLat = northEast.getDouble("latitude");
+      double neLng = northEast.getDouble("longitude");
+      builder.include(new LatLng(neLat, neLng));
+
+      double swLat = southWest.getDouble("latitude");
+      double swLng = southWest.getDouble("longitude");
+      builder.include(new LatLng(swLat, swLng));
+
+      LatLngBounds bounds = builder.build();
+
+      this.boundary = bounds;
+
+      if(map != null) {
+        map.setLatLngBoundsForCameraTarget(bounds);
+      }
+    }
+  }
+
+  // called as soon as the map is ready. Assuming nothing was set on the map at this point.
   private void applyBridgedProps() {
+    if(boundary != null) {
+      map.setLatLngBoundsForCameraTarget(boundary);
+    }
     if(initialRegion != null) {
       moveToRegion(initialRegion);
       initialRegionSet = true;
@@ -905,24 +941,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     };
   }
 
-  public void setMapBoundaries(ReadableMap northEast, ReadableMap southWest) {
-    if (map == null) return;
-
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    double latNE = northEast.getDouble("latitude");
-    double lngNE = northEast.getDouble("longitude");
-    builder.include(new LatLng(latNE, lngNE));
-
-    double latSW = southWest.getDouble("latitude");
-    double lngSW = southWest.getDouble("longitude");
-    builder.include(new LatLng(latSW, lngSW));
-
-    LatLngBounds bounds = builder.build();
-
-    map.setLatLngBoundsForCameraTarget(bounds);
-  }
-
   // InfoWindowAdapter interface
 
   @Override

package/ios/GoogleMaps/RCTConvert+GMSMapViewType.m

@@ -30,6 +30,14 @@
     return [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:nil];
 }
 
++ (GMSCoordinateBounds*)GMSCoordinateBounds:(id)json
+{
+    json = [self NSDictionary:json];
+    CLLocationCoordinate2D northEast = [self CLLocationCoordinate2D:json[@"northEast"]];
+    CLLocationCoordinate2D southWest = [self CLLocationCoordinate2D:json[@"southWest"]];
+    return [[GMSCoordinateBounds alloc] initWithCoordinate:northEast coordinate:southWest];
+}
+
 + (GMSCameraPosition*)GMSCameraPositionWithDefaults:(id)json existingCamera:(GMSCameraPosition*)existingCamera
 {
     CLLocationDegrees latitude = 0;

package/ios/GoogleMaps/RNMGoogleMap.m

@@ -305,6 +305,10 @@ id regionAsJSON(MKCoordinateRegion region) {
     }
 }
 
+- (void)setBoundary:(GMSCoordinateBounds*)boundary {
+    self.cameraTargetBounds = boundary;
+}
+
 - (void)didPrepareMap {
   UIView* mapView = [self valueForKey:@"mapView"]; //GMSVectorMapView
   [self overrideGestureRecognizersForView:mapView];

package/ios/GoogleMaps/RNMGoogleMapManager.m

@@ -65,47 +65,47 @@ RCT_EXPORT_MODULE(RNMGoogleMap)
   return map;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(isAccessibilityElement, BOOL)
-RCT_REMAP_VIEW_PROPERTY(testID, accessibilityIdentifier, NSString)
+RCT_EXPORT_VIEW_PROPERTY(boundary, GMSCoordinateBounds*)
+RCT_EXPORT_VIEW_PROPERTY(customMapStyleString, NSString)
 RCT_EXPORT_VIEW_PROPERTY(initialCamera, GMSCameraPosition)
-RCT_REMAP_VIEW_PROPERTY(camera, cameraProp, GMSCameraPosition)
 RCT_EXPORT_VIEW_PROPERTY(initialRegion, MKCoordinateRegion)
+RCT_EXPORT_VIEW_PROPERTY(isAccessibilityElement, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(kmlSrc, NSString)
+RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
+RCT_EXPORT_VIEW_PROPERTY(mapType, GMSMapViewType)
+RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorBuildingFocused, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorLevelActivated, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onKmlReady, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapLoaded, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPoiClick, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(region, MKCoordinateRegion)
+RCT_EXPORT_VIEW_PROPERTY(rotateEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(scrollDuringRotateOrZoomEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(scrollEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showsBuildings, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showsCompass, BOOL)
-//RCT_EXPORT_VIEW_PROPERTY(showsScale, BOOL)  // Not supported by GoogleMaps
+RCT_EXPORT_VIEW_PROPERTY(showsIndoorLevelPicker, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsIndoors, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsMyLocationButton, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showsTraffic, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsUserLocation, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(zoomEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(rotateEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(scrollEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(scrollDuringRotateOrZoomEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(zoomTapEnabled, 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)
+RCT_REMAP_VIEW_PROPERTY(camera, cameraProp, GMSCameraPosition)
 RCT_REMAP_VIEW_PROPERTY(paddingAdjustmentBehavior, paddingAdjustmentBehaviorString, NSString)
-RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onMapLoaded, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onKmlReady, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
-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)
-RCT_EXPORT_VIEW_PROPERTY(kmlSrc, NSString)
+RCT_REMAP_VIEW_PROPERTY(testID, accessibilityIdentifier, NSString)
 
 RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
                   camera:(id)json)
@@ -122,24 +122,6 @@ RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
     }];
 }
 
-RCT_EXPORT_METHOD(setMapBoundaries:(nonnull NSNumber *)reactTag
-                  northEast:(CLLocationCoordinate2D)northEast
-                  southWest:(CLLocationCoordinate2D)southWest)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RNMGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
-    } else {
-      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
-
-      GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:northEast coordinate:southWest];
-
-      mapView.cameraTargetBounds = bounds;
-    }
-  }];
-}
-
 RCT_EXPORT_METHOD(setIndoorActiveLevelIndex:(nonnull NSNumber *)reactTag
                   levelIndex:(NSInteger) levelIndex)
 {

package/ios/Maps/RCTConvert+RNMMap.m

@@ -56,6 +56,23 @@
     return camera;
 }
 
++ (MKMapCameraBoundary *)MKMapCameraBoundary:(id)json
+{
+    json = [self NSDictionary:json];
+    CLLocationCoordinate2D northEast = [self CLLocationCoordinate2D:json[@"northEast"]];
+    CLLocationCoordinate2D southWest = [self CLLocationCoordinate2D:json[@"southWest"]];
+    MKCoordinateSpan span = {
+        northEast.latitude - southWest.latitude,
+        northEast.longitude - southWest.longitude
+    };
+    CLLocationCoordinate2D center = {
+        (northEast.latitude + southWest.latitude) / 2,
+        (northEast.longitude + southWest.longitude) / 2
+    };
+
+    MKCoordinateRegion region = {center, span}; 
+    return [[MKMapCameraBoundary alloc] initWithCoordinateRegion:region];
+}
 
 RCT_ENUM_CONVERTER(MKMapType, (@{
   @"standard": @(MKMapTypeStandard),

package/ios/Maps/RNMMap.m

@@ -340,6 +340,10 @@ const NSInteger RNMMapMaxZoomLevel = 20;
     ];
 }
 
+- (void)setBoundary:(MKMapCameraBoundary*)boundary {
+    [self setCameraBoundary:boundary animated:NO];
+}
+
 - (void)setShowsUserLocation:(BOOL)showsUserLocation
 {
     if (self.showsUserLocation != showsUserLocation) {

package/ios/Maps/RNMMapManager.m

@@ -81,57 +81,60 @@ RCT_EXPORT_MODULE(RNMMap)
     return map;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(isAccessibilityElement, BOOL)
-RCT_REMAP_VIEW_PROPERTY(testID, accessibilityIdentifier, NSString)
-RCT_EXPORT_VIEW_PROPERTY(showsUserLocation, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(userLocationAnnotationTitle, NSString)
-RCT_EXPORT_VIEW_PROPERTY(userInterfaceStyle, NSString)
+RCT_EXPORT_VIEW_PROPERTY(boundary, MKMapCameraBoundary*)
+RCT_EXPORT_VIEW_PROPERTY(cacheEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(compassOffset, CGPoint)
 RCT_EXPORT_VIEW_PROPERTY(followsUserLocation, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(userLocationCalloutEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(showsPointsOfInterest, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(showsBuildings, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(showsCompass, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(showsScale, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(showsTraffic, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(zoomEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(handlePanDrag, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(isAccessibilityElement, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(kmlSrc, NSString)
-RCT_EXPORT_VIEW_PROPERTY(rotateEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(scrollEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(cacheEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(loadingEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(legalLabelInsets, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(loadingBackgroundColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(loadingEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(loadingIndicatorColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(handlePanDrag, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(maxDelta, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(minDelta, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(compassOffset, CGPoint)
-RCT_EXPORT_VIEW_PROPERTY(legalLabelInsets, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(mapType, MKMapType)
-RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(maxDelta, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(minDelta, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(onCalloutPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onDoublePress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onMarkerDragStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDragEnd, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onCalloutPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDragStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
-RCT_CUSTOM_VIEW_PROPERTY(initialRegion, MKCoordinateRegion, RNMMap)
+RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(rotateEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(scrollEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsBuildings, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsCompass, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsPointsOfInterest, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsScale, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsTraffic, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsUserLocation, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(userInterfaceStyle, NSString)
+RCT_EXPORT_VIEW_PROPERTY(userLocationAnnotationTitle, NSString)
+RCT_EXPORT_VIEW_PROPERTY(userLocationCalloutEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(zoomEnabled, BOOL)
+RCT_REMAP_VIEW_PROPERTY(testID, accessibilityIdentifier, NSString)
+RCT_CUSTOM_VIEW_PROPERTY(camera, MKMapCamera*, RNMMap)
 {
     if (json == nil) return;
-
-    // don't emit region change events when we are setting the initialRegion
+    
+    // don't emit region change events when we are setting the camera
     BOOL originalIgnore = view.ignoreRegionChanges;
     view.ignoreRegionChanges = YES;
-    [view setInitialRegion:[RCTConvert MKCoordinateRegion:json]];
+    [view setCamera:[RCTConvert MKMapCamera:json] animated:NO];
     view.ignoreRegionChanges = originalIgnore;
 }
 RCT_CUSTOM_VIEW_PROPERTY(initialCamera, MKMapCamera, RNMMap)
@@ -145,34 +148,28 @@ RCT_CUSTOM_VIEW_PROPERTY(initialCamera, MKMapCamera, RNMMap)
     view.ignoreRegionChanges = originalIgnore;
 }
 
-
-RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, CGFloat)
-
-
-RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RNMMap)
+RCT_CUSTOM_VIEW_PROPERTY(initialRegion, MKCoordinateRegion, RNMMap)
 {
     if (json == nil) return;
 
-    // don't emit region change events when we are setting the region
+    // don't emit region change events when we are setting the initialRegion
     BOOL originalIgnore = view.ignoreRegionChanges;
     view.ignoreRegionChanges = YES;
-    [view setRegion:[RCTConvert MKCoordinateRegion:json] animated:NO];
+    [view setInitialRegion:[RCTConvert MKCoordinateRegion:json]];
     view.ignoreRegionChanges = originalIgnore;
 }
 
-RCT_CUSTOM_VIEW_PROPERTY(camera, MKMapCamera*, RNMMap)
+RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RNMMap)
 {
     if (json == nil) return;
-    
-    // don't emit region change events when we are setting the camera
+
+    // don't emit region change events when we are setting the region
     BOOL originalIgnore = view.ignoreRegionChanges;
     view.ignoreRegionChanges = YES;
-    [view setCamera:[RCTConvert MKMapCamera:json] animated:NO];
+    [view setRegion:[RCTConvert MKCoordinateRegion:json] animated:NO];
     view.ignoreRegionChanges = originalIgnore;
 }
 
-
 #pragma mark exported MapView methods
 
 RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag

package/lib/MapView.d.ts

@@ -6,6 +6,12 @@ import { Modify } from './sharedTypesInternal';
 import { MapViewNativeComponentType } from './MapViewNativeComponent';
 export declare const MAP_TYPES: MapTypes;
 export type MapViewProps = ViewProps & {
+    /**
+     * A boundary of an area within which the map’s center needs to remain.
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    boundary?: BoundingBox;
     /**
      * If `true` map will be cached and displayed as an image instead of being interactable, for performance usage.
      *
@@ -592,7 +598,6 @@ declare class MapView extends React.Component<MapViewProps, State> {
      * @return Promise Promise with the bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
      */
     getMapBoundaries(): Promise<BoundingBox>;
-    setMapBoundaries(northEast: LatLng, southWest: LatLng): void;
     setIndoorActiveLevelIndex(activeLevelIndex: number): void;
     /**
      * Takes a snapshot of the map and saves it to a picture

package/lib/MapView.js

@@ -138,11 +138,6 @@ class MapView extends React.Component {
         }
         return mapViewModuleMethod('getMapBoundaries')(this._getHandle());
     }
-    setMapBoundaries(northEast, southWest) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setMapBoundaries(this.map.current, northEast, southWest);
-        }
-    }
     setIndoorActiveLevelIndex(activeLevelIndex) {
         if (this.map.current) {
             MapViewNativeComponent_1.Commands.setIndoorActiveLevelIndex(this.map.current, activeLevelIndex);
@@ -310,6 +305,7 @@ class MapView extends React.Component {
                 customMapStyleString: this.props.customMapStyle
                     ? JSON.stringify(this.props.customMapStyle)
                     : undefined,
+                boundary: this.props.boundary,
             };
         }
         if (react_native_1.Platform.OS === 'android' && this.props.liteMode) {

package/lib/MapView.types.d.ts

@@ -156,4 +156,3 @@ export interface MarkersFrames {
         frame: Frame;
     };
 }
-export type NativeCommandName = 'animateCamera' | 'animateToRegion' | 'coordinateForPoint' | 'fitToCoordinates' | 'fitToElements' | 'fitToSuppliedMarkers' | 'getAddressFromCoordinates' | 'getCamera' | 'getMapBoundaries' | 'getMarkersFrames' | 'pointForCoordinate' | 'setCamera' | 'setIndoorActiveLevelIndex' | 'setMapBoundaries' | 'takeSnapshot';

package/lib/MapViewNativeComponent.d.ts

@@ -2,11 +2,9 @@
 import type { HostComponent } from 'react-native';
 import { NativeProps } from './MapView';
 import { Camera } from './MapView.types';
-import { LatLng } from './sharedTypes';
 export type MapViewNativeComponentType = HostComponent<NativeProps>;
 interface NativeCommands {
     setCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>) => void;
-    setMapBoundaries: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, northEast: LatLng, southWest: LatLng) => void;
     setIndoorActiveLevelIndex: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, activeLevelIndex: number) => void;
 }
 export declare const Commands: NativeCommands;

package/lib/MapViewNativeComponent.js

@@ -6,9 +6,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Commands = void 0;
 const codegenNativeCommands_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeCommands"));
 exports.Commands = (0, codegenNativeCommands_1.default)({
-    supportedCommands: [
-        'setCamera',
-        'setMapBoundaries',
-        'setIndoorActiveLevelIndex',
-    ],
+    supportedCommands: ['setCamera', 'setIndoorActiveLevelIndex'],
 });

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/react-native-maps.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
   s.homepage     = package["homepage"]
   s.license      = package["license"]
-  s.platform     = :ios, "11.0"
+  s.platform     = :ios, "13.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
   s.source_files  = "ios/Maps/**/*.{h,m}"