react-native-maps 0.31.0 → 1.0.0-alpha.1

package/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m

@@ -11,7 +11,6 @@
 #import "AIRGoogleMapMarker.h"
 #import <MapKit/MapKit.h>
 #import <React/RCTUIManager.h>
-#import "RCTConvert+AirMap.h"
 
 @implementation AIRGoogleMapMarkerManager
 
@@ -52,6 +51,8 @@ RCT_EXPORT_VIEW_PROPERTY(opacity, double)
 RCT_EXPORT_VIEW_PROPERTY(onDragStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onDragEnd, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDeselect, RCTDirectEventBlock)
 
 RCT_EXPORT_METHOD(showCallout:(nonnull NSNumber *)reactTag)
 {
@@ -85,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/AIRGoogleMapOverlay.h

@@ -9,7 +9,6 @@
 #import <Foundation/Foundation.h>
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
-#import "AIRMapCoordinate.h"
 #import "AIRGoogleMap.h"
 
 @interface AIRGoogleMapOverlay : UIView

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.h

@@ -9,24 +9,25 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
 #import "AIRGMSPolygon.h"
-#import "AIRMapCoordinate.h"
+#import "AIRGoogleMapCoordinate.h"
+#import "AIRGoogleMap.h"
 
 @interface AIRGoogleMapPolygon : UIView
 
 @property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, strong) AIRGMSPolygon *polygon;
-@property (nonatomic, strong) NSArray<AIRMapCoordinate *> *coordinates;
-@property (nonatomic, strong) NSArray<NSArray<AIRMapCoordinate *> *> *holes;
+@property (nonatomic, strong) NSArray<AIRGoogleMapCoordinate *> *coordinates;
+@property (nonatomic, strong) NSArray<NSArray<AIRGoogleMapCoordinate *> *> *holes;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 
-@property (nonatomic, assign) UIColor *fillColor;
+@property (nonatomic, strong) UIColor *fillColor;
 @property (nonatomic, assign) double strokeWidth;
-@property (nonatomic, assign) UIColor *strokeColor;
+@property (nonatomic, strong) UIColor *strokeColor;
 @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,19 +9,70 @@
 #import "AIRGoogleMapPolygon.h"
 #import "AIRGMSPolygon.h"
 #import <GoogleMaps/GoogleMaps.h>
+#import "AIRGoogleMap.h"
 
 @implementation AIRGoogleMapPolygon
+{
+  BOOL _didMoveToWindow;
+}
 
 - (instancetype)init
 {
   if (self = [super init]) {
+    _didMoveToWindow = false;
     _polygon = [[AIRGMSPolygon alloc] init];
+    _polygon.fillColor = _fillColor;
+    _polygon.strokeColor = _strokeColor;
   }
 
   return self;
 }
 
-- (void)setCoordinates:(NSArray<AIRMapCoordinate *> *)coordinates
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+  if(_didMoveToWindow) return;
+  _didMoveToWindow = true;
+  if(_fillColor) {
+    _polygon.fillColor = _fillColor;
+  }
+  if(_strokeColor) {
+    _polygon.strokeColor = _strokeColor;
+  }
+  if(_strokeWidth) {
+    _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
 {
   _coordinates = coordinates;
 
@@ -34,7 +85,7 @@
   _polygon.path = path;
 }
 
-- (void)setHoles:(NSArray<NSArray<AIRMapCoordinate *> *> *)holes
+- (void)setHoles:(NSArray<NSArray<AIRGoogleMapCoordinate *> *> *)holes
 {
   _holes = holes;
 
@@ -58,19 +109,25 @@
 -(void)setFillColor:(UIColor *)fillColor
 {
   _fillColor = fillColor;
-  _polygon.fillColor = fillColor;
+  if(_didMoveToWindow) {
+    _polygon.fillColor = fillColor;
+  }
 }
 
 -(void)setStrokeWidth:(double)strokeWidth
 {
   _strokeWidth = strokeWidth;
-  _polygon.strokeWidth = strokeWidth;
+  if(_didMoveToWindow) {
+    _polygon.strokeWidth = strokeWidth;
+  }
 }
 
 -(void)setStrokeColor:(UIColor *) strokeColor
 {
   _strokeColor = strokeColor;
-  _polygon.strokeColor = strokeColor;
+  if(_didMoveToWindow) {
+    _polygon.strokeColor = strokeColor;
+  }
 }
 
 -(void)setGeodesic:(BOOL)geodesic

package/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m

@@ -13,8 +13,8 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTViewManager.h>
 #import <React/UIView+React.h>
-#import "RCTConvert+AirMap.h"
 #import "AIRGoogleMapPolygon.h"
+#import "RCTConvert+GMSMapViewType.h"
 
 @interface AIRGoogleMapPolygonManager()
 
@@ -31,8 +31,8 @@ RCT_EXPORT_MODULE()
   return polygon;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRMapCoordinateArray)
-RCT_EXPORT_VIEW_PROPERTY(holes, AIRMapCoordinateArrayArray)
+RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRGoogleMapCoordinateArray)
+RCT_EXPORT_VIEW_PROPERTY(holes, AIRGoogleMapCoordinateArrayArray)
 RCT_EXPORT_VIEW_PROPERTY(fillColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeWidth, double)
 RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)

package/ios/AirGoogleMaps/AIRGoogleMapPolyline.h

@@ -9,21 +9,22 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
 #import "AIRGMSPolyline.h"
-#import "AIRMapCoordinate.h"
 #import "AIRGoogleMapMarker.h"
 
+#import "AIRGoogleMapCoordinate.h"
+
 @interface AIRGoogleMapPolyline : UIView
 
 @property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, strong) AIRGMSPolyline *polyline;
-@property (nonatomic, strong) NSArray<AIRMapCoordinate *> *coordinates;
+@property (nonatomic, strong) NSArray<AIRGoogleMapCoordinate *> *coordinates;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
+@property (nonatomic, strong) GMSMapView *originalMap;
 
 @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

@@ -8,7 +8,6 @@
 #import <UIKit/UIKit.h>
 #import "AIRGoogleMapPolyline.h"
 #import "AIRGMSPolyline.h"
-#import "AIRMapCoordinate.h"
 #import "AIRGoogleMapMarker.h"
 #import "AIRGoogleMapMarkerManager.h"
 #import <GoogleMaps/GoogleMaps.h>
@@ -20,17 +19,24 @@
 {
   if (self = [super init]) {
     _polyline = [[AIRGMSPolyline alloc] init];
+    _polyline.strokeColor = _strokeColor;
   }
   return self;
 }
 
--(void)setCoordinates:(NSArray<AIRMapCoordinate *> *)coordinates
+-(void)setCoordinates:(NSArray<AIRGoogleMapCoordinate *> *)coordinates
 {
   _coordinates = coordinates;
 
   GMSMutablePath *path = [GMSMutablePath path];
-  for(int i = 0; i < coordinates.count; i++)
+
+  if (!coordinates || coordinates.count == 0)
   {
+    [path removeAllCoordinates];
+    return;
+  }
+
+  for (int i = 0; i < coordinates.count; i++) {
     [path addCoordinate:coordinates[i].coordinate];
   }
 
@@ -72,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/AIRGoogleMapPolylineManager.m

@@ -14,8 +14,8 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTViewManager.h>
 #import <React/UIView+React.h>
-#import "RCTConvert+AirMap.h"
 #import "AIRGoogleMapPolyline.h"
+#import "RCTConvert+GMSMapViewType.h"
 
 @interface AIRGoogleMapPolylineManager()
 
@@ -32,7 +32,7 @@ RCT_EXPORT_MODULE()
   return polyline;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRMapCoordinateArray)
+RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRGoogleMapCoordinateArray)
 RCT_EXPORT_VIEW_PROPERTY(fillColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeColors, UIColorArray)

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/RCTConvert+GMSMapViewType.h

@@ -9,9 +9,12 @@
 #import <Foundation/Foundation.h>
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTConvert.h>
+#import "AIRGoogleMapCoordinate.h"
 
 @interface RCTConvert (GMSMapViewType)
 + (GMSCameraPosition*)GMSCameraPositionWithDefaults:(id)json existingCamera:(GMSCameraPosition*)existingCamera;
++ (NSArray<NSArray<AIRGoogleMapCoordinate *> *> *)AIRGoogleMapCoordinateArrayArray:(id)json;
++ (AIRGoogleMapCoordinate *)AIRGoogleMapCoordinate:(id)json;
 @end
 
 #endif

package/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m

@@ -10,6 +10,7 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTConvert.h>
 #import <React/RCTConvert+CoreLocation.h>
+#import "AIRGoogleMapCoordinate.h"
 
 @implementation RCTConvert (GMSMapViewType)
   RCT_ENUM_CONVERTER(GMSMapViewType,
@@ -30,6 +31,23 @@
     return [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:nil];
 }
 
++ (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;
+}
+
+RCT_ARRAY_CONVERTER(AIRGoogleMapCoordinate)
+
++ (NSArray<NSArray<AIRGoogleMapCoordinate *> *> *)AIRGoogleMapCoordinateArrayArray:(id)json
+{
+    return RCTConvertArrayValue(@selector(AIRGoogleMapCoordinate:), json);
+}
+
+
 + (GMSCameraPosition*)GMSCameraPositionWithDefaults:(id)json existingCamera:(GMSCameraPosition*)existingCamera
 {
     CLLocationDegrees latitude = 0;

package/ios/AirGoogleMaps/RNMapsGoogleMapView.h

@@ -0,0 +1,29 @@
+//
+//  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>
+#if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
+#else
+#import "RNMapsHostVewDelegate.h"
+#endif
+@class AIRGoogleMap;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMapsGoogleMapView : RCTViewComponentView<RNMapsHostVewDelegate>
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif