react-native-maps 1.21.0-alpha.10 → 1.21.0-alpha.100

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.h

@@ -10,6 +10,7 @@
 #import <React/RCTBridge.h>
 #import "AIRGMSPolygon.h"
 #import "AIRGoogleMapCoordinate.h"
+#import "AIRGoogleMap.h"
 
 @interface AIRGoogleMapPolygon : UIView
 
@@ -26,7 +27,7 @@
 @property (nonatomic, assign) BOOL geodesic;
 @property (nonatomic, assign) int zIndex;
 @property (nonatomic, assign) BOOL tappable;
-
+- (void) didInsertInMap:(AIRGoogleMap *) map;
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.m

@@ -9,6 +9,7 @@
 #import "AIRGoogleMapPolygon.h"
 #import "AIRGMSPolygon.h"
 #import <GoogleMaps/GoogleMaps.h>
+#import "AIRGoogleMap.h"
 
 @implementation AIRGoogleMapPolygon
 {
@@ -41,6 +42,35 @@
     _polygon.strokeWidth = _strokeWidth;
   }
 }
+- (void) didInsertInMap:(AIRGoogleMap *) map
+{
+    _polygon = [AIRGMSPolygon new];
+
+    if (_identifier){
+        [_polygon setIdentifier:_identifier];
+    }
+
+    [_polygon setTappable:_tappable];
+    if (_strokeColor){
+        _polygon.strokeColor = _strokeColor;
+    }
+    if (_fillColor){
+        _polygon.fillColor = _fillColor;
+    }
+    if (_strokeWidth){
+        _polygon.strokeWidth = _strokeWidth;
+    }
+    if (_coordinates){
+        [self setCoordinates:_coordinates];
+    }
+    if (_holes){
+        [self setHoles:_holes];
+    }
+    if (_zIndex){
+        _polygon.zIndex = _zIndex;
+    }
+    [_polygon setMap:map];
+}
 
 - (void)setCoordinates:(NSArray<AIRGoogleMapCoordinate *> *)coordinates
 {

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/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];
@@ -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/RCTConvert+GMSMapViewType.m

@@ -33,6 +33,8 @@
 
 + (AIRGoogleMapCoordinate *)AIRGoogleMapCoordinate:(id)json
 {
+    // empty coordinates
+    if ([json isKindOfClass:[NSArray class]] && [json count] == 0) return nil;
     AIRGoogleMapCoordinate *coord = [AIRGoogleMapCoordinate new];
     coord.coordinate = [self CLLocationCoordinate2D:json];
     return coord;

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,20 +8,19 @@
 #ifdef HAVE_GOOGLE_MAPS
 
 #import "RNMapsGoogleMapView.h"
-#import "AirGoogleMap.h"
+#import "RNMapsGooglePolygonView.h"
+#import "AIRGoogleMap.h"
 #import "AIRMapMarker.h"
-#import "AirGoogleMapManager.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 "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
 #import "RCTConvert+GMSMapViewType.h"
 #import "RCTConvert+AirMap.h"
-
+#import "UIView+AirMap.h"
 
 using namespace facebook::react;
 
@@ -32,6 +31,7 @@ using namespace facebook::react;
     AIRGoogleMap *_view;
     AIRGoogleMapManager* _legacyMapManager;
     NSMutableDictionary<NSNumber*, UIView*>* _pendingInsertsSubviews;
+    NSMutableArray *_polygons;
 }
 
 
@@ -43,11 +43,12 @@ using namespace facebook::react;
 - (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration{
     NSDictionary* regionDic = [RCTConvert dictonaryFromString:regionJSON];
     MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:regionDic];
-    [CATransaction begin];
-    [CATransaction setAnimationDuration:duration/1000];
     GMSCameraPosition *camera = [AIRGoogleMap makeGMSCameraPositionFromMap:_view andMKCoordinateRegion:region];
-    [self->_view animateToCameraPosition:camera];
-    [CATransaction commit];
+    if (duration == 0){
+        [_view setRegion:region];
+    } else {
+        [_view animateToCameraPosition:camera];
+    }
 }
 - (void)setCamera:(NSString *)cameraJSON{
     NSDictionary* cameraDic = [RCTConvert dictonaryFromString:cameraJSON];
@@ -80,9 +81,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
 
@@ -111,9 +122,10 @@ using namespace facebook::react;
 }
 
 - (void) prepareContentView {
-   
+
     _view = (AIRGoogleMap *)[_legacyMapManager view];
-    
+    _polygons = [NSMutableArray new];
+
     self.contentView = _view;
 
       _view.onPress = [self](NSDictionary* dictionary) {
@@ -143,7 +155,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onPress(data);
           }
       };
-    
+
     _view.onLongPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -180,7 +192,40 @@ 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::OnIndoorLevelActivatedIndoorLevel level = {
+                .activeLevelIndex= (int) [dictionary[@"activeLevelIndex"] integerValue],
+                .name = [dictionary[@"name"] UTF8String],
+                .shortName = [dictionary[@"shortName"] UTF8String],
+            };
+
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorLevelActivated data = {
+                .indoorLevel = level,
+            };
+            mapViewEventEmitter->onIndoorLevelActivated(data);
+        }
+    };
+
+    _view.onIndoorBuildingFocused = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
+
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorBuildingFocusedIndoorBuilding indoorBuilding = {
+                .underground = [dictionary[@"underground"] boolValue],
+                .activeLevelIndex = (int) [dictionary[@"activeLevelIndex"] integerValue]
+            };
+
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorBuildingFocused data = {
+                .indoorBuilding = indoorBuilding
+            };
+            mapViewEventEmitter->onIndoorBuildingFocused(data);
+        }
+    };
+
     _view.onMapLoaded = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
@@ -188,7 +233,7 @@ using namespace facebook::react;
             mapViewEventEmitter->onMapLoaded(data);
         }
     };
-      
+
       _view.onKmlReady = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -256,7 +301,7 @@ using namespace facebook::react;
               if (errorDict){
                   str = errorDict[@"message"];
               }
-              
+
               facebook::react::RNMapsGoogleMapViewEventEmitter::OnUserLocationChangeError error = {
                   .message = std::string([str UTF8String]),
               };
@@ -271,6 +316,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) {
@@ -288,7 +362,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onRegionChangeStart(data);
           }
       };
-      
+
       _view.onRegionChange = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -304,7 +378,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onRegionChange(data);
           }
       };
-      
+
       _view.onRegionChangeComplete = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -380,44 +454,60 @@ using namespace facebook::react;
   return self;
 }
 
-- (id)getPaperViewFromChildComponentView:(UIView *)childComponentView {
-    // Check if the childComponentView responds to the "adapter" selector
-    if ([childComponentView respondsToSelector:@selector(paperView)]) {
-        // Safely return the paperView
-        return [childComponentView valueForKey:@"paperView"];
-    }
-    // Return nil if paperView is not accessible
-    return nil;
-}
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index{
-    id<RCTComponent> paperView = [self getPaperViewFromChildComponentView:childComponentView];
+    id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
     if (paperView){
         if(_view && [_view isReady]){
             [_view insertReactSubview:paperView atIndex:index];
         } else {
             [_pendingInsertsSubviews setObject:paperView forKey:[NSNumber numberWithInteger:index]];
         }
+    } else {
+        [_view insertReactSubview:childComponentView atIndex:index];
+        if ([childComponentView isKindOfClass:[RNMapsGooglePolygonView class]]){
+            RNMapsGooglePolygonView* polygon = (RNMapsGooglePolygonView *) childComponentView;
+            [_polygons addObject:childComponentView];
+            [polygon didInsertInMap:_view];
+        }
     }
 }
+
 - (void) unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-    id<RCTComponent> paperView = [self getPaperViewFromChildComponentView:childComponentView];
+    id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
     if (paperView){
         if(_view && [_view isReady]){
             [_view removeReactSubview:paperView];
         } else {
             [_pendingInsertsSubviews removeObjectForKey:[NSNumber numberWithInteger:index]];
         }
+    } else {
+        [_view removeReactSubview:childComponentView];
+        if ([childComponentView isKindOfClass:[RNMapsGooglePolygonView class]]){
+            RNMapsGooglePolygonView* polygon = (RNMapsGooglePolygonView *) childComponentView;
+            [_polygons removeObject:childComponentView];
+            [polygon didRemoveFromMap];
+        }
     }
 }
