react-native-maps 1.21.0-alpha.13 → 1.21.0-alpha.130

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -1,6 +1,6 @@
 //
 //  RNMapsGoogleMapView.mm
-//  
+//
 //
 //  Created by Salah Ghanim on 23.11.24.
 //  Copyright © 2024 react-native-maps. All rights reserved.
@@ -8,17 +8,17 @@
 #ifdef HAVE_GOOGLE_MAPS
 
 #import "RNMapsGoogleMapView.h"
-#import "AirGoogleMap.h"
+#import "RNMapsGooglePolygonView.h"
+#import "AIRGoogleMap.h"
 #import "AIRMapMarker.h"
-#import "AirGoogleMapManager.h"
-
-#import <react/renderer/components/RNMapsSpecs/ComponentDescriptors.h>
-#import <react/renderer/components/RNMapsSpecs/EventEmitters.h>
-#import <react/renderer/components/RNMapsSpecs/Props.h>
-#import <react/renderer/components/RNMapsSpecs/RCTComponentViewHelpers.h>
-
+#import "AIRGoogleMapManager.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 <React/RCTUtils.h>
 #import "RCTConvert+GMSMapViewType.h"
 #import "RCTConvert+AirMap.h"
 #import "UIView+AirMap.h"
@@ -32,6 +32,7 @@ using namespace facebook::react;
     AIRGoogleMap *_view;
     AIRGoogleMapManager* _legacyMapManager;
     NSMutableDictionary<NSNumber*, UIView*>* _pendingInsertsSubviews;
+    NSMutableArray *_polygons;
 }
 
 
@@ -44,7 +45,11 @@ using namespace facebook::react;
     NSDictionary* regionDic = [RCTConvert dictonaryFromString:regionJSON];
     MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:regionDic];
     GMSCameraPosition *camera = [AIRGoogleMap makeGMSCameraPositionFromMap:_view andMKCoordinateRegion:region];
-    [_view animateToCameraPosition:camera];
+    if (duration == 0){
+        [_view setRegion:region];
+    } else {
+        [_view animateToCameraPosition:camera];
+    }
 }
 - (void)setCamera:(NSString *)cameraJSON{
     NSDictionary* cameraDic = [RCTConvert dictonaryFromString:cameraJSON];
@@ -77,9 +82,19 @@ using namespace facebook::react;
     }
 
     NSDictionary* edgePadding = [RCTConvert dictonaryFromString:edgePaddingJSON];
-    
+
     [_view fitToCoordinates:coordinatesArray withEdgePadding:edgePadding animated:animated];
 }
+- (void) setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex
+{
+    if (!_view.indoorDisplay) {
+      return;
+    }
+    if ( activeLevelIndex < [_view.indoorDisplay.activeBuilding.levels count]) {
+        _view.indoorDisplay.activeLevel = _view.indoorDisplay.activeBuilding.levels[activeLevelIndex];
+    }
+
+}
 
 #pragma mark - Native commands
 
@@ -108,9 +123,10 @@ using namespace facebook::react;
 }
 
 - (void) prepareContentView {
-   
+
     _view = (AIRGoogleMap *)[_legacyMapManager view];
-    
+    _polygons = [NSMutableArray new];
+
     self.contentView = _view;
 
       _view.onPress = [self](NSDictionary* dictionary) {
@@ -140,7 +156,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onPress(data);
           }
       };
-    
+
     _view.onLongPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -177,7 +193,37 @@ using namespace facebook::react;
               mapViewEventEmitter->onMapReady(data);
           }
       };
-    
+
+    _view.onIndoorLevelActivated = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            
+            auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
+            
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorLevelActivated data = {
+                .activeLevelIndex= (int) [dictionary[@"activeLevelIndex"] integerValue],
+                .name = [dictionary[@"name"] UTF8String],
+                .shortName = [dictionary[@"shortName"] UTF8String],
+            };
+            mapViewEventEmitter->onIndoorLevelActivated(data);
+        }
+    };
+
+    _view.onIndoorBuildingFocused = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
+
+            NSError *jsError = nil;
+            NSString *levelsStr = RCTJSONStringify(dictionary[@"levels"], &jsError);
+            
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorBuildingFocused data = {
+                .underground = [dictionary[@"underground"] boolValue],
+                .activeLevelIndex = (int) [dictionary[@"activeLevelIndex"] integerValue],
+                .levels = [levelsStr  UTF8String]
+            };
+            mapViewEventEmitter->onIndoorBuildingFocused(data);
+        }
+    };
+
     _view.onMapLoaded = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
@@ -185,7 +231,7 @@ using namespace facebook::react;
             mapViewEventEmitter->onMapLoaded(data);
         }
     };
-      
+
       _view.onKmlReady = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -194,7 +240,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onKmlReady(data);
           }
       };
-      _view.onChange = [self](NSDictionary* dictionary) {
+      _view.onRegionChange = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
               NSDictionary* regionDict = dictionary[@"region"];
@@ -253,7 +299,7 @@ using namespace facebook::react;
               if (errorDict){
                   str = errorDict[@"message"];
               }
-              
+
               facebook::react::RNMapsGoogleMapViewEventEmitter::OnUserLocationChangeError error = {
                   .message = std::string([str UTF8String]),
               };
@@ -268,6 +314,35 @@ using namespace facebook::react;
           }
       };
 
