react-native-maps 1.21.0-alpha.34 → 1.21.0-alpha.36

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -362,6 +362,19 @@ id regionAsJSON(MKCoordinateRegion region) {
     ];
 }
 
+- (NSDictionary *) getCameraDic {
+    MKMapCamera *camera = [self camera];
+    return @{
+        @"center": @{
+            @"latitude": @(camera.centerCoordinate.latitude),
+            @"longitude": @(camera.centerCoordinate.longitude),
+        },
+        @"pitch": @(camera.pitch),
+        @"heading": @(camera.heading),
+        @"altitude": @(camera.altitude),
+    };
+}
+
 - (void)layoutSubviews {
   [super layoutSubviews];
   if(_didLayoutSubviews) return;

package/ios/AirMaps/AIRMap.h

@@ -76,7 +76,6 @@ extern const NSInteger AIRMapMaxZoomLevel;
 
 - (void)cacheViewIfNeeded;
 - (void)beginLoading;
-- (void)didSetRegion;
 - (void)finishLoading;
 - (double)getZoomLevel;
 - (NSArray *)getMapBoundaries;

package/ios/AirMaps/AIRMap.m

@@ -51,6 +51,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     BOOL _initialRegionSet;
     BOOL _initialCameraSet;
     BOOL _initialized;
+    BOOL _loadingStarted;
 
     // Array to manually track RN subviews
     //
@@ -102,9 +103,6 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         [super addSubview:view];
     }
 }
-- (void) didSetRegion {
-    _initialRegionSet = YES;
-}
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
@@ -381,7 +379,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     return markersFrames;
 }
 
-- (NSDictionary *) getCamera {
+- (NSDictionary *) getCameraDic {
     MKMapCamera *camera = [self camera];
     return @{
         @"center": @{
@@ -572,12 +570,23 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     // Animate/move to new position
     [super setRegion:region animated:animated];
 }
+- (void) setRegion:(MKCoordinateRegion)region
+{
+    if (!CLLocationCoordinate2DIsValid(region.center)) {
+        return;
+    }
+    if (!CLLocationCoordinate2DIsValid(_initialRegion.center)) {
+        [self setInitialRegion:region];
+    }
+    [self setRegion:region animated:NO];
+}
 
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
     if (!CLLocationCoordinate2DIsValid(initialRegion.center)) {
         return;
     }
-    if (!_initialRegionSet) {
+    _initialRegion = initialRegion;
+    if (!_initialRegionSet && _loadingStarted) {
         _initialRegionSet = YES;
         [self setRegion:initialRegion animated:NO];
     }
@@ -810,6 +819,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
             self.loadingView.hidden = YES;
         }
     }
+    _loadingStarted = YES;
+    // loadRegion
+    [self setInitialRegion:_initialRegion];
 }
 
 - (void)finishLoading {

package/ios/AirMaps/RNMapsAirModule.mm

@@ -37,7 +37,7 @@
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject {
     [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
-        resolve([mapView getCamera]);
+        resolve([mapView getCameraDic]);
     } reject:reject];
 
 }

package/ios/AirMaps/RNMapsAirModuleDelegate.h

@@ -16,7 +16,7 @@
 - (void)takeSnapshotWithConfig:(NSDictionary *)config
                       success:(RCTPromiseResolveBlock) success error:(RCTPromiseRejectBlock) error;
 
-- (NSDictionary *) getCamera;
+- (NSDictionary *) getCameraDic;
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
 - (NSArray *) getMapBoundaries;
 - (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location;

package/ios/AirMaps/RNMapsMapView.mm

@@ -445,7 +445,6 @@ newViewProps.name.longitudeDelta); \
 MKCoordinateRegion region = MKCoordinateRegionMake(CLLocationCoordinate2DMake( \
 newViewProps.name.latitude, newViewProps.name.longitude), span); \
 _view.name = region;                                                 \
-[_view didSetRegion];                                                 \
 }
 
 #define REMAP_MAPVIEW_CAMERA_PROP(name)                                    \

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": "1.21.0-alpha.34",
+  "version": "1.21.0-alpha.36",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",