+- (void) prepareForRecycle
+{
+    [super prepareForRecycle];
+    static const auto defaultProps = std::make_shared<const RNMapsGoogleMapViewProps>();
+    _props = defaultProps;
+    _legacyMapManager = [[AIRGoogleMapManager alloc] init];
+      _pendingInsertsSubviews = [NSMutableDictionary new];
+    [_view removeFromSuperview];
+    _view = nil;
+}
 
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
   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);
@@ -449,7 +539,7 @@ using namespace facebook::react;
         _legacyMapManager.camera = camera;
     }
 
-    
+
 
     if (!_view){
         [self prepareContentView];
@@ -483,20 +573,6 @@ using namespace facebook::react;
         _view.name = region;                                                 \
     }
 
-#define REMAP_GOOGLEMAPVIEW_CAMERA_PROP(name)                                    \
-    if (newViewProps.name.center.latitude != oldViewProps.name.center.latitude || \
-        newViewProps.name.center.longitude != oldViewProps.name.center.longitude || \
-        newViewProps.name.heading != oldViewProps.name.heading ||         \
-        newViewProps.name.pitch != oldViewProps.name.pitch ||             \
-        newViewProps.name.zoom != oldViewProps.name.zoom) {               \
-        GMSCameraPosition* camera = [GMSCameraPosition cameraWithLatitude:newViewProps.name.center.latitude \
-                                                                longitude:newViewProps.name.center.longitude \
-                                                                     zoom:newViewProps.name.zoom   \
-                                                                  bearing:newViewProps.name.heading  \
-                                                             viewingAngle:newViewProps.name.pitch]; \
-        _view.name = camera;                                              \
-    }
-
 
 #define REMAP_MAPVIEW_EDGEINSETS_PROP(name)                               \
     if (newViewProps.name.top != oldViewProps.name.top ||                 \
@@ -511,16 +587,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)
@@ -529,9 +605,20 @@ using namespace facebook::react;
     REMAP_MAPVIEW_REGION_PROP(region)
     REMAP_MAPVIEW_REGION_PROP(initialRegion)
 
-    REMAP_GOOGLEMAPVIEW_CAMERA_PROP(camera)
-    
-    
+    if (newViewProps.camera.center.latitude != oldViewProps.camera.center.latitude ||
+          newViewProps.camera.center.longitude != oldViewProps.camera.center.longitude ||
+          newViewProps.camera.heading != oldViewProps.camera.heading ||
+          newViewProps.camera.pitch != oldViewProps.camera.pitch ||
+          newViewProps.camera.zoom != oldViewProps.camera.zoom) {
+          GMSCameraPosition* camera = [GMSCameraPosition cameraWithLatitude:newViewProps.camera.center.latitude
+                                                                  longitude:newViewProps.camera.center.longitude
+                                                                       zoom:newViewProps.camera.zoom
+                                                                    bearing:newViewProps.camera.heading
+                                                               viewingAngle:newViewProps.camera.pitch];
+        _view.cameraProp = camera;
+      }
+
+
     REMAP_MAPVIEW_EDGEINSETS_PROP(mapPadding)
 
 
@@ -545,14 +632,16 @@ using namespace facebook::react;
                 break;
             case RNMapsGoogleMapViewMapType::Terrain:
                 _view.mapType = kGMSTypeTerrain;
+                break;
             case RNMapsGoogleMapViewMapType::Hybrid:
                 _view.mapType = kGMSTypeHybrid;
+                break;
             default:
                 _view.mapType = kGMSTypeNormal;
                 break;
         }
     }
-    
+
     if (oldViewProps.userInterfaceStyle != newViewProps.userInterfaceStyle){
         switch (newViewProps.userInterfaceStyle) {
             case RNMapsGoogleMapViewUserInterfaceStyle::Light:

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