react-native-maps 1.21.0-alpha.11 → 1.21.0-alpha.13

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.h

@@ -10,6 +10,7 @@
 #import <React/RCTBridge.h>
 #import "AIRGMSPolygon.h"
 #import "AIRGoogleMapCoordinate.h"
+#import "AIRGoogleMap.h"
 
 @interface AIRGoogleMapPolygon : UIView
 
@@ -26,7 +27,7 @@
 @property (nonatomic, assign) BOOL geodesic;
 @property (nonatomic, assign) int zIndex;
 @property (nonatomic, assign) BOOL tappable;
-
+- (void) didInsertInMap:(AIRGoogleMap *) map;
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.m

@@ -9,6 +9,7 @@
 #import "AIRGoogleMapPolygon.h"
 #import "AIRGMSPolygon.h"
 #import <GoogleMaps/GoogleMaps.h>
+#import "AIRGoogleMap.h"
 
 @implementation AIRGoogleMapPolygon
 {
@@ -41,6 +42,32 @@
     _polygon.strokeWidth = _strokeWidth;
   }
 }
+- (void) didInsertInMap:(AIRGoogleMap *) map
+{
+    _polygon = [AIRGMSPolygon new];
+
+    if (_identifier){
+        [_polygon setIdentifier:_identifier];
+    }
+
+    [_polygon setTappable:_tappable];
+    if (_strokeColor){
+        _polygon.strokeColor = _strokeColor;
+    }
+    if (_fillColor){
+        _polygon.fillColor = _fillColor;
+    }
+    if (_strokeWidth){
+        _polygon.strokeWidth = _strokeWidth;
+    }
+    if (_coordinates){
+        [self setCoordinates:_coordinates];
+    }
+    if (_holes){
+        [self setHoles:_holes];
+    }
+    [_polygon setMap:map];
+}
 
 - (void)setCoordinates:(NSArray<AIRGoogleMapCoordinate *> *)coordinates
 {

package/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m

@@ -33,6 +33,8 @@
 
 + (AIRGoogleMapCoordinate *)AIRGoogleMapCoordinate:(id)json
 {
+    // empty coordinates
+    if ([json isKindOfClass:[NSArray class]] && [json count] == 0) return nil;
     AIRGoogleMapCoordinate *coord = [AIRGoogleMapCoordinate new];
     coord.coordinate = [self CLLocationCoordinate2D:json];
     return coord;

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -43,11 +43,8 @@ using namespace facebook::react;
 - (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration{
     NSDictionary* regionDic = [RCTConvert dictonaryFromString:regionJSON];
     MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:regionDic];
-    [CATransaction begin];
-    [CATransaction setAnimationDuration:duration/1000];
     GMSCameraPosition *camera = [AIRGoogleMap makeGMSCameraPositionFromMap:_view andMKCoordinateRegion:region];
-    [self->_view animateToCameraPosition:camera];
-    [CATransaction commit];
+    [_view animateToCameraPosition:camera];
 }
 - (void)setCamera:(NSString *)cameraJSON{
     NSDictionary* cameraDic = [RCTConvert dictonaryFromString:cameraJSON];
@@ -389,8 +386,11 @@ using namespace facebook::react;
         } else {
             [_pendingInsertsSubviews setObject:paperView forKey:[NSNumber numberWithInteger:index]];
         }
+    } else {
+        [_view insertReactSubview:childComponentView atIndex:index];
     }
 }
+
 - (void) unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
     id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
@@ -400,8 +400,20 @@ using namespace facebook::react;
         } else {
             [_pendingInsertsSubviews removeObjectForKey:[NSNumber numberWithInteger:index]];
         }
+    } else {
+        [_view removeReactSubview:childComponentView];
     }
 }
+- (void) prepareForRecycle
+{
+    [super prepareForRecycle];
+    static const auto defaultProps = std::make_shared<const RNMapsGoogleMapViewProps>();
+    _props = defaultProps;
+    _legacyMapManager = [[AIRGoogleMapManager alloc] init];
+      _pendingInsertsSubviews = [NSMutableDictionary new];
+    [_view removeFromSuperview];
+    _view = nil;
+}
 
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
@@ -474,20 +486,6 @@ using namespace facebook::react;
         _view.name = region;                                                 \
     }
 
