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

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.h

@@ -27,18 +27,17 @@
 @property (nonatomic, assign) NSString *customMapStyleString;
 @property (nonatomic, assign) UIEdgeInsets mapPadding;
 @property (nonatomic, assign) NSString *paddingAdjustmentBehaviorString;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapLoaded;
-@property (nonatomic, copy) RCTBubblingEventBlock onKmlReady;
+@property (nonatomic, copy) RCTDirectEventBlock onMapReady;
+@property (nonatomic, copy) RCTDirectEventBlock onMapLoaded;
+@property (nonatomic, copy) RCTDirectEventBlock onKmlReady;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
-@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerSelect;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerDeselect;
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onPoiClick;
+@property (nonatomic, copy) RCTDirectEventBlock onPanDrag;
+@property (nonatomic, copy) RCTDirectEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerPress;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerSelect;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerDeselect;
+@property (nonatomic, copy) RCTDirectEventBlock onPoiClick;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeStart;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeComplete;

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -69,6 +69,7 @@ id regionAsJSON(MKCoordinateRegion region) {
   BOOL _didPrepareMap;
   BOOL _didCallOnMapReady;
   BOOL _zoomTapEnabled;
+  BOOL _isAnimating;
   NSString* _googleMapId;
 }
 
@@ -239,12 +240,17 @@ 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 ([NSStringFromClass([subview class]) isEqualToString:@"RNMapsGooglePolygonView"]){
+//      RNMapsGooglePolygonView *polygon = (RNMapsGooglePolygonView*)subview;
+//      [polygon didInsertInMap:self];
+      [self.polygons addObject:subview];
   } else if ([subview isKindOfClass:[AIRGoogleMapPolyline class]]) {
     AIRGoogleMapPolyline *polyline = (AIRGoogleMapPolyline*)subview;
     polyline.polyline.map = self;
@@ -289,7 +295,9 @@ id regionAsJSON(MKCoordinateRegion region) {
     AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
     marker.realMarker.map = nil;
     [self.markers removeObject:marker];
-  } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
+  } else if ([NSStringFromClass([subview class]) isEqualToString:@"RNMapsGooglePolygonView"]) {
+      [self.polygons removeObject:subview];
+   } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
     AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
     polygon.polygon.map = nil;
     [self.polygons removeObject:polygon];
@@ -354,6 +362,19 @@ id regionAsJSON(MKCoordinateRegion region) {
     ];
 }
 
+- (NSDictionary *) getCameraDic {
+    GMSCameraPosition *camera = [self camera];
+    return @{
+        @"center": @{
+                @"latitude": @(camera.target.latitude),
+                @"longitude": @(camera.target.longitude),
+                },
+        @"pitch": @(camera.viewingAngle),
+        @"heading": @(camera.bearing),
+        @"zoom": @(camera.zoom),
+    };
+}
+
 - (void)layoutSubviews {
   [super layoutSubviews];
   if(_didLayoutSubviews) return;
@@ -390,7 +411,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 +431,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)setCameraProp:(GMSCameraPosition*)camera {
+    if (_isAnimating || !CLLocationCoordinate2DIsValid([camera target])) return;
     _initialCamera = camera;
     if(_didLayoutSubviews) {
       self.camera = camera;
@@ -491,6 +513,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)willMove:(BOOL)gesture {
+    _isAnimating = YES;
   id event = @{@"isGesture": [NSNumber numberWithBool:gesture]};
   if (self.onRegionChangeStart) self.onRegionChangeStart(event);
 }
@@ -501,7 +524,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
 
-  if (self.onChange) self.onChange(event);
+  if (self.onRegionChange) self.onRegionChange(event);
 }
 
 - (void)didTapPOIWithPlaceID:(NSString *)placeID
@@ -523,7 +546,8 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"region": regionAsJSON([AIRGoogleMap makeGMSCameraPositionFromMap:self andGMSCameraPosition:position]),
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
-  if (self.onChange) self.onChange(event);  // complete
+    if (self.onRegionChangeComplete) self.onRegionChangeComplete(event);  // complete
+    _isAnimating = NO;
 }
 
 - (void)setMapPadding:(UIEdgeInsets)mapPadding {
@@ -772,8 +796,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     };
 }
 
