react-native-maps 1.21.0-alpha.14 → 1.21.0-alpha.140

package/ios/AirMaps/AIRMapManager.m

@@ -111,13 +111,13 @@ RCT_EXPORT_VIEW_PROPERTY(legalLabelInsets, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(mapType, MKMapType)
 RCT_EXPORT_VIEW_PROPERTY(cameraZoomRange, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onRegionChangeStart, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onDoublePress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDoublePress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
@@ -125,7 +125,7 @@ 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(onUserLocationChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTDirectEventBlock)
 RCT_CUSTOM_VIEW_PROPERTY(initialRegion, MKCoordinateRegion, AIRMap)
 {
     if (json == nil) return;
@@ -935,6 +935,9 @@ static int kDragCenterContext;
 {
     // Don't send region did change events until map has
     // started rendering, as these won't represent the final location
+    if (animated && mapView.ignoreRegionChanges){
+        mapView.ignoreRegionChanges = false;
+    }
     if(mapView.hasStartedRendering){
         [self _regionChanged:mapView];
     }
@@ -1003,14 +1006,14 @@ static int kDragCenterContext;
 
 - (void)_emitRegionChangeEvent:(AIRMap *)mapView continuous:(BOOL)continuous
 {
-    if (!mapView.ignoreRegionChanges && mapView.onChange) {
+    if (!mapView.ignoreRegionChanges && mapView.onRegionChange) {
         MKCoordinateRegion region = mapView.region;
         if (!CLLocationCoordinate2DIsValid(region.center)) {
             return;
         }
 
 #define FLUSH_NAN(value) (isnan(value) ? 0 : value)
-        mapView.onChange(@{
+        mapView.onRegionChange(@{
                 @"continuous": @(continuous),
                 @"region": @{
                         @"latitude": @(FLUSH_NAN(region.center.latitude)),

package/ios/AirMaps/AIRMapMarker.h

@@ -55,6 +55,7 @@
 - (void)hideCalloutView;
 - (void)addTapGestureRecognizer;
 - (void)setUseLegacyPinView:(BOOL)value;
+- (void)animateToCoordinate:(CLLocationCoordinate2D)newCoordinate duration:(NSTimeInterval)duration;
 
 @end
 

package/ios/AirMaps/AIRMapMarker.m

@@ -14,6 +14,8 @@
 #import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
+#import <React/RCTImageLoader.h>
+#import <React/RCTBridge+Private.h>
 
 NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
@@ -28,6 +30,13 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     BOOL _calloutIsOpen;
     NSInteger _zIndexBeforeOpen;
     BOOL _useLegacyPinView;
+
+    CADisplayLink *_displayLink;
+    CLLocationCoordinate2D _startCoordinate;
+    CLLocationCoordinate2D _endCoordinate;
+    NSTimeInterval _animationStartTime;
+    NSTimeInterval _animationDuration;
+    BOOL _isAnimating;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -52,10 +61,10 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
     // Avoid crashes due to nan coords
     if (isnan(center.x) || isnan(center.y) ||
-            isnan(bounds.origin.x) || isnan(bounds.origin.y) ||
-            isnan(bounds.size.width) || isnan(bounds.size.height)) {
+        isnan(bounds.origin.x) || isnan(bounds.origin.y) ||
+        isnan(bounds.size.width) || isnan(bounds.size.height)) {
         RCTLogError(@"Invalid layout for (%@)%@. position: %@. bounds: %@",
-                self.reactTag, self, NSStringFromCGPoint(center), NSStringFromCGRect(bounds));
+                    self.reactTag, self, NSStringFromCGPoint(center), NSStringFromCGRect(bounds));
         return;
     }
 
@@ -68,6 +77,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.calloutView = (AIRMapCallout *)subview;
     } else {
         [super insertReactSubview:(UIView *)subview atIndex:atIndex];
+        [self addSubview:subview];
     }
 }
 - (void) setFrame:(CGRect)frame {
@@ -84,6 +94,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.calloutView = nil;
     } else {
         [super removeReactSubview:(UIView *)subview];
+        [(UIView *) subview removeFromSuperview];
     }
 }
 
@@ -104,7 +115,8 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
             _pinView.draggable = self.draggable;
             _pinView.layer.zPosition = self.zIndex;
-
+            _pinView.displayPriority = self.displayPriority;
+            _pinView.zPriority = self.zIndex;
             return _pinView;
         }
 
@@ -115,11 +127,14 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             [self addGestureRecognizerToView:_markerView];
             _markerView.annotation = self;
 
-        _markerView.draggable = self.draggable;
-        _markerView.layer.zPosition = self.zIndex;
-        _markerView.markerTintColor = self.pinColor;
-        _markerView.titleVisibility = self.titleVisibility ?: MKFeatureVisibilityHidden;
-        _markerView.subtitleVisibility = self.subtitleVisibility ?: MKFeatureVisibilityHidden;
+            _markerView.draggable = self.draggable;
+            _markerView.layer.zPosition = self.zIndex;
+            _markerView.markerTintColor = self.pinColor;
+            _markerView.titleVisibility = self.titleVisibility ?: MKFeatureVisibilityHidden;
+            _markerView.subtitleVisibility = self.subtitleVisibility ?: MKFeatureVisibilityHidden;
+            _markerView.displayPriority = self.displayPriority;
+            _markerView.zPriority = self.zIndex;
+
 
         }
         return _markerView ?: _pinView;
@@ -129,6 +144,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         // In either case, we want to return the AIRMapMarker since it is both an MKAnnotation and an
         // MKAnnotationView all at the same time.
         self.layer.zPosition = self.zIndex;
+        self.zPriority = self.zIndex;
         return self;
     }
 }
@@ -138,7 +154,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     // Set everything necessary on the calloutView before it becomes visible.
 
     // Apply the MKAnnotationView's desired calloutOffset (from the top-middle of the view)
-     if ([self shouldUsePinView] && !_hasSetCalloutOffset && _useLegacyPinView) {
+    if ([self shouldUsePinView] && !_hasSetCalloutOffset && _useLegacyPinView) {
         calloutView.calloutOffset = CGPointMake(-8,0);
     } else {
         calloutView.calloutOffset = self.calloutOffset;
@@ -183,12 +199,12 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     [self.map selectAnnotation:self animated:NO];
 
     id event = @{
-            @"action": @"marker-select",
-            @"id": self.identifier ?: @"unknown",
-            @"coordinate": @{
-                    @"latitude": @(self.coordinate.latitude),
-                    @"longitude": @(self.coordinate.longitude)
-            }
+        @"action": @"marker-select",
+        @"id": self.identifier ?: @"unknown",
+        @"coordinate": @{
+            @"latitude": @(self.coordinate.latitude),
+            @"longitude": @(self.coordinate.longitude)
+        }
     };
 
     if (self.map.onMarkerSelect) self.map.onMarkerSelect(event);
@@ -204,9 +220,9 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     // This is where we present our custom callout view... MapKit's built-in callout doesn't have the flexibility
     // we need, but a lot of work was done by Nick Farina to make this identical to MapKit's built-in.
     [self.map.calloutView presentCalloutFromRect:annotationView.bounds
-                                         inView:annotationView
-                              constrainedToView:self.map
-                                       animated:YES];
+                                          inView:annotationView
+                               constrainedToView:self.map
+                                        animated:YES];
 }
 
 #pragma mark - Tap Gesture & Events.
@@ -249,19 +265,19 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             }
 
             id event = @{
-                         @"action": calloutSubview ? @"callout-inside-press" : @"callout-press",
-                         @"id": marker.identifier ?: @"unknown",
-                         @"point": @{
-                                 @"x": @(touchPointReal.x),
-                                 @"y": @(touchPointReal.y),
-                                 },
-                         @"frame": @{
-                             @"x": @(bubbleFrame.origin.x),
-                             @"y": @(bubbleFrame.origin.y),
-                             @"width": @(bubbleFrame.size.width),
-                             @"height": @(bubbleFrame.size.height),
-                             }
-                         };
+                @"action": calloutSubview ? @"callout-inside-press" : @"callout-press",
+                @"id": marker.identifier ?: @"unknown",
+                @"point": @{
+                    @"x": @(touchPointReal.x),
+                    @"y": @(touchPointReal.y),
+                },
+                @"frame": @{
+                    @"x": @(bubbleFrame.origin.x),
+                    @"y": @(bubbleFrame.origin.y),
+                    @"width": @(bubbleFrame.size.width),
+                    @"height": @(bubbleFrame.size.height),
+                }
+            };
 
             if (calloutSubview) calloutSubview.onPress(event);
             if (marker.onCalloutPress) marker.onCalloutPress(event);
@@ -274,17 +290,17 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     // the actual marker got clicked
     CGPoint touchPointReal = [recognizer locationInView:self.calloutView];
     id event = @{
-                 @"action": @"marker-press",
-                 @"id": marker.identifier ?: @"unknown",
-                 @"coordinate": @{
-                         @"latitude": @(marker.coordinate.latitude),
-                         @"longitude": @(marker.coordinate.longitude)
-                         },
-                 @"position": @{
-                         @"x": @(touchPointReal.x),
-                         @"y": @(touchPointReal.y),
-                         }
-                 };
+        @"action": @"marker-press",
+        @"id": marker.identifier ?: @"unknown",
+        @"coordinate": @{
+            @"latitude": @(marker.coordinate.latitude),
+            @"longitude": @(marker.coordinate.longitude)
+        },
+        @"position": @{
+            @"x": @(touchPointReal.x),
+            @"y": @(touchPointReal.y),
+        }
+    };
 
     if (marker.onPress) marker.onPress(event);
     if (marker.map.onMarkerPress) marker.map.onMarkerPress(event);
@@ -303,12 +319,12 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     [self.map deselectAnnotation:self animated:NO];
 
     id event = @{
-            @"action": @"marker-deselect",
-            @"id": self.identifier ?: @"unknown",
-            @"coordinate": @{
-                    @"latitude": @(self.coordinate.latitude),
-                    @"longitude": @(self.coordinate.longitude)
-            }
+        @"action": @"marker-deselect",
+        @"id": self.identifier ?: @"unknown",
+        @"coordinate": @{
+            @"latitude": @(self.coordinate.latitude),
+            @"longitude": @(self.coordinate.longitude)
+        }
     };
 
     if (self.map.onMarkerDeselect) self.map.onMarkerDeselect(event);
@@ -333,7 +349,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
 - (void)setOpacity:(double)opacity
 {
-  [self setAlpha:opacity];
+    [self setAlpha:opacity];
 }
 
 - (void)setImageSrc:(NSString *)imageSrc
@@ -344,22 +360,25 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         _reloadImageCancellationBlock();
         _reloadImageCancellationBlock = nil;
     }