+    _view.onPoiClick =  [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+
+            NSDictionary* coordinateDict = dictionary[@"coordinate"];
+            NSDictionary* positionDict = dictionary[@"position"];
+
+            // Populate the OnMapPressCoordinate struct
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnPoiClickCoordinate coordinate = {
+                .latitude = [coordinateDict[@"latitude"] doubleValue],
+                .longitude = [coordinateDict[@"longitude"] doubleValue],
+            };
+            // Populate the OnMapDouplePressPosition struct
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnPoiClickPosition position = {
+                .x = [positionDict[@"x"] doubleValue],
+                .y = [positionDict[@"y"] doubleValue],
+            };
+
+
+            auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnPoiClick data = {
+                .coordinate = coordinate,
+                .position = position,
+                .placeId = [dictionary[@"placeId"] UTF8String],
+                .name = [dictionary[@"name"] UTF8String],
+               };
+            mapViewEventEmitter->onPoiClick(data);
+        }
+    };
+
 
 
       _view.onRegionChangeStart = [self](NSDictionary* dictionary) {
@@ -285,23 +360,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onRegionChangeStart(data);
           }
       };
-      
-      _view.onRegionChange = [self](NSDictionary* dictionary) {
-          if (_eventEmitter) {
 
-              NSDictionary* regionDict = dictionary[@"region"];
-              auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
-              facebook::react::RNMapsGoogleMapViewEventEmitter::OnRegionChange data = {
-                  .region.latitude = [regionDict[@"latitude"] doubleValue],
-                  .region.longitude = [regionDict[@"longitude"] doubleValue],
-                  .region.latitudeDelta = [regionDict[@"latitudeDelta"] doubleValue],
-                  .region.longitudeDelta = [regionDict[@"longitudeDelta"] doubleValue],
-                  .continuous = [dictionary[@"continuous"] boolValue],
-                 };
-              mapViewEventEmitter->onRegionChange(data);
-          }
-      };
-      
       _view.onRegionChangeComplete = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -388,6 +447,11 @@ using namespace facebook::react;
         }
     } else {
         [_view insertReactSubview:childComponentView atIndex:index];
+        if ([childComponentView isKindOfClass:[RNMapsGooglePolygonView class]]){
+            RNMapsGooglePolygonView* polygon = (RNMapsGooglePolygonView *) childComponentView;
+            [_polygons addObject:childComponentView];
+            [polygon didInsertInMap:_view];
+        }
     }
 }
 
@@ -402,6 +466,11 @@ using namespace facebook::react;
         }
     } else {
         [_view removeReactSubview:childComponentView];
+        if ([childComponentView isKindOfClass:[RNMapsGooglePolygonView class]]){
+            RNMapsGooglePolygonView* polygon = (RNMapsGooglePolygonView *) childComponentView;
+            [_polygons removeObject:childComponentView];
+            [polygon didRemoveFromMap];
+        }
     }
 }
 - (void) prepareForRecycle
@@ -420,7 +489,7 @@ using namespace facebook::react;
 {
   const auto &oldViewProps = *std::static_pointer_cast<RNMapsGoogleMapViewProps const>(_props);
   const auto &newViewProps = *std::static_pointer_cast<RNMapsGoogleMapViewProps const>(props);
-    
+
 
     if (oldViewProps.googleMapId != newViewProps.googleMapId) {
         NSString* mapID = RCTNSStringFromString(newViewProps.googleMapId);
@@ -452,7 +521,7 @@ using namespace facebook::react;
         _legacyMapManager.camera = camera;
     }
 
-    
+
 
     if (!_view){
         [self prepareContentView];
@@ -500,16 +569,16 @@ using namespace facebook::react;
 
 
     REMAP_MAPVIEW_PROP(pitchEnabled)
-    
     REMAP_MAPVIEW_PROP(zoomTapEnabled)
-    
     REMAP_MAPVIEW_PROP(scrollEnabled)
-    
+
+    REMAP_MAPVIEW_STRING_PROP(kmlSrc)
+
     if (newViewProps.minZoom != oldViewProps.minZoom || newViewProps.maxZoom != oldViewProps.maxZoom){
         [_view setMinZoom:newViewProps.minZoom maxZoom:newViewProps.maxZoom];
     }
 
-    REMAP_MAPVIEW_PROP(showsCompass)
+    [_view setShowsCompass:newViewProps.showsCompass];
     REMAP_MAPVIEW_PROP(showsTraffic)
     REMAP_MAPVIEW_PROP(showsUserLocation)
     REMAP_MAPVIEW_PROP(zoomEnabled)
@@ -530,8 +599,8 @@ using namespace facebook::react;
                                                                viewingAngle:newViewProps.camera.pitch];
         _view.cameraProp = camera;
       }
-    
-    
+
+
     REMAP_MAPVIEW_EDGEINSETS_PROP(mapPadding)
 
 
@@ -554,7 +623,7 @@ using namespace facebook::react;
                 break;
         }
     }
-    
+
     if (oldViewProps.userInterfaceStyle != newViewProps.userInterfaceStyle){
         switch (newViewProps.userInterfaceStyle) {
             case RNMapsGoogleMapViewUserInterfaceStyle::Light:

package/ios/AirGoogleMaps/RNMapsGoogleMapViewManager.mm

@@ -18,7 +18,22 @@
 
 RCT_EXPORT_MODULE(RNMapsGoogleMapViewManager)
 
-
+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, 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)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPoiClick, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorLevelActivated, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorBuildingFocused, RCTDirectEventBlock)
 
 @end
 

package/ios/AirGoogleMaps/RNMapsGooglePolygonView.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;
+@class AIRGMSPolygon;
+
+NS_ASSUME_NONNULL_BEGIN
+@interface RNMapsGooglePolygonView : RCTViewComponentView
+- (void) didInsertInMap:(AIRGoogleMap*) map;
+- (void) didRemoveFromMap;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif

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;