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

package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm

@@ -0,0 +1,217 @@
+//
+//  RNMapsGoogleMapView.mm
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef HAVE_GOOGLE_MAPS
+
+#import "RNMapsGooglePolygonView.h"
+#import "AIRGMSPolygon.h"
+#import "AIRGoogleMap.h"
+#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>
+
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "RCTConvert+GMSMapViewType.h"
+#import "RCTConvert+AirMap.h"
+#import "UIView+AirMap.h"
+
+using namespace facebook::react;
+
+bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>>& newHoles, const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>>& oldHoles) {
+    // First-level check: compare the sizes of the top-level vectors
+    if (newHoles.size() != oldHoles.size()) {
+        return false;
+    }
+
+    // Second-level check: compare the contents of each child vector
+    for (size_t i = 0; i < newHoles.size(); ++i) {
+        const auto& newHole = newHoles.at(i);
+        const auto& oldHole = oldHoles.at(i);
+
+        // Compare sizes of the child vectors
+        if (newHole.size() != oldHole.size()) {
+            return false;
+        }
+
+    }
+
+    return true;
+}
+
+@interface RNMapsGooglePolygonView () <RCTRNMapsGooglePolygonViewProtocol>
+@end
+
+@implementation RNMapsGooglePolygonView {
+    AIRGMSPolygon *_view;
+}
+
+
+- (AIRGMSPolygon*) polygon {
+    return _view;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>();
+}
+
+- (void) didInsertInMap:(AIRGoogleMap*) map
+{
+    _view.map = map;
+}
+
+-(void) didRemoveFromMap
+{
+    _view.map = nil;
+    _view = nil;
+}
+
+- (void) prepareContentView {
+
+    _view = [AIRGMSPolygon new];
+    _view.onPress = [self](NSDictionary* dictionary) {
+          if (_eventEmitter) {
+              // Extract values from the NSDictionary
+                NSDictionary* coordinateDict = dictionary[@"coordinate"];
+                NSDictionary* positionDict = dictionary[@"position"];
+
+                // Populate the OnMapPressCoordinate struct
+              facebook::react::RNMapsGooglePolygonEventEmitter::OnPressCoordinate coordinate = {
+                    .latitude = [coordinateDict[@"latitude"] doubleValue],
+                    .longitude = [coordinateDict[@"longitude"] doubleValue],
+                };
+
+                // Populate the OnMapPressPosition struct
+              facebook::react::RNMapsGooglePolygonEventEmitter::OnPressPosition position = {
+                    .x = [positionDict[@"x"] doubleValue],
+                    .y = [positionDict[@"y"] doubleValue],
+                };
+
+              auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGooglePolygonEventEmitter const>(_eventEmitter);
+              facebook::react::RNMapsGooglePolygonEventEmitter::OnPress data = {
+                  .action = std::string([@"press" UTF8String]),
+                  .position = position,
+                  .coordinate = coordinate
+              };
+              mapViewEventEmitter->onPress(data);
+          }
+      };
+
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMapsGooglePolygonProps>();
+    _props = defaultProps;
+    [self prepareContentView];
+
+  }
+
+  return self;
+}
+
+
+
+- (void) prepareForRecycle
+{
+    [super prepareForRecycle];
+    static const auto defaultProps = std::make_shared<const RNMapsGooglePolygonProps>();
+    _props = defaultProps;
+    _view = nil;
+}
+
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+  const auto &oldViewProps = *std::static_pointer_cast<RNMapsGooglePolygonProps const>(_props);
+  const auto &newViewProps = *std::static_pointer_cast<RNMapsGooglePolygonProps const>(props);
+
+
+    if (!_view){
+        [self prepareContentView];
+    }
+
+#define REMAP_MAPVIEW_PROP(name)                    \
+    if (oldViewProps.name != newViewProps.name) {   \
+        _view.name = newViewProps.name;             \
+    }
+
+#define REMAP_MAPVIEW_STRING_PROP(name)                             \
+    if (oldViewProps.name != newViewProps.name) {                   \
+        _view.name = RCTNSStringFromString(newViewProps.name);      \
+    }
+
+#define REMAP_MAPVIEW_POINT_PROP(name)                               \
+    if (newViewProps.name.x != oldViewProps.name.x ||                \
+        newViewProps.name.y != oldViewProps.name.y) {                \
+        _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
+    }
+
+
+    if(newViewProps.zIndex.has_value()){
+        _view.zIndex = newViewProps.zIndex.value();
+    }
+    if (newViewProps.coordinates.size() != oldViewProps.coordinates.size()){
+        GMSMutablePath *path = [GMSMutablePath path];
+        for(int i = 0; i < newViewProps.coordinates.size(); i++)
+        {
+            CLLocationCoordinate2D coordinates = CLLocationCoordinate2DMake(
+                                                                            newViewProps.coordinates.at(i).latitude,newViewProps.coordinates.at(i).longitude);
+          [path addCoordinate:coordinates];
+        }
+        _view.path = path;
+    }
+
+    if (!areHolesEqual(newViewProps.holes, oldViewProps.holes)){
+        NSMutableArray<GMSMutablePath *> *interiorPolygons = [NSMutableArray array];
+        for(int h = 0; h < newViewProps.holes.size(); h++)
+        {
+          GMSMutablePath *path = [GMSMutablePath path];
+          for(int i = 0; i < newViewProps.holes[h].size(); i++)
+          {
+              CLLocationCoordinate2D coordinates = CLLocationCoordinate2DMake(
+                                                                              newViewProps.holes.at(h).at(i).latitude,
+                                                                              newViewProps.holes.at(h).at(i).longitude);
+            [path addCoordinate:coordinates];
+          }
+          [interiorPolygons addObject:path];
+        }
+        _view.holes = interiorPolygons;
+    }
+
+
+    REMAP_MAPVIEW_PROP(tappable)
+
+    if (newViewProps.fillColor){
+        _view.fillColor = RCTUIColorFromSharedColor(newViewProps.fillColor);
+    }
+
+    if (newViewProps.strokeColor){
+        _view.strokeColor = RCTUIColorFromSharedColor(newViewProps.strokeColor);
+    }
+
+
+
+
+  [super updateProps:props oldProps:oldProps];
+}
+- (void) didMoveToSuperview {
+    [super didMoveToSuperview];
+    NSLog(@"SuperView ? %@", self.superview);
+}
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGooglePolygonCls(void)
+{
+    return RNMapsGooglePolygonView.class;
+}
+
+#endif

