react-native-maps 1.21.0-alpha.99 → 1.21.0

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -13,10 +13,11 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import "AIRGMSMarker.h"
-#import "RNMapsAirModuleDelegate.h"
+
 #import "AIRGoogleMapCoordinate.h"
 
-@interface AIRGoogleMap : GMSMapView <RNMapsAirModuleDelegate>
+
+@interface AIRGoogleMap : GMSMapView
 
 // TODO: don't use MK region?
 @property (nonatomic, weak) RCTBridge *bridge;
@@ -27,18 +28,17 @@
 @property (nonatomic, assign) NSString *customMapStyleString;
 @property (nonatomic, assign) UIEdgeInsets mapPadding;
 @property (nonatomic, assign) NSString *paddingAdjustmentBehaviorString;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapLoaded;
-@property (nonatomic, copy) RCTBubblingEventBlock onKmlReady;
+@property (nonatomic, copy) RCTDirectEventBlock onMapReady;
+@property (nonatomic, copy) RCTDirectEventBlock onMapLoaded;
+@property (nonatomic, copy) RCTDirectEventBlock onKmlReady;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
-@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerSelect;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerDeselect;
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onPoiClick;
+@property (nonatomic, copy) RCTDirectEventBlock onPanDrag;
+@property (nonatomic, copy) RCTDirectEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerPress;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerSelect;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerDeselect;
+@property (nonatomic, copy) RCTDirectEventBlock onPoiClick;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeStart;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeComplete;
@@ -79,7 +79,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"
@@ -49,8 +50,12 @@ id regionAsJSON(MKCoordinateRegion region) {
            @"longitudeDelta": [NSNumber numberWithDouble:region.span.longitudeDelta],
            };
 }
-
-@interface AIRGoogleMap () <GMSIndoorDisplayDelegate>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+@interface AIRGoogleMap () <GMSIndoorDisplayDelegate, RNMapsAirModuleDelegate>
 
 - (id)eventFromCoordinate:(CLLocationCoordinate2D)coordinate;
 
@@ -342,7 +347,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 +355,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 {
@@ -524,7 +529,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
 
-  if (self.onChange) self.onChange(event);
+  if (self.onRegionChange) self.onRegionChange(event);
 }
 
 - (void)didTapPOIWithPlaceID:(NSString *)placeID
@@ -546,7 +551,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"region": regionAsJSON([AIRGoogleMap makeGMSCameraPositionFromMap:self andGMSCameraPosition:position]),
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
-  if (self.onChange) self.onChange(event);  // complete
+    if (self.onRegionChangeComplete) self.onRegionChangeComplete(event);  // complete
     _isAnimating = NO;
 }
 
@@ -666,8 +671,7 @@ id regionAsJSON(MKCoordinateRegion region) {
   if (!style) {
     NSLog(@"The style definition could not be loaded: %@", error);
   }
-
-  self.mapStyle = style;
+    [self setMapStyle:style];
 }
 
 - (BOOL)showsCompass {
@@ -1068,7 +1072,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 + (NSString *)GetIconUrl:(GMUPlacemark *) marker parser:(GMUKMLParser *) parser {
-#ifdef HAVE_GOOGLE_MAPS_UTILS
+#if HAVE_GOOGLE_MAPS_UTILS
   if (marker.style.styleID != nil) {
     for (GMUStyle *style in parser.styles) {
       if (style.styleID == marker.style.styleID) {
@@ -1133,7 +1137,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)setKmlSrc:(NSString *)kmlUrl {
-#ifdef HAVE_GOOGLE_MAPS_UTILS
+#if HAVE_GOOGLE_MAPS_UTILS
 
   _kmlSrc = kmlUrl;
 
@@ -1172,11 +1176,9 @@ id regionAsJSON(MKCoordinateRegion region) {
             return;
         }
         self.onIndoorBuildingFocused(@{
-            @"indoorBuilding": @{
-                    @"activeLevelIndex": @0,
-                    @"underground": @false,
-                    @"levels": [[NSMutableArray alloc]init]
-            }
+            @"activeLevelIndex": @0,
+            @"underground": @false,
+            @"levels": [[NSMutableArray alloc]init]
         });
     }
     NSInteger i = 0;
@@ -1193,11 +1195,9 @@ id regionAsJSON(MKCoordinateRegion region) {
         return;
     }
     self.onIndoorBuildingFocused(@{
-        @"indoorBuilding": @{
-                @"activeLevelIndex": @(building.defaultLevelIndex),
-                @"underground": @(building.underground),
-                @"levels": arrayLevels
-        }
+            @"activeLevelIndex": @(building.defaultLevelIndex),
+            @"underground": @(building.underground),
+            @"levels": arrayLevels
     });
 }
 
@@ -1213,11 +1213,9 @@ id regionAsJSON(MKCoordinateRegion region) {
         i++;
     }
     self.onIndoorLevelActivated(@{
-        @"indoorLevel": @{
-                @"activeLevelIndex": @(i),
-                @"name": level.name,
-                @"shortName": level.shortName
-        }
+            @"activeLevelIndex": @(i),
+            @"name": level.name,
+            @"shortName": level.shortName
     });
 }
 // do nothing, passed as options on initialization

package/ios/AirGoogleMaps/AIRGoogleMapManager.h

@@ -14,6 +14,7 @@
 @interface AIRGoogleMapManager : RCTViewManager
 
 @property (nonatomic, strong) NSString* googleMapId;
+@property (nonatomic, strong) NSString* customMapStyle;
 @property (nonatomic) BOOL zoomTapEnabled;
 @property (nonatomic, strong) UIColor* backgroundColor;
 @property (nonatomic, strong) GMSCameraPosition* camera;