-    _reloadImageCancellationBlock = [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
-                                                                            size:self.bounds.size
-                                                                           scale:RCTScreenScale()
-                                                                         clipped:YES
-                                                                      resizeMode:RCTResizeModeCenter
-                                                                   progressBlock:nil
-                                                                partialLoadBlock:nil
-                                                                 completionBlock:^(NSError *error, UIImage *image) {
-                                                                     if (error) {
-                                                                         // TODO(lmr): do something with the error?
-                                                                         NSLog(@"%@", error);
-                                                                     }
-                                                                     dispatch_async(dispatch_get_main_queue(), ^{
-                                                                         self.image = image;
-                                                                     });
-                                                                 }];
+    __weak __typeof(self) weakSelf = self;
+
+    _reloadImageCancellationBlock = [[[RCTBridge currentBridge] moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
+                                                                                                                 size:self.bounds.size
+                                                                                                                scale:RCTScreenScale()
+                                                                                                              clipped:YES
+                                                                                                           resizeMode:RCTResizeModeCenter
+                                                                                                        progressBlock:nil
+                                                                                                     partialLoadBlock:nil
+                                                                                                      completionBlock:^(NSError *error, UIImage *image) {
+        if (error) {
+            // TODO(lmr): do something with the error?
+            NSLog(@"failed to load image: %@", error);
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+            __strong __typeof(weakSelf) strongSelf = weakSelf;
+            strongSelf.image = image;
+        });
+    }];
 }
 
 - (void)setPinColor:(UIColor *)pinColor
