react-native-maps 1.21.0-alpha.6 → 1.21.0-alpha.7

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -13,7 +13,8 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import "AIRGMSMarker.h"
-#import "RCTConvert+AirMap.h"
+
+#import "AIRGoogleMapCoordinate.h"
 
 @interface AIRGoogleMap : GMSMapView
 
@@ -84,6 +85,10 @@
 
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
 - (instancetype)initWithMapId:(NSString *)mapId initialCamera:(GMSCameraPosition*) camera backgroundColor:(UIColor *) backgroundColor andZoomTapEnabled:(BOOL)zoomTapEnabled;
+-(void) fitToSuppliedMarkers:(NSArray*) markers withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated;
+-(void) fitToCoordinates:(NSArray<AIRGoogleMapCoordinate *> *) coordinates withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated;
+-(void) fitToElementsWithEdgePadding:(nonnull NSDictionary *)edgePadding
+             animated:(BOOL)animated;
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -17,11 +17,12 @@
 #import "AIRGoogleMapUrlTile.h"
 #import "AIRGoogleMapWMSTile.h"
 #import "AIRGoogleMapOverlay.h"
+#import "AIRGoogleMapCoordinate.h"
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import <React/UIView+React.h>
 #import <React/RCTBridge.h>
-#import "RCTConvert+AirMap.h"
+#import <React/RCTConvert.h>
 #import <objc/runtime.h>
 
 #ifdef HAVE_GOOGLE_MAPS_UTILS
@@ -86,7 +87,7 @@ id regionAsJSON(MKCoordinateRegion region) {
         [options setCamera:camera];
     }
     self = [super initWithOptions:options];
- 
+
     if (self) {
     _reactSubviews = [NSMutableArray new];
     _markers = [NSMutableArray array];
@@ -145,6 +146,88 @@ id regionAsJSON(MKCoordinateRegion region) {
            };
 }
 
+-(void) fitToCoordinates:(NSArray<AIRGoogleMapCoordinate *> *) coordinates withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated
+{
+    CLLocationCoordinate2D myLocation = coordinates.firstObject.coordinate;
+         GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
+
+         for (AIRGoogleMapCoordinate *coordinate in coordinates)
+           bounds = [bounds includingCoordinate:coordinate.coordinate];
+
+         // Set Map viewport
+         CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+         CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+         CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+         CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+         GMSCameraUpdate *cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
+
+         if (animated) {
+           [self animateWithCameraUpdate: cameraUpdate];
+         } else {
+           [self moveCamera: cameraUpdate];
+         }
+}
+
+-(void) fitToElementsWithEdgePadding:(nonnull NSDictionary *)edgePadding
+             animated:(BOOL)animated
+{
+    CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(self.markers.firstObject)).realMarker.position;
+    GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
+
+    for (AIRGoogleMapMarker *marker in self.markers)
+      bounds = [bounds includingCoordinate:marker.realMarker.position];
+
+      GMSCameraUpdate* cameraUpdate;
+
+      if ([edgePadding count] != 0) {
+          // Set Map viewport
+          CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+          CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+          CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+          CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+          cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
+      } else {
+          cameraUpdate = [GMSCameraUpdate fitBounds:bounds withPadding:55.0f];
+      }
+    if (animated) {
+      [self animateWithCameraUpdate: cameraUpdate];
+    } else {
+      [self moveCamera: cameraUpdate];
+    }
+}
+
+- (void) fitToSuppliedMarkers:(NSArray*) markers withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated
+{
+    NSPredicate *filterMarkers = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
+      AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)evaluatedObject;
+      return [marker isKindOfClass:[AIRGoogleMapMarker class]] && [markers containsObject:marker.identifier];
+    }];
+
+    NSArray *filteredMarkers = [self.markers filteredArrayUsingPredicate:filterMarkers];
+
+    CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(filteredMarkers.firstObject)).realMarker.position;
+    GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
+
+    for (AIRGoogleMapMarker *marker in filteredMarkers)
+      bounds = [bounds includingCoordinate:marker.realMarker.position];
+
+    // Set Map viewport
+    CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+    CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+    CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+    CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+    GMSCameraUpdate* cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
+    if (animated) {
+      [self animateWithCameraUpdate:cameraUpdate
+       ];
+    } else {
+      [self moveCamera: cameraUpdate];
+    }
+}
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
 - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
