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

package/ios/AirGoogleMaps/AIRGoogleMapMarker.m

@@ -29,8 +29,8 @@ CGRect unionRect(CGRect a, CGRect b) {
 @implementation AIRGoogleMapMarker {
     RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
     RCTBubblingEventBlock _onPress;
-    RCTBubblingEventBlock _onSelect;
-    RCTBubblingEventBlock _onDeselect;
+    RCTDirectEventBlock _onSelect;
+    RCTDirectEventBlock _onDeselect;
     __weak UIImageView *_iconImageView;
     UIView *_iconView;
     UIColor *_pinColor;
@@ -140,6 +140,9 @@ CGRect unionRect(CGRect a, CGRect b) {
     if (_onPress){
         [_realMarker setOnPress:_onPress];
     }
+    if (_zIndex){
+        [_realMarker setZIndex:_zIndex];
+    }
     [_realMarker setMap:map];
 }
 
@@ -373,7 +376,7 @@ CGRect unionRect(CGRect a, CGRect b) {
             // TODO(lmr): do something with the error?
             NSLog(@"%@", error);
         }
-        
+
         dispatch_async(dispatch_get_main_queue(), ^{
             __strong AIRGoogleMapMarker* strongSelf  = weakSelf;
 

package/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m

@@ -86,7 +86,7 @@ RCT_EXPORT_METHOD(redrawCallout:(nonnull NSNumber *)reactTag)
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
             AIRGoogleMapMarker* marker = (AIRGoogleMapMarker *) view;
-            
+
             [NSTimer scheduledTimerWithTimeInterval:0.0
                                              target:[NSBlockOperation blockOperationWithBlock:^{
                 [marker hideCalloutView];

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.m

@@ -66,6 +66,9 @@
     if (_holes){
         [self setHoles:_holes];
     }
+    if (_zIndex){
+        _polygon.zIndex = _zIndex;
+    }
     [_polygon setMap:map];
 }
 

package/ios/AirGoogleMaps/AIRGoogleMapPolyline.h

@@ -25,7 +25,6 @@
 @property (nonatomic, strong) UIColor *strokeColor;
 @property (nonatomic, strong) NSArray<UIColor *> *strokeColors;
 @property (nonatomic, assign) double strokeWidth;
-@property (nonatomic, assign) UIColor *fillColor;
 @property (nonatomic, strong) NSArray<NSNumber *> *lineDashPattern;
 @property (nonatomic, assign) BOOL geodesic;
 @property (nonatomic, assign) NSString *title;

package/ios/AirGoogleMaps/AIRGoogleMapPolyline.m

@@ -19,7 +19,6 @@
 {
   if (self = [super init]) {
     _polyline = [[AIRGMSPolyline alloc] init];
-    _polyline.spans = @[[GMSStyleSpan spanWithColor:_strokeColor]];
     _polyline.strokeColor = _strokeColor;
   }
   return self;
@@ -79,12 +78,6 @@
   _polyline.strokeWidth = strokeWidth;
 }
 
--(void)setFillColor:(UIColor *)fillColor
-{
-  _fillColor = fillColor;
-  _polyline.spans = @[[GMSStyleSpan spanWithColor:fillColor]];
-}
-
 - (void)setLineDashPattern:(NSArray<NSNumber *> *)lineDashPattern {
   _lineDashPattern = lineDashPattern;
   [self configureStyleSpansIfNeeded];

package/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m

@@ -28,11 +28,11 @@
   NSInteger *maximumZ = self.maximumZ;
   NSInteger *minimumZ = self.minimumZ;
   GMSTileURLConstructor urls = ^NSURL* _Nullable (NSUInteger x, NSUInteger y, NSUInteger zoom) {
-    
+
     if (self.flipY == YES) {
       y = (1 << zoom) - y - 1;
     }
-    
+
     NSString *url = urlTemplate;
     url = [url stringByReplacingOccurrencesOfString:@"{x}" withString:[NSString stringWithFormat: @"%ld", (long)x]];
     url = [url stringByReplacingOccurrencesOfString:@"{y}" withString:[NSString stringWithFormat: @"%ld", (long)y]];

package/ios/AirGoogleMaps/AIRGoogleMapWMSTile.h

@@ -13,7 +13,7 @@
 
 @interface WMSTileOverlay : GMSSyncTileLayer
 @property (nonatomic) double MapX,MapY,FULL;
-@property (nonatomic, strong) NSString *template;
+@property (nonatomic, assign) NSString *urlTemplate;
 @property (nonatomic, assign) NSInteger maximumZ;
 @property (nonatomic, assign) NSInteger minimumZ;
 @end

package/ios/AirGoogleMaps/AIRGoogleMapWMSTile.m

@@ -62,7 +62,7 @@
 {
     _urlTemplate = urlTemplate;
     WMSTileOverlay *tile = [[WMSTileOverlay alloc] init];
-    [tile setTemplate:urlTemplate];
+    [tile setUrlTemplate:urlTemplate];
     [tile setMaximumZ:  _maximumZ];
     [tile setMinimumZ: _minimumZ];
     [tile setOpacity: _opacity];
@@ -91,9 +91,9 @@
                        [NSNumber numberWithDouble:_MapX + (double)(x+1) * tile ],
                        [NSNumber numberWithDouble:_MapY - (double)y * tile ],
                        nil];
-    
+
     return result;
-    
+
 }
 
 - (UIImage *)tileForX:(NSUInteger)x y:(NSUInteger)y zoom:(NSUInteger)zoom
@@ -107,7 +107,7 @@
         return nil;
     }
     NSArray *bb = [self getBoundBox:x yAxis:y zoom:zoom];
-    NSMutableString *url = [self.template mutableCopy];
+    NSMutableString *url = [self.urlTemplate mutableCopy];
     [url replaceOccurrencesOfString: @"{minX}" withString:[NSString stringWithFormat:@"%@", bb[0]] options:0 range:NSMakeRange(0, url.length)];
     [url replaceOccurrencesOfString: @"{minY}" withString:[NSString stringWithFormat:@"%@", bb[1]] options:0 range:NSMakeRange(0, url.length)];
     [url replaceOccurrencesOfString: @"{maxX}" withString:[NSString stringWithFormat:@"%@", bb[2]] options:0 range:NSMakeRange(0, url.length)];

package/ios/AirGoogleMaps/RNMapsGoogleMapView.h

@@ -10,7 +10,7 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
-#import "RNMapsHostVewDelegate.h"
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
 
 @class AIRGoogleMap;
 

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);
@@ -428,6 +497,12 @@ using namespace facebook::react;
             _legacyMapManager.googleMapId = mapID;
         }
     }
+    if (oldViewProps.customMapStyleString != newViewProps.customMapStyleString) {
+        NSString* customStyle = RCTNSStringFromString(newViewProps.customMapStyleString);
+        if (customStyle && [customStyle length]){
+            _legacyMapManager.customMapStyle = customStyle;
+        }
+    }
     if (!newViewProps.zoomTapEnabled) {
         _legacyMapManager.zoomTapEnabled = newViewProps.zoomTapEnabled;
     } else {
@@ -452,7 +527,7 @@ using namespace facebook::react;
         _legacyMapManager.camera = camera;
     }
 
-    
+
 
     if (!_view){
         [self prepareContentView];
@@ -500,16 +575,18 @@ using namespace facebook::react;
 
 
     REMAP_MAPVIEW_PROP(pitchEnabled)
-    
     REMAP_MAPVIEW_PROP(zoomTapEnabled)
-    
     REMAP_MAPVIEW_PROP(scrollEnabled)
-    
+
+    REMAP_MAPVIEW_STRING_PROP(kmlSrc)
+    REMAP_MAPVIEW_STRING_PROP(customMapStyleString)
+
+
     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 +607,8 @@ using namespace facebook::react;
                                                                viewingAngle:newViewProps.camera.pitch];
         _view.cameraProp = camera;
       }
-    
-    
+
+
     REMAP_MAPVIEW_EDGEINSETS_PROP(mapPadding)
 
 
@@ -549,12 +626,15 @@ using namespace facebook::react;
             case RNMapsGoogleMapViewMapType::Hybrid:
                 _view.mapType = kGMSTypeHybrid;
                 break;
+            case RNMapsGoogleMapViewMapType::None:
+                _view.mapType = kGMSTypeNone;
+                break;
             default:
                 _view.mapType = kGMSTypeNormal;
                 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