@@ -381,7 +400,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 }
 
 - (BOOL)isSelected {
-  return _isPreselected || [super isSelected];
+    return _isPreselected || [super isSelected];
 }
 
 - (void)dealloc {
@@ -393,9 +412,65 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.layer.zPosition = _zIndex;
     }
 }
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    CGRect reactFrame = self.frame;
+
+    UIView *firstSubView = self.subviews.firstObject;
+    if (firstSubView && (CGRectGetWidth(firstSubView.frame) > CGRectGetWidth(reactFrame) ||
+                         CGRectGetHeight(firstSubView.frame) > CGRectGetHeight(reactFrame))) {
+        reactFrame = firstSubView.frame;
+    }
+    [self reactSetFrame:reactFrame];
+}
 
 - (void)setUseLegacyPinView:(BOOL)value {
     _useLegacyPinView = value;
 }
 
+- (void)animateToCoordinate:(CLLocationCoordinate2D)newCoordinate duration:(NSTimeInterval)duration {
+    if (_isAnimating) {
+        NSLog(@"Animation already in progress. Rejecting new animation request.");
+        return;
+    }
+
+    // Mark as animating
+    _isAnimating = YES;
+
+    // Store animation parameters
+    _startCoordinate = self.coordinate;
+    _endCoordinate = newCoordinate;
+    _animationDuration = duration;
+    _animationStartTime = [NSDate timeIntervalSinceReferenceDate];
+
+    // Start a CADisplayLink
+    if (_displayLink) {
+        [_displayLink invalidate];
+    }
+    _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updatePosition)];
+    [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+}
+
+- (void)updatePosition {
+    NSTimeInterval elapsed = [NSDate timeIntervalSinceReferenceDate] - _animationStartTime;
+    CGFloat progress = MIN(elapsed / _animationDuration, 1.0);
+
+    // Interpolate coordinates
+    CLLocationDegrees currentLatitude = _startCoordinate.latitude + progress * (_endCoordinate.latitude - _startCoordinate.latitude);
+    CLLocationDegrees currentLongitude = _startCoordinate.longitude + progress * (_endCoordinate.longitude - _startCoordinate.longitude);
+
+    // Update annotation's coordinate
+    CLLocationCoordinate2D currentCoordinate = CLLocationCoordinate2DMake(currentLatitude, currentLongitude);
+    [self setValue:[NSValue valueWithMKCoordinate:currentCoordinate] forKey:@"coordinate"];
+
+    // Stop the animation when complete
+    if (progress == 1.0) {
+        [_displayLink invalidate];
+        _displayLink = nil;
+        _isAnimating = NO; // Reset the animation state
+    }
+}
+
 @end

package/ios/AirMaps/Callout/SMCalloutView.m

@@ -855,4 +855,4 @@ static UIImage *blackArrowImage = nil, *whiteArrowImage = nil, *grayArrowImage =
 - (CGFloat)frameBottom { return self.frame.origin.y + self.frame.size.height; }
 - (void)setFrameBottom:(CGFloat)bottom { self.frame = (CGRect){ .origin=self.frame.origin, .size.width=self.frame.size.width, .size.height=fmaxf(bottom-self.frame.origin.y,0) }; }
 
-@end
+@end

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.h

@@ -0,0 +1,28 @@
+//
+//  RNMapsGoogleMapView.h
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
+
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMapsGoogleMapView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm

@@ -0,0 +1,68 @@
+//
+//  RNMapsGoogleMapView.mm
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <react-native-maps-generated/ComponentDescriptors.h>
+#import <react-native-maps-generated/EventEmitters.h>
+#import <react-native-maps-generated/Props.h>
+#import <react-native-maps-generated/RCTComponentViewHelpers.h>
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "PlaceHolderGoogleMapView.h"
+
+using namespace facebook::react;
+
+
+@implementation RNMapsGoogleMapView
+
+
+#pragma mark - JS Commands
+- (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration{
+}
+- (void)setCamera:(NSString *)cameraJSON{
+}
+
+- (void)animateCamera:(NSString *)cameraJSON duration:(NSInteger)duration{
+}
+
+- (void)fitToElements:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+}
+
+- (void)fitToSuppliedMarkers:(NSString *)markersJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+}
+- (void)fitToCoordinates:(NSString *)coordinatesJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+
+}
+- (void) setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex
+{
+
+}
+
+#pragma mark - Native commands
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
+{
+}
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+    return concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDescriptor>();
+}
+
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGoogleMapViewCls(void)
+{
+    return RNMapsGoogleMapView.class;
+}
+
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.h

@@ -0,0 +1,25 @@
+//
+//  RNMapsGoogleMapView.h
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+@interface RNMapsGooglePolygonView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm

@@ -0,0 +1,43 @@
+//
+//  RNMapsGoogleMapView.mm
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <react-native-maps-generated/ComponentDescriptors.h>
+#import <react-native-maps-generated/EventEmitters.h>
+#import <react-native-maps-generated/Props.h>
+#import <react-native-maps-generated/RCTComponentViewHelpers.h>
+
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "PlaceHolderPolygonView.h"
+
+using namespace facebook::react;
+
+
+@interface RNMapsGooglePolygonView () <RCTRNMapsGooglePolygonViewProtocol>
+@end
+
+@implementation RNMapsGooglePolygonView
+
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>();
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGooglePolygonCls(void)
+{
+    return RNMapsGooglePolygonView.class;
+}
+
+#endif

package/ios/AirMaps/RNMapsAirModule.h

@@ -3,7 +3,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <RNMapsSpecs/RNMapsSpecs.h>
+#import <react-native-maps-generated/RNMapsSpecs.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

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];
 
 }
@@ -60,12 +60,13 @@
     } reject:reject];
 }
 - (void)takeSnapshot:(double)tag
-              config:(NSDictionary *)config
+              config:(NSString *)configStr
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
+    NSDictionary* config = [RCTConvert dictonaryFromString:configStr];
     [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
-        [mapView takeSnapshotWithConfig:config callback:resolve];
+        [mapView takeSnapshotWithConfig:config success:resolve error:reject];
     } reject:reject];
 }
 

package/ios/AirMaps/RNMapsDefines.h

@@ -0,0 +1 @@
+#define HAVE_GOOGLE_MAPS 1

package/ios/AirMaps/RNMapsMapView.h

@@ -9,7 +9,7 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
-#import "RNMapsHostVewDelegate.h"
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
 
 @class AIRMap;