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

package/ios/AirGoogleMaps/AIRGMSMarker.h

@@ -12,7 +12,7 @@
 
 @class AIRGoogleMapMarker;
 
-@interface AIRGMSMarker : GMSAdvancedMarker
+@interface AIRGMSMarker : GMSMarker
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, weak) AIRGoogleMapMarker *fakeMarker;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -69,6 +69,7 @@ id regionAsJSON(MKCoordinateRegion region) {
   BOOL _didPrepareMap;
   BOOL _didCallOnMapReady;
   BOOL _zoomTapEnabled;
+  BOOL _isAnimating;
   NSString* _googleMapId;
 }
 
@@ -239,11 +240,11 @@ id regionAsJSON(MKCoordinateRegion region) {
   // This is where we intercept them and do the appropriate underlying mapview action.
   if ([subview isKindOfClass:[AIRGoogleMapMarker class]]) {
     AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
-    marker.realMarker.map = self;
+    [marker didInsertInMap:self];
     [self.markers addObject:marker];
   } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
     AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
-    polygon.polygon.map = self;
+    [polygon didInsertInMap:self];
     [self.polygons addObject:polygon];
   } else if ([subview isKindOfClass:[AIRGoogleMapPolyline class]]) {
     AIRGoogleMapPolyline *polyline = (AIRGoogleMapPolyline*)subview;
@@ -390,7 +391,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)setRegion:(MKCoordinateRegion)region {
-  // TODO: The JS component is repeatedly setting region unnecessarily. We might want to deal with that in here.
+    if (_isAnimating || !CLLocationCoordinate2DIsValid(region.center)) return;
   _region = region;
   if(_didLayoutSubviews) {
     self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self  andMKCoordinateRegion:region];
@@ -410,6 +411,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)setCameraProp:(GMSCameraPosition*)camera {
+    if (_isAnimating || !CLLocationCoordinate2DIsValid([camera target])) return;
     _initialCamera = camera;
     if(_didLayoutSubviews) {
       self.camera = camera;
@@ -491,6 +493,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)willMove:(BOOL)gesture {
+    _isAnimating = YES;
   id event = @{@"isGesture": [NSNumber numberWithBool:gesture]};
   if (self.onRegionChangeStart) self.onRegionChangeStart(event);
 }
@@ -524,6 +527,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
   if (self.onChange) self.onChange(event);  // complete
+    _isAnimating = NO;
 }
 
 - (void)setMapPadding:(UIEdgeInsets)mapPadding {
@@ -784,7 +788,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     NSString *result = [config objectForKey:@"result"];
     NSString *filePath = [config objectForKey:@"filePath"];
 
-    
+
     // TODO: currently we are ignoring width, height, region
 
     UIGraphicsBeginImageContextWithOptions(self.frame.size, YES, 0.0f);
@@ -798,14 +802,14 @@ id regionAsJSON(MKCoordinateRegion region) {
     } else if([format isEqualToString:@"jpg"]) {
           data = UIImageJPEGRepresentation(image, quality.floatValue);
     }
-    
+
     if ([result isEqualToString:@"file"]) {
         [data writeToFile:filePath atomically:YES];
         callback(filePath);
     } else if ([result isEqualToString:@"base64"]) {
           callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
     }
-  
+
   UIGraphicsEndImageContext();
 }
 

package/ios/AirGoogleMaps/AIRGoogleMapMarker.h

@@ -53,6 +53,8 @@
 - (void)didDragMarker:(AIRGMSMarker *)marker;
 - (id)makeEventData;
 - (id)makeEventData:(NSString *)action;
+- (UIView *) iconView;
+- (void) didInsertInMap:(AIRGoogleMap *) map;
 @end
 
 #endif