-#define REMAP_GOOGLEMAPVIEW_CAMERA_PROP(name)                                    \
-    if (newViewProps.name.center.latitude != oldViewProps.name.center.latitude || \
-        newViewProps.name.center.longitude != oldViewProps.name.center.longitude || \
-        newViewProps.name.heading != oldViewProps.name.heading ||         \
-        newViewProps.name.pitch != oldViewProps.name.pitch ||             \
-        newViewProps.name.zoom != oldViewProps.name.zoom) {               \
-        GMSCameraPosition* camera = [GMSCameraPosition cameraWithLatitude:newViewProps.name.center.latitude \
-                                                                longitude:newViewProps.name.center.longitude \
-                                                                     zoom:newViewProps.name.zoom   \
-                                                                  bearing:newViewProps.name.heading  \
-                                                             viewingAngle:newViewProps.name.pitch]; \
-        _view.name = camera;                                              \
-    }
-
 
 #define REMAP_MAPVIEW_EDGEINSETS_PROP(name)                               \
     if (newViewProps.name.top != oldViewProps.name.top ||                 \
@@ -520,7 +518,18 @@ using namespace facebook::react;
     REMAP_MAPVIEW_REGION_PROP(region)
     REMAP_MAPVIEW_REGION_PROP(initialRegion)
 
-    REMAP_GOOGLEMAPVIEW_CAMERA_PROP(camera)
+    if (newViewProps.camera.center.latitude != oldViewProps.camera.center.latitude ||
+          newViewProps.camera.center.longitude != oldViewProps.camera.center.longitude ||
+          newViewProps.camera.heading != oldViewProps.camera.heading ||
+          newViewProps.camera.pitch != oldViewProps.camera.pitch ||
+          newViewProps.camera.zoom != oldViewProps.camera.zoom) {
+          GMSCameraPosition* camera = [GMSCameraPosition cameraWithLatitude:newViewProps.camera.center.latitude
+                                                                  longitude:newViewProps.camera.center.longitude
+                                                                       zoom:newViewProps.camera.zoom
+                                                                    bearing:newViewProps.camera.heading
+                                                               viewingAngle:newViewProps.camera.pitch];
+        _view.cameraProp = camera;
+      }
     
     
     REMAP_MAPVIEW_EDGEINSETS_PROP(mapPadding)
@@ -536,8 +545,10 @@ using namespace facebook::react;
                 break;
             case RNMapsGoogleMapViewMapType::Terrain:
                 _view.mapType = kGMSTypeTerrain;
+                break;
             case RNMapsGoogleMapViewMapType::Hybrid:
                 _view.mapType = kGMSTypeHybrid;
+                break;
             default:
                 _view.mapType = kGMSTypeNormal;
                 break;

package/ios/AirMaps/AIRMap.h

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

package/ios/AirMaps/AIRMap.m

@@ -52,6 +52,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     UIView *_legalLabel;
     BOOL _initialRegionSet;
     BOOL _initialCameraSet;
+    BOOL _initialized;
     
     // Array to manually track RN subviews
     //
@@ -90,6 +91,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         self.maxZoom = AIRMapMaxZoomLevel;
         self.compassOffset = CGPointMake(0, 0);
         self.legacyZoomConstraintsEnabled = YES;
+        _initialized = YES;
     }
     return self;
 }
@@ -101,6 +103,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         [super addSubview:view];
     }
 }
+- (void) didSetRegion {
+    _initialRegionSet = YES;
+}
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
@@ -562,6 +567,9 @@ MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordina
 }
 
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
+    if (!CLLocationCoordinate2DIsValid(initialRegion.center)) {
+        return;
+    }
     if (!_initialRegionSet) {
         _initialRegionSet = YES;
         [self setRegion:initialRegion animated:NO];

package/ios/AirMaps/AIRMapManager.m

@@ -951,6 +951,8 @@ static int kDragCenterContext;
 
     mapView.pendingCenter = mapView.region.center;
     mapView.pendingSpan = mapView.region.span;
+    // reset original state (checkout setCamera / region animated)
+    mapView.ignoreRegionChanges = NO;
 }
 
 - (void)mapViewWillStartRenderingMap:(AIRMap *)mapView
@@ -965,6 +967,7 @@ static int kDragCenterContext;
 - (void)mapViewDidFinishRenderingMap:(AIRMap *)mapView fullyRendered:(BOOL)fullyRendered
 {
     [mapView finishLoading];
+    mapView.ignoreRegionChanges = NO;
 }
 
 #pragma mark Private