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

package/README.md

@@ -18,13 +18,13 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 ### Important Notes:
 
-- **Fabric is not yet supported**:  
-  This feature is currently under development. Fabric is enabled by default in React Native `0.76` and above, so **please disable it** for now.  
-  Follow updates on this issue here: [react-native-maps/issues/5206](https://github.com/react-native-maps/react-native-maps/issues/5206).  
-  Kindly refrain from opening duplicate tickets regarding this matter.
+- **Fabric is now supported**:  
+  Fabric is now supported for the latest version of the library, if you don't have Fabric (New Arch) enabled, please use v1.21.0 or earlier
 
 ### Version Requirements:
 
+- **Version `1.22.0` and below**: Requires **React Native `>= 0.76`**.
+- **Version `1.21.0` and below**: Requires **React Native `>= 0.74`**.
 - **Version `1.14.0` and above**: Requires **React Native `>= 0.74`**.
 - **Versions below `1.14.0`**: Require **React Native `>= 0.64.3`**.
 

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsOverlayManagerDelegate.java

@@ -11,7 +11,6 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
@@ -28,7 +27,7 @@ public class RNMapsOverlayManagerDelegate<T extends View, U extends BaseViewMana
         mViewManager.setBearing(view, value == null ? 0f : ((Double) value).floatValue());
         break;
       case "bounds":
-        mViewManager.setBounds(view, (ReadableArray) value);
+        mViewManager.setBounds(view, (ReadableMap) value);
         break;
       case "image":
         mViewManager.setImage(view, (ReadableMap) value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsOverlayManagerInterface.java

@@ -11,12 +11,11 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 
 public interface RNMapsOverlayManagerInterface<T extends View> {
   void setBearing(T view, float value);
-  void setBounds(T view, @Nullable ReadableArray value);
+  void setBounds(T view, @Nullable ReadableMap value);
   void setImage(T view, @Nullable ReadableMap value);
   void setOpacity(T view, float value);
   void setTappable(T view, boolean value);

package/android/src/main/java/com/rnmaps/fabric/OverlayManager.java

@@ -4,7 +4,6 @@ package com.rnmaps.fabric;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -12,6 +11,8 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsOverlayManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsOverlayManagerInterface;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
 import com.rnmaps.maps.MapOverlay;
 
 import java.util.HashMap;
@@ -70,8 +71,13 @@ public class OverlayManager extends ViewGroupManager<MapOverlay> implements RNMa
     }
 
     @Override
-    public void setBounds(MapOverlay view, @Nullable ReadableArray value) {
-            view.setBounds(value);
+    public void setBounds(MapOverlay view, @Nullable ReadableMap value) {
+        LatLng sw = new LatLng(value.getMap("southWest").getDouble("latitude"),
+                value.getMap("southWest").getDouble("longitude"));
+        LatLng ne = new LatLng(value.getMap("northEast").getDouble("latitude"),
+                value.getMap("northEast").getDouble("longitude"));
+        LatLngBounds bounds =  new LatLngBounds(sw, ne);
+        view.setBounds(bounds);
     }
 
     @Override

package/android/src/main/java/com/rnmaps/maps/MapOverlay.java

@@ -68,29 +68,9 @@ public class MapOverlay extends MapFeature {
     }
 
 
-    // seems like apple users north west, south east
-    // google uses north east, south west
-    private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds) {
-        double lat1 = bounds.getArray(0).getDouble(0);
-        double lon1 = bounds.getArray(0).getDouble(1);
-        double lat2 = bounds.getArray(1).getDouble(0);
-        double lon2 = bounds.getArray(1).getDouble(1);
-
-// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
-        double southLat = Math.min(lat1, lat2);
-        double northLat = Math.max(lat1, lat2);
-        double westLon = Math.min(lon1, lon2);
-        double eastLon = Math.max(lon1, lon2);
-
-// Create corrected LatLngs
-        LatLng sw = new LatLng(southLat, westLon);
-        LatLng ne = new LatLng(northLat, eastLon);
-        return new LatLngBounds(sw, ne);
-    }
-
-    public void setBounds(ReadableArray bounds) {
 
-        this.bounds = fixBoundsIfNecessary(bounds);
+    public void setBounds(LatLngBounds bounds) {
+        this.bounds = bounds;
         if (this.groundOverlay != null) {
             this.groundOverlay.setPositionFromBounds(this.bounds);
         }

package/android/src/main/java/com/rnmaps/maps/MapOverlayManager.java

@@ -12,6 +12,8 @@ import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
@@ -37,7 +39,27 @@ public class MapOverlayManager extends ViewGroupManager<MapOverlay> {
 
   @ReactProp(name = "bounds")
   public void setBounds(MapOverlay view, ReadableArray bounds) {
-    view.setBounds(bounds);
+    view.setBounds(fixBoundsIfNecessary(bounds));
+  }
+
+  // seems like apple users north west, south east
+  // google uses north east, south west
+  private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds) {
+    double lat1 = bounds.getArray(0).getDouble(0);
+    double lon1 = bounds.getArray(0).getDouble(1);
+    double lat2 = bounds.getArray(1).getDouble(0);
+    double lon2 = bounds.getArray(1).getDouble(1);
+
+// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
+    double southLat = Math.min(lat1, lat2);
+    double northLat = Math.max(lat1, lat2);
+    double westLon = Math.min(lon1, lon2);
+    double eastLon = Math.max(lon1, lon2);
+
+// Create corrected LatLngs
+    LatLng sw = new LatLng(southLat, westLon);
+    LatLng ne = new LatLng(northLat, eastLon);
+    return new LatLngBounds(sw, ne);
   }
 
   @ReactProp(name = "bearing")

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -1094,12 +1094,12 @@ class RNMapsMarkerProps final : public ViewProps {
   bool useLegacyPinView{false};
 };
 
-struct RNMapsOverlayBoundsStruct {
+struct RNMapsOverlayBoundsNorthEastStruct {
   double latitude{0.0};
   double longitude{0.0};
 };
 
-static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsNorthEastStruct &result) {
   auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto tmp_latitude = map.find("latitude");
@@ -1112,19 +1112,53 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   }
 }
 
-static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
-  return "[Object RNMapsOverlayBoundsStruct]";
+static inline std::string toString(const RNMapsOverlayBoundsNorthEastStruct &value) {
+  return "[Object RNMapsOverlayBoundsNorthEastStruct]";
 }
 
-static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<RNMapsOverlayBoundsStruct> &result) {
-  auto items = (std::vector<RawValue>)value;
-  for (const auto &item : items) {
-    RNMapsOverlayBoundsStruct newItem;
-    fromRawValue(context, item, newItem);
-    result.emplace_back(newItem);
+struct RNMapsOverlayBoundsSouthWestStruct {
+  double latitude{0.0};
+  double longitude{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsSouthWestStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_latitude = map.find("latitude");
+  if (tmp_latitude != map.end()) {
+    fromRawValue(context, tmp_latitude->second, result.latitude);
+  }
+  auto tmp_longitude = map.find("longitude");
+  if (tmp_longitude != map.end()) {
+    fromRawValue(context, tmp_longitude->second, result.longitude);
+  }
+}
+
+static inline std::string toString(const RNMapsOverlayBoundsSouthWestStruct &value) {
+  return "[Object RNMapsOverlayBoundsSouthWestStruct]";
+}
+
+struct RNMapsOverlayBoundsStruct {
+  RNMapsOverlayBoundsNorthEastStruct northEast{};
+  RNMapsOverlayBoundsSouthWestStruct southWest{};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_northEast = map.find("northEast");
+  if (tmp_northEast != map.end()) {
+    fromRawValue(context, tmp_northEast->second, result.northEast);
+  }
+  auto tmp_southWest = map.find("southWest");
+  if (tmp_southWest != map.end()) {
+    fromRawValue(context, tmp_southWest->second, result.southWest);
   }
 }
 
+static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
+  return "[Object RNMapsOverlayBoundsStruct]";
+}
 class RNMapsOverlayProps final : public ViewProps {
  public:
   RNMapsOverlayProps() = default;
@@ -1133,7 +1167,7 @@ class RNMapsOverlayProps final : public ViewProps {
 #pragma mark - Props
 
   Float bearing{0.0};
-  std::vector<RNMapsOverlayBoundsStruct> bounds{};
+  RNMapsOverlayBoundsStruct bounds{};
   ImageSource image{};
   Float opacity{1.0};
   bool tappable{false};

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -13,10 +13,16 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import "AIRGMSMarker.h"
-#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+
 #import "AIRGoogleMapCoordinate.h"
 
-@interface AIRGoogleMap : GMSMapView <RNMapsAirModuleDelegate>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+
+@interface AIRGoogleMap : GMSMapView<RNMapsAirModuleDelegate>
 
 // TODO: don't use MK region?
 @property (nonatomic, weak) RCTBridge *bridge;
@@ -78,7 +84,7 @@
 - (void)didChangeCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture;
 - (void)idleAtCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture;
 - (void)didTapPOIWithPlaceID:(NSString *)placeID name:(NSString *) name location:(CLLocationCoordinate2D) location;
-- (NSArray *)getMapBoundaries;
+- (NSDictionary *)getMapBoundaries;
 
 + (MKCoordinateRegion)makeGMSCameraPositionFromMap:(GMSMapView *)map andGMSCameraPosition:(GMSCameraPosition *)position;
 + (GMSCameraPosition*)makeGMSCameraPositionFromMap:(GMSMapView *)map andMKCoordinateRegion:(MKCoordinateRegion)region;

package/ios/AirGoogleMaps/{AIRGoogleMap.m → AIRGoogleMap.mm}

@@ -25,6 +25,7 @@
 #import <React/RCTConvert.h>
 #import <objc/runtime.h>
 
+
 #ifdef HAVE_GOOGLE_MAPS_UTILS
 #import "GMUKMLParser.h"
 #import "GMUPlacemark.h"
@@ -342,7 +343,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 #pragma clang diagnostic pop
 
-- (NSArray *)getMapBoundaries
+- (NSDictionary *)getMapBoundaries
 {
     GMSVisibleRegion visibleRegion = self.projection.visibleRegion;
     GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithRegion:visibleRegion];
@@ -350,16 +351,16 @@ id regionAsJSON(MKCoordinateRegion region) {
     CLLocationCoordinate2D northEast = bounds.northEast;
     CLLocationCoordinate2D southWest = bounds.southWest;
 
-    return @[
-        @[
-            [NSNumber numberWithDouble:northEast.longitude],
-            [NSNumber numberWithDouble:northEast.latitude]
-        ],
-        @[
-            [NSNumber numberWithDouble:southWest.longitude],
-            [NSNumber numberWithDouble:southWest.latitude]
-        ]
-    ];
+    return @{
+        @"northEast": @{
+            @"latitude": [NSNumber numberWithDouble:northEast.latitude],
+            @"longitude": [NSNumber numberWithDouble:northEast.longitude],
+                },
+        @"southWest": @{
+            @"latitude": [NSNumber numberWithDouble:southWest.latitude],
+            @"longitude": [NSNumber numberWithDouble:southWest.longitude],
+            },
+    };
 }
 
 - (NSDictionary *) getCameraDic {

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -25,6 +25,12 @@
 #import <MapKit/MapKit.h>
 #import <QuartzCore/QuartzCore.h>
 
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+
 static NSString *const RCTMapViewKey = @"MapView";
 
 
@@ -344,7 +350,7 @@ RCT_EXPORT_METHOD(coordinateForPoint:(nonnull NSNumber *)reactTag
         if (![view isKindOfClass:[AIRGoogleMap class]]) {
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
-            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+            id<RNMapsAirModuleDelegate> mapView = (id<RNMapsAirModuleDelegate>) view;
             resolve([view getCoordinatesForPoint:pt]);
         }
     }];

package/ios/AirGoogleMaps/RNMapsGoogleMapView.h

@@ -10,8 +10,11 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#else
 #import <react-native-maps-generated/RNMapsHostVewDelegate.h>
-
+#endif
 @class AIRGoogleMap;
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -10,18 +10,33 @@
 #import "RNMapsGoogleMapView.h"
 #import "RNMapsGooglePolygonView.h"
 #import "AIRGoogleMap.h"
-#import "AIRMapMarker.h"
 #import "AIRGoogleMapManager.h"
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
 #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>
+#endif
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
 #import <React/RCTUtils.h>
 #import "RCTConvert+GMSMapViewType.h"
+#if __has_include(<ReactNativeMaps/RCTConvert+AirMap.h>)
+#import <ReactNativeMaps/RCTConvert+AirMap.h>
+#import <ReactNativeMaps/UIView+AirMap.h>
+#else
 #import "RCTConvert+AirMap.h"
 #import "UIView+AirMap.h"
+#endif
+
 
 using namespace facebook::react;
 

package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm

@@ -10,11 +10,20 @@
 #import "RNMapsGooglePolygonView.h"
 #import "AIRGMSPolygon.h"
 #import "AIRGoogleMap.h"
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsSpecs.h>
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
 #import <react-native-maps-generated/RNMapsSpecs.h>
 #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>
+#endif
 
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>

package/ios/AirMaps/AIRMap.h

@@ -14,7 +14,7 @@
 #import "SMCalloutView.h"
 #import "RCTConvert+AirMap.h"
 #import "AIRMapCalloutSubview.h"
-#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+
 
 @class AIRMapCoordinate;
 @class AIRMapMarker;
@@ -23,7 +23,7 @@ extern const NSTimeInterval AIRMapRegionChangeObserveInterval;
 extern const CGFloat AIRMapZoomBoundBuffer;
 extern const NSInteger AIRMapMaxZoomLevel;
 
-@interface AIRMap: MKMapView<SMCalloutViewDelegate, RNMapsAirModuleDelegate>
+@interface AIRMap: MKMapView<SMCalloutViewDelegate>
 
 @property (nonatomic, strong) SMCalloutView *calloutView;
 @property (nonatomic, strong) UIImageView *cacheImageView;
@@ -77,7 +77,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 - (void)beginLoading;
 - (void)finishLoading;
 - (double)getZoomLevel;
-- (NSArray *)getMapBoundaries;
+- (NSDictionary *)getMapBoundaries;
 
 - (AIRMapMarker*) markerAtPoint:(CGPoint)point;
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;

package/ios/AirMaps/{AIRMap.m → AIRMap.mm}

@@ -26,8 +26,12 @@ const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
 const CGFloat AIRMapZoomBoundBuffer = 0.01;
 const NSInteger AIRMapMaxZoomLevel = 20;
 
-
-@interface MKMapView (UIGestureRecognizer)
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+@interface MKMapView (UIGestureRecognizer)<RNMapsAirModuleDelegate>
 
 // this tells the compiler that MKMapView actually implements this method
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch;
@@ -320,23 +324,23 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 #pragma mark RNMapsAirModuleDelegate.h
 
-- (NSArray *)getMapBoundaries
+- (NSDictionary *)getMapBoundaries
 {
     MKMapRect mapRect = self.visibleMapRect;
 
     CLLocationCoordinate2D northEast = MKCoordinateForMapPoint(MKMapPointMake(MKMapRectGetMaxX(mapRect), mapRect.origin.y));
     CLLocationCoordinate2D southWest = MKCoordinateForMapPoint(MKMapPointMake(mapRect.origin.x, MKMapRectGetMaxY(mapRect)));
 
-    return @[
-        @[
-            [NSNumber numberWithDouble:northEast.longitude],
-            [NSNumber numberWithDouble:northEast.latitude]
-        ],
-        @[
-            [NSNumber numberWithDouble:southWest.longitude],
-            [NSNumber numberWithDouble:southWest.latitude]
-        ]
-    ];
+    return @{
+          @"northEast": @{
+              @"latitude": [NSNumber numberWithDouble:northEast.latitude],
+              @"longitude": [NSNumber numberWithDouble:northEast.longitude],
+                  },
+          @"southWest": @{
+              @"latitude": [NSNumber numberWithDouble:southWest.latitude],
+              @"longitude": [NSNumber numberWithDouble:southWest.longitude],
+              },
+      };
 }
 - (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location
 {
@@ -749,7 +753,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (void) listenToMemoryWarnings
 {
-    __weak typeof(self) weakSelf = self;
+    __weak __typeof(self) weakSelf = self;
     static dispatch_once_t onceToken;
     static dispatch_source_t source;
     dispatch_once(&onceToken, ^{

package/ios/AirMaps/AIRMapManager.m

@@ -186,18 +186,7 @@ RCT_EXPORT_METHOD(getMapBoundaries:(nonnull NSNumber *)reactTag
         if (![view isKindOfClass:[AIRMap class]]) {
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
-            NSArray *boundingBox = [view getMapBoundaries];
-
-            resolve(@{
-                @"northEast" : @{
-                    @"longitude" : boundingBox[0][0],
-                    @"latitude" : boundingBox[0][1]
-                },
-                @"southWest" : @{
-                    @"longitude" : boundingBox[1][0],
-                    @"latitude" : boundingBox[1][1]
-                }
-            });
+            resolve([view getMapBoundaries]);
         }
     }];
 }

package/ios/AirMaps/AIRMapOverlay.m

@@ -50,8 +50,8 @@
 - (void)setBoundsRect:(NSArray *)boundsRect {
     _boundsRect = boundsRect;
 
-    _southWest = CLLocationCoordinate2DMake([boundsRect[0][0] doubleValue], [boundsRect[0][1] doubleValue]);
-    _northEast = CLLocationCoordinate2DMake([boundsRect[1][0] doubleValue], [boundsRect[1][1] doubleValue]);
+    _northEast = CLLocationCoordinate2DMake([boundsRect[0][0] doubleValue], [boundsRect[0][1] doubleValue]);
+    _southWest = CLLocationCoordinate2DMake([boundsRect[1][0] doubleValue], [boundsRect[1][1] doubleValue]);
 
     MKMapPoint southWest = MKMapPointForCoordinate(_southWest);
     MKMapPoint northEast = MKMapPointForCoordinate(_northEast);

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.h

@@ -12,9 +12,6 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
-#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
-
-
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm

@@ -9,10 +9,19 @@
 
 #if HAVE_GOOGLE_MAPS == 0
 
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
 #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 <react-native-maps-generated/RNMapsHostVewDelegate.h>
+#endif
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
 #import "PlaceHolderGoogleMapView.h"

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm

@@ -9,10 +9,18 @@
 
 #if HAVE_GOOGLE_MAPS == 0
 
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
 #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>
+#endif
 
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>

package/ios/AirMaps/RNMapsAirModule.h

@@ -1,13 +1,12 @@
-//  RCTNativeLocalStorage.h
 //  TurboModuleExample
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <react-native-maps-generated/RNMapsSpecs.h>
+
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNMapsAirModule : NSObject <NativeAirMapsModuleSpec>
+@interface RNMapsAirModule : NSObject 
 
 @end
 

package/ios/AirMaps/RNMapsAirModule.mm

@@ -5,6 +5,8 @@
 //  Created by Salah Ghanim on 23.11.24.
 //  Copyright © 2024 react-native-maps. All rights reserved.
 //
+#ifdef RCT_NEW_ARCH_ENABLED
+
 
 #import "RNMapsAirModule.h"
 #import <React/RCTUIManager.h>
@@ -15,6 +17,16 @@
 #import <MapKit/MapKit.h>
 #import "RCTConvert+AirMap.h"
 
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsSpecs.h>
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsSpecs.h>
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
+#endif
+@interface RNMapsAirModule()<NativeAirMapsModuleSpec>
+@end
+
 @implementation RNMapsAirModule
 
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
@@ -148,3 +160,5 @@
 
 @end
 
+
+#endif

package/ios/AirMaps/RNMapsDefines.h

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

package/ios/AirMaps/RNMapsMapView.h

@@ -9,8 +9,11 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#else
 #import <react-native-maps-generated/RNMapsHostVewDelegate.h>
-
+#endif
 @class AIRMap;
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/AirMaps/RNMapsMapView.mm

@@ -11,10 +11,20 @@
 #import "AIRMapMarker.h"
 #import "AIRMapManager.h"
 #import "RNMapsMarkerView.h"
-#import <react-native-maps-generated/EventEmitters.h>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsSpecs.h>
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
+#import <react-native-maps-generated/RNMapsSpecs.h>
 #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>
+#endif
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
 #import "UIView+AirMap.h"
@@ -31,7 +41,7 @@ using namespace facebook::react;
 
 
 - (id<RNMapsAirModuleDelegate>) mapView {
-    return _view;
+    return nil;
 }
 
 - (void) prepareForRecycle

package/ios/AirMaps/RNMapsMarkerView.mm

@@ -10,10 +10,18 @@
 #import "AIRMap.h"
 #import "AIRMapMarker.h"
 #import "AIRMapMarkerManager.h"
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
 #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>
+#endif
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
 #import "UIView+AirMap.h"

package/ios/AirMaps/module.modulemap

@@ -0,0 +1,6 @@
+framework module ReactNativeMaps {
+  header "UIView+AirMap.h"
+  header "RCTConvert+AirMap.h"
+
+  export *
+}

package/ios/generated/RNMapsAirModuleDelegate.h

@@ -18,7 +18,7 @@
 
 - (NSDictionary *) getCameraDic;
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
-- (NSArray *) getMapBoundaries;
+- (NSDictionary *) getMapBoundaries;
 - (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location;
 - (NSDictionary *) getCoordinatesForPoint:(CGPoint) point;
 @end

package/package.json

@@ -5,7 +5,7 @@
   "main": "src/index.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.140",
+  "version": "1.21.0-alpha.142",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/react-native-google-maps.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors = package["author"]
   s.homepage = package["homepage"]
   s.license = package["license"]
-  s.platform = :ios, "15.0"
+  s.platform = :ios, "15.1"
   s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
   s.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
   s.resource_bundles = {
@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
   s.dependency 'GoogleMaps', '9.3.0'
   s.dependency 'Google-Maps-iOS-Utils', '6.1.0'
   s.dependency 'react-native-maps-generated'
+  s.dependency 'react-native-maps'
   install_modules_dependencies(s)
 
 end

package/react-native-maps-generated.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors = package["author"]
   s.homepage = package["homepage"]
   s.license = package["license"]
-  s.platform = :ios, "13.0"
+  s.platform = :ios, "15.1"
   s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
   s.source_files = "ios/generated/**/*.{h,m,mm,cpp,swift}"
   s.exclude_files = [
@@ -24,7 +24,6 @@ Pod::Spec.new do |s|
   ]
   s.public_header_files = "ios/generated/**/*.h"
   s.module_name = 'ReactNativeMapsGenerated'
-  s.dependency "React-Core"
   s.compiler_flags = folly_compiler_flags
   install_modules_dependencies(s)
 

package/react-native-maps.podspec

@@ -11,13 +11,19 @@ Pod::Spec.new do |s|
   s.authors = package["author"]
   s.homepage = package["homepage"]
   s.license = package["license"]
-  s.platform = :ios, "13.0"
+  s.platform = :ios, "15.1"
   s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
 
   s.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
-  s.dependency "React-Core"
+  s.module_map = 'ios/AirMaps/module.modulemap'
+  s.public_header_files = [
+    'ios/AirMaps/UIView+AirMap.h',
+    'ios/AirMaps/RCTConvert+AirMap.h',
+  ]
+  s.module_name = 'ReactNativeMaps'
   s.compiler_flags = folly_compiler_flags
   s.dependency 'react-native-maps-generated'
+  s.dependency "React-Core"
   install_modules_dependencies(s)
 
      # Add script phase to detect Google Maps
@@ -55,8 +61,11 @@ Pod::Spec.new do |s|
       }
   ]
 
-  # Add the generated defines header to the header search path
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => "\"$(CONFIGURATION_BUILD_DIR)/react-native-google-maps\" \"${PODS_ROOT}/Headers/Private/Yoga\""
+    'HEADER_SEARCH_PATHS' => [
+      '$(PODS_ROOT)/Headers/Public/React-Core',
+      '$(PODS_TARGET_SRCROOT)/../../../node_modules/react-native/React'
+    ]
   }
+
 end

package/src/MapOverlay.tsx

@@ -77,6 +77,13 @@ export type MapOverlayProps = ViewProps & {
 
 type NativeProps = Modify<MapOverlayProps, {image?: string}>;
 
+function normalizeBounds(bounds: [number, number][]): any {
+  return {
+    northEast: {latitude: bounds[0][0], longitude: bounds[0][1]},
+    southWest: {latitude: bounds[1][0], longitude: bounds[1][1]},
+  };
+}
+
 export class MapOverlay extends React.Component<MapOverlayProps> {
   // declaration only, as they are set through decorateMap
   /// @ts-ignore
@@ -90,7 +97,7 @@ export class MapOverlay extends React.Component<MapOverlayProps> {
   private fabricOverlay?: Boolean = undefined;
 
   render() {
-    const {opacity = 1.0} = this.props;
+    const {opacity = 1.0, bounds} = this.props;
 
     if (this.fabricOverlay === undefined) {
       this.fabricOverlay = Platform.OS === 'android';
@@ -98,12 +105,27 @@ export class MapOverlay extends React.Component<MapOverlayProps> {
 
     const AIRMapOverlay = this.getNativeComponent();
     let image: any = this.props.image;
-    if (this.props.image && this.fabricOverlay) {
-      image = fixImageProp(this.props.image);
+
+    let boundsParam: any = bounds;
+    if (this.fabricOverlay) {
+      if (this.props.image) {
+        image = fixImageProp(this.props.image);
+      }
+      if (bounds) {
+        boundsParam = normalizeBounds(bounds);
+      }
+    } else {
+      if (this.props.image) {
+        image = fixImageProp(this.props.image);
+        if (image.uri) {
+          image = image.uri;
+        }
+      }
     }
     return (
       <AIRMapOverlay
-        {...this.props}
+        // @ts-ignore
+        bounds={boundsParam}
         opacity={opacity}
         // @ts-ignore
         image={image}

package/src/specs/NativeComponentOverlay.ts

@@ -46,7 +46,16 @@ export interface OverlayFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  bounds: ReadonlyArray<LatLng>;
+  bounds: Readonly<{
+    northEast: {
+      latitude: Double; // Non-nullable Double for latitude
+      longitude: Double; // Non-nullable Double for longitude
+    };
+    southWest: {
+      latitude: Double; // Non-nullable Double for latitude
+      longitude: Double; // Non-nullable Double for longitude
+    };
+  }>;
 
   /**
    * A custom image to be used as the overlay.