package/ios/AirGoogleMaps/RNMapsGooglePolygonViewManager.mm

@@ -0,0 +1,26 @@
+//
+//  RNMapsMapViewManager.mm
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef HAVE_GOOGLE_MAPS
+
+#import <React/RCTLog.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTViewManager.h>
+
+@interface RNMapsGooglePolygonViewManager : RCTViewManager
+@end
+
+@implementation RNMapsGooglePolygonViewManager
+
+RCT_EXPORT_MODULE(RNMapsGooglePolygonViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+
+
+@end
+
+#endif

package/ios/AirMaps/AIRMap.h

@@ -14,7 +14,7 @@
 #import "SMCalloutView.h"
 #import "RCTConvert+AirMap.h"
 #import "AIRMapCalloutSubview.h"
-#import "RNMapsAirModuleDelegate.h"
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
 
 @class AIRMapCoordinate;
 @class AIRMapMarker;
@@ -35,6 +35,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 @property (nonatomic, assign) BOOL hasStartedRendering;
 @property (nonatomic, assign) BOOL cacheEnabled;
 @property (nonatomic, assign) BOOL loadingEnabled;
+@property (nonatomic, assign) BOOL handlePanDrag;
 @property (nonatomic, assign) BOOL legacyZoomConstraintsEnabled;
 @property (nonatomic, strong) UIColor *loadingBackgroundColor;
 @property (nonatomic, strong) UIColor *loadingIndicatorColor;
@@ -43,7 +44,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 @property (nonatomic, assign) CGFloat maxDelta;
 @property (nonatomic, assign) UIEdgeInsets legalLabelInsets;
 @property (nonatomic, assign) MKCoordinateRegion initialRegion;
-@property (nonatomic, assign) MKMapCamera *initialCamera;
+@property (nonatomic, retain) MKMapCamera *initialCamera;
 @property (nonatomic, assign) CGFloat minZoom;
 @property (nonatomic, assign) CGFloat maxZoom;
 @property (nonatomic, assign) CGPoint compassOffset;
@@ -55,12 +56,12 @@ extern const NSInteger AIRMapMaxZoomLevel;
 
 @property (nonatomic, assign) BOOL ignoreRegionChanges;
 
-@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
+@property (nonatomic, copy) RCTDirectEventBlock onMapReady;
+@property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
-@property (nonatomic, copy) RCTBubblingEventBlock onDoublePress;
 @property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
+@property (nonatomic, copy) RCTDirectEventBlock onPanDrag;
+@property (nonatomic, copy) RCTDirectEventBlock onDoublePress;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerPress;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerSelect;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerDeselect;
@@ -70,12 +71,10 @@ extern const NSInteger AIRMapMaxZoomLevel;
 
 @property (nonatomic, copy) RCTDirectEventBlock onCalloutPress;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeStart;
-@property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTDirectEventBlock onUserLocationChange;
 
 - (void)cacheViewIfNeeded;
 - (void)beginLoading;
-- (void)didSetRegion;
 - (void)finishLoading;
 - (double)getZoomLevel;
 - (NSArray *)getMapBoundaries;