--(void) takeSnapshotWithConfig:(NSDictionary *)config callback:(RCTPromiseResolveBlock) callback
-{
+-(void) takeSnapshotWithConfig:(NSDictionary *)config success:(RCTPromiseResolveBlock)success error:(RCTPromiseRejectBlock)error {
     /* unused
     NSNumber *width = [config objectForKey:@"width"];
     NSNumber *height = [config objectForKey:@"height"];
@@ -782,9 +805,10 @@ id regionAsJSON(MKCoordinateRegion region) {
 
     NSString *format = [config objectForKey:@"format"];
     NSString *result = [config objectForKey:@"result"];
-    NSString *filePath = [config objectForKey:@"filePath"];
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
+    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
 
-    
     // TODO: currently we are ignoring width, height, region
 
     UIGraphicsBeginImageContextWithOptions(self.frame.size, YES, 0.0f);
@@ -798,14 +822,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);
+        success(filePath);
     } else if ([result isEqualToString:@"base64"]) {
-          callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
+        success([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
     }
-  
+
   UIGraphicsEndImageContext();
 }
 
@@ -1044,7 +1068,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 + (NSString *)GetIconUrl:(GMUPlacemark *) marker parser:(GMUKMLParser *) parser {
-#ifdef HAVE_GOOGLE_MAPS_UTILS
+#if HAVE_GOOGLE_MAPS_UTILS
   if (marker.style.styleID != nil) {
     for (GMUStyle *style in parser.styles) {
       if (style.styleID == marker.style.styleID) {
@@ -1063,8 +1087,53 @@ id regionAsJSON(MKCoordinateRegion region) {
   return _kmlSrc;
 }
 
+- (void) setKMLData:(NSData *) urlData {
+    GMUKMLParser *parser = [[GMUKMLParser alloc] initWithData:urlData];
+    [parser parse];
+
+    NSUInteger index = 0;
+    NSMutableArray *markers = [[NSMutableArray alloc]init];
+
+    for (GMUPlacemark *place in parser.placemarks) {
+
+      CLLocationCoordinate2D location =((GMUPoint *) place.geometry).coordinate;
+
+      AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)[[AIRGoogleMapMarkerManager alloc] view];
+      if (!marker.bridge) {
+        marker.bridge = _bridge;
+      }
+      marker.identifier = place.title;
+      marker.coordinate = location;
+      marker.title = place.title;
+      marker.subtitle = place.snippet;
+      marker.pinColor = place.style.fillColor;
+      marker.imageSrc = [AIRGoogleMap GetIconUrl:place parser:parser];
+      marker.layer.backgroundColor = [UIColor clearColor].CGColor;
+      marker.layer.position = CGPointZero;
+
+      [self insertReactSubview:(UIView *) marker atIndex:index];
+
+      [markers addObject:@{@"id": marker.identifier,
+                           @"title": marker.title,
+                           @"description": marker.subtitle,
+                           @"coordinate": @{
+                               @"latitude": @(location.latitude),
+                               @"longitude": @(location.longitude)
+                               }
+                           }];
+
+      index++;
+    }
+
+    id event = @{@"markers": markers};
+    if (self.onKmlReady) self.onKmlReady(event);
+  #else
+      REQUIRES_GOOGLE_MAPS_UTILS();
+  #endif
+}
+
 - (void)setKmlSrc:(NSString *)kmlUrl {
-#ifdef HAVE_GOOGLE_MAPS_UTILS
+#if HAVE_GOOGLE_MAPS_UTILS
 
   _kmlSrc = kmlUrl;
 
@@ -1072,53 +1141,28 @@ id regionAsJSON(MKCoordinateRegion region) {
   NSData *urlData = nil;
 
   if ([url isFileURL]) {
-    urlData = [NSData dataWithContentsOfURL:url];
+      [self setKMLData:[NSData dataWithContentsOfURL:url]];
   } else {
-    urlData = [[NSFileManager defaultManager] contentsAtPath:kmlUrl];
+      __weak AIRGoogleMap *weakSelf = self;
+
+      NSURLSession *session = [NSURLSession sharedSession];
+      NSURLSessionDataTask *dataTask = [session dataTaskWithURL:url
+                                              completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+          if (error) {
+              NSLog(@"Error fetching data: %@", error.localizedDescription);
+              return;
+          } else {
+              dispatch_async(dispatch_get_main_queue(), ^{
+                  AIRGoogleMap *strongSelf = weakSelf;
+                  [strongSelf setKMLData:data];
+              });
+
+          }
+      }];
+      [dataTask resume];
   }
 
-  GMUKMLParser *parser = [[GMUKMLParser alloc] initWithData:urlData];
-  [parser parse];
 
-  NSUInteger index = 0;
-  NSMutableArray *markers = [[NSMutableArray alloc]init];
-
-  for (GMUPlacemark *place in parser.placemarks) {
-
-    CLLocationCoordinate2D location =((GMUPoint *) place.geometry).coordinate;
-
-    AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)[[AIRGoogleMapMarkerManager alloc] view];
-    if (!marker.bridge) {
-      marker.bridge = _bridge;
-    }
-    marker.identifier = place.title;
-    marker.coordinate = location;
-    marker.title = place.title;
-    marker.subtitle = place.snippet;
-    marker.pinColor = place.style.fillColor;
-    marker.imageSrc = [AIRGoogleMap GetIconUrl:place parser:parser];
-    marker.layer.backgroundColor = [UIColor clearColor].CGColor;
-    marker.layer.position = CGPointZero;
-
-    [self insertReactSubview:(UIView *) marker atIndex:index];
-
-    [markers addObject:@{@"id": marker.identifier,
-                         @"title": marker.title,
-                         @"description": marker.subtitle,
-                         @"coordinate": @{
-                             @"latitude": @(location.latitude),
-                             @"longitude": @(location.longitude)
-                             }
-                         }];
-
-    index++;
-  }
-
-  id event = @{@"markers": markers};
-  if (self.onKmlReady) self.onKmlReady(event);
-#else
-    REQUIRES_GOOGLE_MAPS_UTILS();
-#endif
 }
 
 
@@ -1128,11 +1172,9 @@ id regionAsJSON(MKCoordinateRegion region) {
             return;
         }
         self.onIndoorBuildingFocused(@{
-            @"IndoorBuilding": @{
-                    @"activeLevelIndex": @0,
-                    @"underground": @false,
-                    @"levels": [[NSMutableArray alloc]init]
-            }
+            @"activeLevelIndex": @0,
+            @"underground": @false,
+            @"levels": [[NSMutableArray alloc]init]
         });
     }
     NSInteger i = 0;
@@ -1149,11 +1191,9 @@ id regionAsJSON(MKCoordinateRegion region) {
         return;
     }
     self.onIndoorBuildingFocused(@{
-        @"IndoorBuilding": @{
-                @"activeLevelIndex": @(building.defaultLevelIndex),
-                @"underground": @(building.underground),
-                @"levels": arrayLevels
-        }
+            @"activeLevelIndex": @(building.defaultLevelIndex),
+            @"underground": @(building.underground),
+            @"levels": arrayLevels
     });
 }
 
@@ -1169,11 +1209,9 @@ id regionAsJSON(MKCoordinateRegion region) {
         i++;
     }
     self.onIndoorLevelActivated(@{
-        @"IndoorLevel": @{
-                @"activeLevelIndex": @(i),
-                @"name": level.name,
-                @"shortName": level.shortName
-        }
+            @"activeLevelIndex": @(i),
+            @"name": level.name,
+            @"shortName": level.shortName
     });
 }
 // do nothing, passed as options on initialization

package/ios/AirGoogleMaps/AIRGoogleMapCircle.m

@@ -25,20 +25,32 @@
   }
   return self;
 }
+- (void) prepare
+{
+    if(_didMoveToWindow) return;
+    _didMoveToWindow = true;
+    if(_fillColor) {
+      _circle.fillColor = _fillColor;
+    }
+    if(_strokeColor) {
+      _circle.strokeColor = _strokeColor;
+    }
+    if(_strokeWidth) {
+      _circle.strokeWidth = _strokeWidth;
+    }
+    if (_zIndex) {
+        _circle.zIndex = _zIndex;
+    }
+}
+- (void) didMoveToSuperview
+{
+    [super didMoveToSuperview];
+    [self prepare];
+}
 
 - (void)didMoveToWindow {
   [super didMoveToWindow];
-  if(_didMoveToWindow) return;
-  _didMoveToWindow = true;
-  if(_fillColor) {
-    _circle.fillColor = _fillColor;
-  }
-  if(_strokeColor) {
-    _circle.strokeColor = _strokeColor;
-  }
-  if(_strokeWidth) {
-    _circle.strokeWidth = _strokeWidth;
-  }
+    [self prepare];
 }
 
 - (void)setRadius:(double)radius

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -97,14 +97,13 @@ RCT_EXPORT_VIEW_PROPERTY(showsIndoorLevelPicker, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(customMapStyleString, NSString)
 RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
 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(onMapReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapLoaded, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onKmlReady, RCTDirectEventBlock)
 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(onPanDrag, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
@@ -266,9 +265,11 @@ RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
     } else {
         AIRGoogleMap *mapView = (AIRGoogleMap *)view;
         NSMutableDictionary* config = [NSMutableDictionary new];
-        
-        [mapView takeSnapshotWithConfig:config callback:callback];
-        
+
+        [mapView takeSnapshotWithConfig:config success:callback error:^(NSString *code, NSString *message, NSError *error) {
+            callback(@[error]);
+        }];
+
         [config setObject:width forKey:@"width"];
         [config setObject:height forKey:@"height"];
         [config setObject:format forKey:@"format"];

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