react-native-maps 1.21.0-alpha.3 → 1.21.0-alpha.30

package/android/build.gradle

@@ -17,6 +17,19 @@ buildscript {
   }
 }
 
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
+}
+
 def isNewArchitectureEnabled() {
   return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
@@ -28,9 +41,7 @@ if (isNewArchitectureEnabled()) {
 apply plugin: 'kotlin-android'
 
 android {
-  namespace "com.rnmaps.maps"
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-  if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+  if (supportsNamespace()) {
     namespace "com.rnmaps.maps"
   }
 

package/android/src/main/java/com/rnmaps/fabric/NativeAirMapsModule.java

@@ -0,0 +1,51 @@
+package com.rnmaps.fabric;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+
+public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
+    public NativeAirMapsModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @Override
+    public void getCamera(double tag, Promise promise) {
+
+    }
+
+    @Override
+    public void getMarkersFrames(double tag, boolean onlyVisible, Promise promise) {
+
+    }
+
+    @Override
+    public void getMapBoundaries(double tag, Promise promise) {
+
+    }
+
+    @Override
+    public void takeSnapshot(double tag, ReadableMap config, Promise promise) {
+
+    }
+
+    @Override
+    public void getAddressFromCoordinates(double tag, ReadableMap coordinate, Promise promise) {
+
+    }
+
+    @Override
+    public void getPointForCoordinate(double tag, ReadableMap coordinate, Promise promise) {
+
+    }
+
+    @Override
+    public void getCoordinateForPoint(double tag, ReadableMap point, Promise promise) {
+
+    }
+}

package/android/src/main/java/com/rnmaps/maps/MapAirModulePackage.java

@@ -0,0 +1,46 @@
+package com.rnmaps.maps;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.TurboReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.rnmaps.fabric.NativeAirMapsModule;
+import com.rnmaps.fabric.NativeAirMapsModuleSpec;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MapAirModulePackage extends TurboReactPackage {
+
+    @Override
+    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (name.equals(NativeAirMapsModuleSpec.NAME)) {
+            return new NativeAirMapsModule(reactContext);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return new ReactModuleInfoProvider() {
+            @NonNull
+            @Override
+            public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                Map<String, ReactModuleInfo> map = new HashMap<>();
+                map.put(NativeAirMapsModuleSpec.NAME, new ReactModuleInfo(
+                        NativeAirMapsModuleSpec.NAME,       // name
+                        NativeAirMapsModuleSpec.NAME,       // className
+                        false, // canOverrideExistingModule
+                        false, // needsEagerInit
+                        false, // isCXXModule
+                        true   // isTurboModule
+                ));
+                return map;
+            }
+        };
+    }
+}

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -13,9 +13,10 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import "AIRGMSMarker.h"
-#import "RCTConvert+AirMap.h"
+#import "RNMapsAirModuleDelegate.h"
+#import "AIRGoogleMapCoordinate.h"
 
-@interface AIRGoogleMap : GMSMapView
+@interface AIRGoogleMap : GMSMapView <RNMapsAirModuleDelegate>
 
 // TODO: don't use MK region?
 @property (nonatomic, weak) RCTBridge *bridge;
@@ -66,6 +67,7 @@
 @property (nonatomic, assign) BOOL showsIndoorLevelPicker;
 @property (nonatomic, assign) NSString *kmlSrc;
 
+- (BOOL) isReady;
 - (void)didPrepareMap;
 - (void)mapViewDidFinishTileRendering;
 - (BOOL)didTapMarker:(GMSMarker *)marker;
@@ -84,6 +86,10 @@
 
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
 - (instancetype)initWithMapId:(NSString *)mapId initialCamera:(GMSCameraPosition*) camera backgroundColor:(UIColor *) backgroundColor andZoomTapEnabled:(BOOL)zoomTapEnabled;
+-(void) fitToSuppliedMarkers:(NSArray*) markers withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated;
+-(void) fitToCoordinates:(NSArray<AIRGoogleMapCoordinate *> *) coordinates withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated;
+-(void) fitToElementsWithEdgePadding:(nonnull NSDictionary *)edgePadding
+             animated:(BOOL)animated;
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -17,11 +17,12 @@
 #import "AIRGoogleMapUrlTile.h"
 #import "AIRGoogleMapWMSTile.h"
 #import "AIRGoogleMapOverlay.h"
+#import "AIRGoogleMapCoordinate.h"
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import <React/UIView+React.h>
 #import <React/RCTBridge.h>
-#import "RCTConvert+AirMap.h"
+#import <React/RCTConvert.h>
 #import <objc/runtime.h>
 
 #ifdef HAVE_GOOGLE_MAPS_UTILS
@@ -68,6 +69,7 @@ id regionAsJSON(MKCoordinateRegion region) {
   BOOL _didPrepareMap;
   BOOL _didCallOnMapReady;
   BOOL _zoomTapEnabled;
+  BOOL _isAnimating;
   NSString* _googleMapId;
 }
 
@@ -86,7 +88,7 @@ id regionAsJSON(MKCoordinateRegion region) {
         [options setCamera:camera];
     }
     self = [super initWithOptions:options];
- 
+
     if (self) {
     _reactSubviews = [NSMutableArray new];
     _markers = [NSMutableArray array];
@@ -145,6 +147,92 @@ id regionAsJSON(MKCoordinateRegion region) {
            };
 }
 
+- (BOOL) isReady {
+    return _didPrepareMap;
+}
+
+-(void) fitToCoordinates:(NSArray<AIRGoogleMapCoordinate *> *) coordinates withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated
+{
+    CLLocationCoordinate2D myLocation = coordinates.firstObject.coordinate;
+         GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
+
+         for (AIRGoogleMapCoordinate *coordinate in coordinates)
+           bounds = [bounds includingCoordinate:coordinate.coordinate];
+
+         // Set Map viewport
+         CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+         CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+         CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+         CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+         GMSCameraUpdate *cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
+
+         if (animated) {
+           [self animateWithCameraUpdate: cameraUpdate];
+         } else {
+           [self moveCamera: cameraUpdate];
+         }
+}
+
+-(void) fitToElementsWithEdgePadding:(nonnull NSDictionary *)edgePadding
+             animated:(BOOL)animated
+{
+    CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(self.markers.firstObject)).realMarker.position;
+    GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
+
+    for (AIRGoogleMapMarker *marker in self.markers)
+      bounds = [bounds includingCoordinate:marker.realMarker.position];
+
+      GMSCameraUpdate* cameraUpdate;
+
+      if ([edgePadding count] != 0) {
+          // Set Map viewport
+          CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+          CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+          CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+          CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+          cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
+      } else {
+          cameraUpdate = [GMSCameraUpdate fitBounds:bounds withPadding:55.0f];
+      }
+    if (animated) {
+      [self animateWithCameraUpdate: cameraUpdate];
+    } else {
+      [self moveCamera: cameraUpdate];
+    }
+}
+
+- (void) fitToSuppliedMarkers:(NSArray*) markers withEdgePadding:(NSDictionary*) edgePadding animated:(BOOL)animated
+{
+    NSPredicate *filterMarkers = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
+      AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)evaluatedObject;
+      return [marker isKindOfClass:[AIRGoogleMapMarker class]] && [markers containsObject:marker.identifier];
+    }];
+
+    NSArray *filteredMarkers = [self.markers filteredArrayUsingPredicate:filterMarkers];
+
+    CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(filteredMarkers.firstObject)).realMarker.position;
+    GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
+
+    for (AIRGoogleMapMarker *marker in filteredMarkers)
+      bounds = [bounds includingCoordinate:marker.realMarker.position];
+
+    // Set Map viewport
+    CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
+    CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
+    CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
+    CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
+
+    GMSCameraUpdate* cameraUpdate = [GMSCameraUpdate fitBounds:bounds withEdgeInsets:UIEdgeInsetsMake(top, left, bottom, right)];
+    if (animated) {
+      [self animateWithCameraUpdate:cameraUpdate
+       ];
+    } else {
+      [self moveCamera: cameraUpdate];
+    }
+}
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
 - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
@@ -152,12 +240,17 @@ id regionAsJSON(MKCoordinateRegion region) {
   // This is where we intercept them and do the appropriate underlying mapview action.
   if ([subview isKindOfClass:[AIRGoogleMapMarker class]]) {
     AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
-    marker.realMarker.map = self;
+    [marker didInsertInMap:self];
     [self.markers addObject:marker];
   } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
     AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
-    polygon.polygon.map = self;
+    [polygon didInsertInMap:self];
     [self.polygons addObject:polygon];
+      
+  } else if ([NSStringFromClass([subview class]) isEqualToString:@"RNMapsGooglePolygonView"]){
+//      RNMapsGooglePolygonView *polygon = (RNMapsGooglePolygonView*)subview;
+//      [polygon didInsertInMap:self];
+      [self.polygons addObject:subview];
   } else if ([subview isKindOfClass:[AIRGoogleMapPolyline class]]) {
     AIRGoogleMapPolyline *polyline = (AIRGoogleMapPolyline*)subview;
     polyline.polyline.map = self;
@@ -202,7 +295,9 @@ id regionAsJSON(MKCoordinateRegion region) {
     AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
     marker.realMarker.map = nil;
     [self.markers removeObject:marker];
-  } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
+  } else if ([NSStringFromClass([subview class]) isEqualToString:@"RNMapsGooglePolygonView"]) {
+      [self.polygons removeObject:subview];
+   } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
     AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
     polygon.polygon.map = nil;
     [self.polygons removeObject:polygon];
@@ -303,7 +398,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)setRegion:(MKCoordinateRegion)region {
-  // TODO: The JS component is repeatedly setting region unnecessarily. We might want to deal with that in here.
+    if (_isAnimating || !CLLocationCoordinate2DIsValid(region.center)) return;
   _region = region;
   if(_didLayoutSubviews) {
     self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self  andMKCoordinateRegion:region];
@@ -323,6 +418,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)setCameraProp:(GMSCameraPosition*)camera {
+    if (_isAnimating || !CLLocationCoordinate2DIsValid([camera target])) return;
     _initialCamera = camera;
     if(_didLayoutSubviews) {
       self.camera = camera;
@@ -404,6 +500,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)willMove:(BOOL)gesture {
+    _isAnimating = YES;
   id event = @{@"isGesture": [NSNumber numberWithBool:gesture]};
   if (self.onRegionChangeStart) self.onRegionChangeStart(event);
 }
@@ -437,6 +534,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
   if (self.onChange) self.onChange(event);  // complete
+    _isAnimating = NO;
 }
 
 - (void)setMapPadding:(UIEdgeInsets)mapPadding {
@@ -579,11 +677,11 @@ id regionAsJSON(MKCoordinateRegion region) {
   return self.settings.myLocationButton;
 }
 
-- (void)setMinZoomLevel:(CGFloat)minZoomLevel {
+- (void)setMinZoom:(CGFloat)minZoomLevel {
   [self setMinZoom:minZoomLevel maxZoom:self.maxZoom ];
 }
 
-- (void)setMaxZoomLevel:(CGFloat)maxZoomLevel {
+- (void)setMaxZoom:(CGFloat)maxZoomLevel {
   [self setMinZoom:self.minZoom maxZoom:maxZoomLevel ];
 }
 
@@ -610,7 +708,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     AIRGMSMarker *airMarker = (AIRGMSMarker *) self.selectedMarker;
     AIRGoogleMapMarker *fakeAirMarker = (AIRGoogleMapMarker *) airMarker.fakeMarker;
     AIRGoogleMapMarker *fakeSelectedMarker = (AIRGoogleMapMarker *) selectedMarker.fakeMarker;
-    
+
     if (airMarker && airMarker.onDeselect) {
         airMarker.onDeselect([fakeAirMarker makeEventData:@"marker-deselect"]);
     }
@@ -618,7 +716,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     if (airMarker && self.onMarkerDeselect) {
         self.onMarkerDeselect([fakeAirMarker makeEventData:@"marker-deselect"]);
     }
-    
+
     if (selectedMarker && selectedMarker.onSelect) {
         selectedMarker.onSelect([fakeSelectedMarker makeEventData:@"marker-select"]);
     }
@@ -665,6 +763,63 @@ id regionAsJSON(MKCoordinateRegion region) {
   return [map cameraForBounds:bounds insets:UIEdgeInsetsZero];
 }
 
+#pragma mark - RNMapsAirModuleDelegate
+
+- (NSDictionary *) getCoordinatesForPoint:(CGPoint)point
+{
+    CLLocationCoordinate2D coordinate = [self.projection coordinateForPoint:point];
+    return @{
+              @"latitude": @(coordinate.latitude),
+              @"longitude": @(coordinate.longitude),
+    };
+}
+
+- (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D)location
+{
+    CGPoint touchPoint = [self.projection pointForCoordinate:location];
+    return @{
+        @"x": @(touchPoint.x),
+        @"y": @(touchPoint.y),
+    };
+}
+
+-(void) takeSnapshotWithConfig:(NSDictionary *)config success:(RCTPromiseResolveBlock)success error:(RCTPromiseRejectBlock)error {
+    /* unused
+    NSNumber *width = [config objectForKey:@"width"];
+    NSNumber *height = [config objectForKey:@"height"];
+    */
+    NSNumber *quality = [config objectForKey:@"quality"];
+
+    NSString *format = [config objectForKey:@"format"];
+    NSString *result = [config objectForKey:@"result"];
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
+    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
+
+    // TODO: currently we are ignoring width, height, region
+
+    UIGraphicsBeginImageContextWithOptions(self.frame.size, YES, 0.0f);
+    [self.layer renderInContext:UIGraphicsGetCurrentContext()];
+    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+
+    NSData *data;
+    if ([format isEqualToString:@"png"]) {
+        data = UIImagePNGRepresentation(image);
+
+    } else if([format isEqualToString:@"jpg"]) {
+          data = UIImageJPEGRepresentation(image, quality.floatValue);
+    }
+
+    if ([result isEqualToString:@"file"]) {
+        [data writeToFile:filePath atomically:YES];
+        success(filePath);
+    } else if ([result isEqualToString:@"base64"]) {
+        success([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
+    }
+
+  UIGraphicsEndImageContext();
+}
+
 #pragma mark - Utils
 
 - (CGRect) frameForMarker:(AIRGoogleMapMarker*) mrkView {
@@ -1034,7 +1189,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 // do nothing, passed as options on initialization
 - (void)setLoadingBackgroundColor:(UIColor *)loadingBackgroundColor {
-    
+
 }
 
 

package/ios/AirGoogleMaps/AIRGoogleMapCircle.h

@@ -7,7 +7,6 @@
 #ifdef HAVE_GOOGLE_MAPS
 
 #import <GoogleMaps/GoogleMaps.h>
-#import "AIRMapCoordinate.h"
 
 @interface AIRGoogleMapCircle : UIView
 

package/ios/AirGoogleMaps/AIRGoogleMapCircle.m

@@ -25,20 +25,29 @@
   }
   return self;
 }
+- (void) prepare
+{
+    if(_didMoveToWindow) return;
+    _didMoveToWindow = true;
+    if(_fillColor) {
+      _circle.fillColor = _fillColor;
+    }
+    if(_strokeColor) {
+      _circle.strokeColor = _strokeColor;
+    }
+    if(_strokeWidth) {
+      _circle.strokeWidth = _strokeWidth;
+    }
+}
+- (void) didMoveToSuperview
+{
+    [super didMoveToSuperview];
+    [self prepare];
+}
 
 - (void)didMoveToWindow {
   [super didMoveToWindow];
-  if(_didMoveToWindow) return;
-  _didMoveToWindow = true;
-  if(_fillColor) {
-    _circle.fillColor = _fillColor;
-  }
-  if(_strokeColor) {
-    _circle.strokeColor = _strokeColor;
-  }
-  if(_strokeWidth) {
-    _circle.strokeWidth = _strokeWidth;
-  }
+    [self prepare];
 }
 
 - (void)setRadius:(double)radius

package/ios/AirGoogleMaps/AIRGoogleMapCoordinate.h

@@ -0,0 +1,13 @@
+//
+// Created by Leland Richardson on 12/27/15.
+// Copyright (c) 2015 Facebook. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <MapKit/MapKit.h>
+
+@interface AIRGoogleMapCoordinate : NSObject
+
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
+
+@end

package/ios/AirGoogleMaps/AIRGoogleMapCoordinate.m

@@ -0,0 +1,10 @@
+//
+// Created by Leland Richardson on 12/27/15.
+// Copyright (c) 2015 Facebook. All rights reserved.
+//
+
+#import "AIRGoogleMapCoordinate.h"
+
+
+@implementation AIRGoogleMapCoordinate
+@end

package/ios/AirGoogleMaps/AIRGoogleMapManager.h

@@ -9,8 +9,15 @@
 
 #import <React/RCTViewManager.h>
 
+@class GMSCameraPosition;
+
 @interface AIRGoogleMapManager : RCTViewManager
 
+@property (nonatomic, strong) NSString* googleMapId;
+@property (nonatomic) BOOL zoomTapEnabled;
+@property (nonatomic, strong) UIColor* backgroundColor;
+@property (nonatomic, strong) GMSCameraPosition* camera;
+
 @property (nonatomic, strong) NSDictionary *initialProps;
 
 @property (nonatomic) BOOL isGesture;