@@ -579,11 +662,11 @@ id regionAsJSON(MKCoordinateRegion region) {
   return self.settings.myLocationButton;
 }
 
-- (void)setMinZoomLevel:(CGFloat)minZoomLevel {
+- (void)setMinZoom:(CGFloat)minZoomLevel {
   [self setMinZoom:minZoomLevel maxZoom:self.maxZoom ];
 }
 
-- (void)setMaxZoomLevel:(CGFloat)maxZoomLevel {
+- (void)setMaxZoom:(CGFloat)maxZoomLevel {
   [self setMinZoom:self.minZoom maxZoom:maxZoomLevel ];
 }
 
@@ -610,7 +693,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     AIRGMSMarker *airMarker = (AIRGMSMarker *) self.selectedMarker;
     AIRGoogleMapMarker *fakeAirMarker = (AIRGoogleMapMarker *) airMarker.fakeMarker;
     AIRGoogleMapMarker *fakeSelectedMarker = (AIRGoogleMapMarker *) selectedMarker.fakeMarker;
-    
+
     if (airMarker && airMarker.onDeselect) {
         airMarker.onDeselect([fakeAirMarker makeEventData:@"marker-deselect"]);
     }
@@ -618,7 +701,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     if (airMarker && self.onMarkerDeselect) {
         self.onMarkerDeselect([fakeAirMarker makeEventData:@"marker-deselect"]);
     }
-    
+
     if (selectedMarker && selectedMarker.onSelect) {
         selectedMarker.onSelect([fakeSelectedMarker makeEventData:@"marker-select"]);
     }
@@ -1034,7 +1117,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 // do nothing, passed as options on initialization
 - (void)setLoadingBackgroundColor:(UIColor *)loadingBackgroundColor {
-    
+
 }
 
 

package/ios/AirGoogleMaps/AIRGoogleMapCircle.h

@@ -7,7 +7,6 @@
 #ifdef HAVE_GOOGLE_MAPS
 
 #import <GoogleMaps/GoogleMaps.h>
-#import "AIRMapCoordinate.h"
 
 @interface AIRGoogleMapCircle : UIView
 

package/ios/AirGoogleMaps/AIRGoogleMapCoordinate.h

@@ -0,0 +1,13 @@
+//
+// Created by Leland Richardson on 12/27/15.
+// Copyright (c) 2015 Facebook. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <MapKit/MapKit.h>
+
+@interface AIRGoogleMapCoordinate : NSObject
+
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
+
+@end

package/ios/AirGoogleMaps/AIRGoogleMapCoordinate.m

@@ -0,0 +1,10 @@
+//
+// Created by Leland Richardson on 12/27/15.
+// Copyright (c) 2015 Facebook. All rights reserved.
+//
+
+#import "AIRGoogleMapCoordinate.h"
+
+
+@implementation AIRGoogleMapCoordinate
+@end

package/ios/AirGoogleMaps/AIRGoogleMapManager.h

@@ -9,8 +9,15 @@
 
 #import <React/RCTViewManager.h>
 
+@class GMSCameraPosition;
+
 @interface AIRGoogleMapManager : RCTViewManager
 
+@property (nonatomic, strong) NSString* googleMapId;
+@property (nonatomic) BOOL zoomTapEnabled;
+@property (nonatomic, strong) UIColor* backgroundColor;
+@property (nonatomic, strong) GMSCameraPosition* camera;
+
 @property (nonatomic, strong) NSDictionary *initialProps;
 
 @property (nonatomic) BOOL isGesture;

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -19,14 +19,9 @@
 #import <React/UIView+React.h>
 #import "RCTConvert+GMSMapViewType.h"
 #import "AIRGoogleMap.h"
-#import "AIRMapMarker.h"
-#import "AIRMapPolyline.h"
-#import "AIRMapPolygon.h"
-#import "AIRMapCircle.h"
-#import "SMCalloutView.h"
 #import "AIRGoogleMapMarker.h"
-#import "RCTConvert+AirMap.h"
-
+#import "AIRGoogleMapCoordinate.h"
+#import "RCTConvert+GMSMapViewType.h"
 #import <MapKit/MapKit.h>
 #import <QuartzCore/QuartzCore.h>
 
@@ -45,26 +40,22 @@ RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {
-  NSString* googleMapId  = nil;
-  BOOL zoomTapEnabled = YES;
-  UIColor* backgroundColor = nil;
-  GMSCameraPosition* camera = nil;
 
   if (self.initialProps){
       if (self.initialProps[@"googleMapId"]){
-          googleMapId  = self.initialProps[@"googleMapId"];
+          _googleMapId  = self.initialProps[@"googleMapId"];
       }
       if (self.initialProps[@"zoomTapEnabled"]){
-          zoomTapEnabled = self.initialProps[@"zoomTapEnabled"];
+          _zoomTapEnabled = self.initialProps[@"zoomTapEnabled"];
       }
       if (self.initialProps[@"loadingBackgroundColor"]){
-          backgroundColor = [RCTConvert UIColor:self.initialProps[@"loadingBackgroundColor"]];
+          _backgroundColor = [RCTConvert UIColor:self.initialProps[@"loadingBackgroundColor"]];
       }
       if (self.initialProps[@"initialCamera"]){
-          camera = [RCTConvert GMSCameraPositionWithDefaults:self.initialProps[@"initialCamera"] existingCamera:nil];
+          _camera = [RCTConvert GMSCameraPositionWithDefaults:self.initialProps[@"initialCamera"] existingCamera:nil];
       }
   }
-  AIRGoogleMap *map = [[AIRGoogleMap alloc] initWithMapId:googleMapId initialCamera:camera backgroundColor:backgroundColor andZoomTapEnabled:zoomTapEnabled];
+  AIRGoogleMap *map = [[AIRGoogleMap alloc] initWithMapId:self.googleMapId initialCamera:self.camera backgroundColor:self.backgroundColor andZoomTapEnabled:self.zoomTapEnabled];
   map.bridge = self.bridge;
   map.delegate = self;
   map.isAccessibilityElement = NO;
@@ -217,32 +208,8 @@ RCT_EXPORT_METHOD(fitToElements:(nonnull NSNumber *)reactTag
     if (![view isKindOfClass:[AIRGoogleMap class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(mapView.markers.firstObject)).realMarker.position;
-      GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
-
-      for (AIRGoogleMapMarker *marker in mapView.markers)
-        bounds = [bounds includingCoordinate:marker.realMarker.position];
-
-        GMSCameraUpdate* cameraUpdate;
-
-        if ([edgePadding count] != 0) {
-            // Set Map viewport
-            CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
-            CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
-            CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
-            CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
-
-            cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
-        } else {
-            cameraUpdate = [GMSCameraUpdate fitBounds:bounds withPadding:55.0f];
-        }
-      if (animated) {
-        [mapView animateWithCameraUpdate: cameraUpdate];
-      } else {
-        [mapView moveCamera: cameraUpdate];
-      }
+        AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+        [mapView fitToElementsWithEdgePadding:edgePadding animated:animated];
     }
   }];
 }
@@ -257,40 +224,14 @@ RCT_EXPORT_METHOD(fitToSuppliedMarkers:(nonnull NSNumber *)reactTag
     if (![view isKindOfClass:[AIRGoogleMap class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      NSPredicate *filterMarkers = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
-        AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)evaluatedObject;
-        return [marker isKindOfClass:[AIRGoogleMapMarker class]] && [markers containsObject:marker.identifier];
-      }];
-
-      NSArray *filteredMarkers = [mapView.markers filteredArrayUsingPredicate:filterMarkers];
-
-      CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(filteredMarkers.firstObject)).realMarker.position;
-      GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
-
-      for (AIRGoogleMapMarker *marker in filteredMarkers)
-        bounds = [bounds includingCoordinate:marker.realMarker.position];
-
-      // Set Map viewport
-      CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
-      CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
-      CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
-      CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
-
-      GMSCameraUpdate* cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
-      if (animated) {
-        [mapView animateWithCameraUpdate:cameraUpdate
-         ];
-      } else {
-        [mapView moveCamera: cameraUpdate];
-      }
+        AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+        [mapView fitToSuppliedMarkers:markers withEdgePadding:edgePadding animated:animated];
     }
   }];
 }
 
 RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
-                  coordinates:(nonnull NSArray<AIRMapCoordinate *> *)coordinates
+                  coordinates:(nonnull NSArray<AIRGoogleMapCoordinate *> *)coordinates
                   edgePadding:(nonnull NSDictionary *)edgePadding
                   animated:(BOOL)animated)
 {
@@ -300,26 +241,7 @@ RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
       RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
     } else {
       AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      CLLocationCoordinate2D myLocation = coordinates.firstObject.coordinate;
-      GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
-
-      for (AIRMapCoordinate *coordinate in coordinates)
-        bounds = [bounds includingCoordinate:coordinate.coordinate];
-
-      // Set Map viewport
-      CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
-      CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
-      CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
-      CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
-
-      GMSCameraUpdate *cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
-
-      if (animated) {
-        [mapView animateWithCameraUpdate: cameraUpdate];
-      } else {
-        [mapView moveCamera: cameraUpdate];
-      }
+        [mapView fitToCoordinates:coordinates withEdgePadding:edgePadding animated:animated];
     }
   }];
 }

package/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m

@@ -11,7 +11,6 @@
 #import "AIRGoogleMapMarker.h"
 #import <MapKit/MapKit.h>
 #import <React/RCTUIManager.h>
-#import "RCTConvert+AirMap.h"
 
 @implementation AIRGoogleMapMarkerManager
 

package/ios/AirGoogleMaps/AIRGoogleMapOverlay.h

@@ -9,7 +9,6 @@
 #import <Foundation/Foundation.h>
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
-#import "AIRMapCoordinate.h"
 #import "AIRGoogleMap.h"
 
 @interface AIRGoogleMapOverlay : UIView

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.h

@@ -9,15 +9,15 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
 #import "AIRGMSPolygon.h"
-#import "AIRMapCoordinate.h"
+#import "AIRGoogleMapCoordinate.h"
 
 @interface AIRGoogleMapPolygon : UIView
 
 @property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, strong) AIRGMSPolygon *polygon;
-@property (nonatomic, strong) NSArray<AIRMapCoordinate *> *coordinates;
-@property (nonatomic, strong) NSArray<NSArray<AIRMapCoordinate *> *> *holes;
+@property (nonatomic, strong) NSArray<AIRGoogleMapCoordinate *> *coordinates;
+@property (nonatomic, strong) NSArray<NSArray<AIRGoogleMapCoordinate *> *> *holes;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 
 @property (nonatomic, strong) UIColor *fillColor;

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.m

@@ -42,7 +42,7 @@
   }
 }
 
-- (void)setCoordinates:(NSArray<AIRMapCoordinate *> *)coordinates
+- (void)setCoordinates:(NSArray<AIRGoogleMapCoordinate *> *)coordinates
 {
   _coordinates = coordinates;
 
@@ -55,7 +55,7 @@
   _polygon.path = path;
 }
 
-- (void)setHoles:(NSArray<NSArray<AIRMapCoordinate *> *> *)holes
+- (void)setHoles:(NSArray<NSArray<AIRGoogleMapCoordinate *> *> *)holes
 {
   _holes = holes;
 

package/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m

@@ -13,8 +13,8 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTViewManager.h>
 #import <React/UIView+React.h>
-#import "RCTConvert+AirMap.h"
 #import "AIRGoogleMapPolygon.h"
+#import "RCTConvert+GMSMapViewType.h"
 
 @interface AIRGoogleMapPolygonManager()
 
@@ -31,8 +31,8 @@ RCT_EXPORT_MODULE()
   return polygon;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRMapCoordinateArray)
-RCT_EXPORT_VIEW_PROPERTY(holes, AIRMapCoordinateArrayArray)
+RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRGoogleMapCoordinateArray)
+RCT_EXPORT_VIEW_PROPERTY(holes, AIRGoogleMapCoordinateArrayArray)
 RCT_EXPORT_VIEW_PROPERTY(fillColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeWidth, double)
 RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)

package/ios/AirGoogleMaps/AIRGoogleMapPolyline.h

@@ -9,15 +9,16 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
 #import "AIRGMSPolyline.h"
-#import "AIRMapCoordinate.h"
 #import "AIRGoogleMapMarker.h"
 
+#import "AIRGoogleMapCoordinate.h"
+
 @interface AIRGoogleMapPolyline : UIView
 
 @property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, strong) AIRGMSPolyline *polyline;
-@property (nonatomic, strong) NSArray<AIRMapCoordinate *> *coordinates;
+@property (nonatomic, strong) NSArray<AIRGoogleMapCoordinate *> *coordinates;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, strong) GMSMapView *originalMap;
 

package/ios/AirGoogleMaps/AIRGoogleMapPolyline.m

@@ -8,7 +8,6 @@
 #import <UIKit/UIKit.h>
 #import "AIRGoogleMapPolyline.h"
 #import "AIRGMSPolyline.h"
-#import "AIRMapCoordinate.h"
 #import "AIRGoogleMapMarker.h"
 #import "AIRGoogleMapMarkerManager.h"
 #import <GoogleMaps/GoogleMaps.h>
@@ -26,13 +25,13 @@
   return self;
 }
 
--(void)setCoordinates:(NSArray<AIRMapCoordinate *> *)coordinates
+-(void)setCoordinates:(NSArray<AIRGoogleMapCoordinate *> *)coordinates
 {
   _coordinates = coordinates;
 
   GMSMutablePath *path = [GMSMutablePath path];
 
-  if (!coordinates || coordinates.count == 0) 
+  if (!coordinates || coordinates.count == 0)
   {
     [path removeAllCoordinates];
     return;

package/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m

@@ -14,8 +14,8 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTViewManager.h>
 #import <React/UIView+React.h>
-#import "RCTConvert+AirMap.h"
 #import "AIRGoogleMapPolyline.h"
+#import "RCTConvert+GMSMapViewType.h"
 
 @interface AIRGoogleMapPolylineManager()
 
@@ -32,7 +32,7 @@ RCT_EXPORT_MODULE()
   return polyline;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRMapCoordinateArray)
+RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRGoogleMapCoordinateArray)
 RCT_EXPORT_VIEW_PROPERTY(fillColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeColors, UIColorArray)

package/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m

@@ -10,6 +10,7 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTConvert.h>
 #import <React/RCTConvert+CoreLocation.h>
+#import "AIRGoogleMapCoordinate.h"
 
 @implementation RCTConvert (GMSMapViewType)
   RCT_ENUM_CONVERTER(GMSMapViewType,
@@ -30,6 +31,21 @@
     return [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:nil];
 }
 
++ (AIRGoogleMapCoordinate *)AIRGoogleMapCoordinate:(id)json
+{
+    AIRGoogleMapCoordinate *coord = [AIRGoogleMapCoordinate new];
+    coord.coordinate = [self CLLocationCoordinate2D:json];
+    return coord;
+}
+
+RCT_ARRAY_CONVERTER(AIRGoogleMapCoordinate)
+
++ (NSArray<NSArray<AIRGoogleMapCoordinate *> *> *)AIRGoogleMapCoordinateArrayArray:(id)json
+{
+    return RCTConvertArrayValue(@selector(AIRGoogleMapCoordinate:), json);
+}
+
+
 + (GMSCameraPosition*)GMSCameraPositionWithDefaults:(id)json existingCamera:(GMSCameraPosition*)existingCamera
 {
     CLLocationDegrees latitude = 0;

package/ios/AirGoogleMaps/RNMapsGoogleMapView.h

@@ -0,0 +1,26 @@
+//
+//  RNMapsGoogleMapView.h
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef HAVE_GOOGLE_MAPS
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+@class AIRGoogleMap;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMapsGoogleMapView : RCTViewComponentView
+
+- (AIRGoogleMap *) mapView;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif