react-native-maps 1.21.0-alpha.2 → 1.21.0-alpha.21

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -19,14 +19,9 @@
 #import <React/UIView+React.h>
 #import "RCTConvert+GMSMapViewType.h"
 #import "AIRGoogleMap.h"
-#import "AIRMapMarker.h"
-#import "AIRMapPolyline.h"
-#import "AIRMapPolygon.h"
-#import "AIRMapCircle.h"
-#import "SMCalloutView.h"
 #import "AIRGoogleMapMarker.h"
-#import "RCTConvert+AirMap.h"
-
+#import "AIRGoogleMapCoordinate.h"
+#import "RCTConvert+GMSMapViewType.h"
 #import <MapKit/MapKit.h>
 #import <QuartzCore/QuartzCore.h>
 
@@ -45,26 +40,22 @@ RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {
-  NSString* googleMapId  = nil;
-  BOOL zoomTapEnabled = YES;
-  UIColor* backgroundColor = nil;
-  GMSCameraPosition* camera = nil;
 
   if (self.initialProps){
       if (self.initialProps[@"googleMapId"]){
-          googleMapId  = self.initialProps[@"googleMapId"];
+          _googleMapId  = self.initialProps[@"googleMapId"];
       }
       if (self.initialProps[@"zoomTapEnabled"]){
-          zoomTapEnabled = self.initialProps[@"zoomTapEnabled"];
+          _zoomTapEnabled = self.initialProps[@"zoomTapEnabled"];
       }
       if (self.initialProps[@"loadingBackgroundColor"]){
-          backgroundColor = [RCTConvert UIColor:self.initialProps[@"loadingBackgroundColor"]];
+          _backgroundColor = [RCTConvert UIColor:self.initialProps[@"loadingBackgroundColor"]];
       }
       if (self.initialProps[@"initialCamera"]){
-          camera = [RCTConvert GMSCameraPositionWithDefaults:self.initialProps[@"initialCamera"] existingCamera:nil];
+          _camera = [RCTConvert GMSCameraPositionWithDefaults:self.initialProps[@"initialCamera"] existingCamera:nil];
       }
   }
-  AIRGoogleMap *map = [[AIRGoogleMap alloc] initWithMapId:googleMapId initialCamera:camera backgroundColor:backgroundColor andZoomTapEnabled:zoomTapEnabled];
+  AIRGoogleMap *map = [[AIRGoogleMap alloc] initWithMapId:self.googleMapId initialCamera:self.camera backgroundColor:self.backgroundColor andZoomTapEnabled:self.zoomTapEnabled];
   map.bridge = self.bridge;
   map.delegate = self;
   map.isAccessibilityElement = NO;
@@ -217,32 +208,8 @@ RCT_EXPORT_METHOD(fitToElements:(nonnull NSNumber *)reactTag
     if (![view isKindOfClass:[AIRGoogleMap class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(mapView.markers.firstObject)).realMarker.position;
-      GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
-
-      for (AIRGoogleMapMarker *marker in mapView.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) {
-        [mapView animateWithCameraUpdate: cameraUpdate];
-      } else {
-        [mapView moveCamera: cameraUpdate];
-      }
+        AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+        [mapView fitToElementsWithEdgePadding:edgePadding animated:animated];
     }
   }];
 }
@@ -257,40 +224,14 @@ RCT_EXPORT_METHOD(fitToSuppliedMarkers:(nonnull NSNumber *)reactTag
     if (![view isKindOfClass:[AIRGoogleMap class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      NSPredicate *filterMarkers = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
-        AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)evaluatedObject;
-        return [marker isKindOfClass:[AIRGoogleMapMarker class]] && [markers containsObject:marker.identifier];
-      }];
-
-      NSArray *filteredMarkers = [mapView.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) {
-        [mapView animateWithCameraUpdate:cameraUpdate
-         ];
-      } else {
-        [mapView moveCamera: cameraUpdate];
-      }
+        AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+        [mapView fitToSuppliedMarkers:markers withEdgePadding:edgePadding animated:animated];
     }
   }];
 }
 
 RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
-                  coordinates:(nonnull NSArray<AIRMapCoordinate *> *)coordinates
+                  coordinates:(nonnull NSArray<AIRGoogleMapCoordinate *> *)coordinates
                   edgePadding:(nonnull NSDictionary *)edgePadding
                   animated:(BOOL)animated)
 {
@@ -300,26 +241,7 @@ RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
       RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
     } else {
       AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      CLLocationCoordinate2D myLocation = coordinates.firstObject.coordinate;
-      GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
-
-      for (AIRMapCoordinate *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) {
-        [mapView animateWithCameraUpdate: cameraUpdate];
-      } else {
-        [mapView moveCamera: cameraUpdate];
-      }
+        [mapView fitToCoordinates:coordinates withEdgePadding:edgePadding animated:animated];
     }
   }];
 }
@@ -331,7 +253,7 @@ RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
                   format:(nonnull NSString *)format
                   quality:(nonnull NSNumber *)quality
                   result:(nonnull NSString *)result
-                  withCallback:(RCTResponseSenderBlock)callback)
+                  withCallback:(RCTPromiseResolveBlock)callback)
 {
   NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
   NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
@@ -342,7 +264,17 @@ RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
     if (![view isKindOfClass:[AIRGoogleMap class]]) {
         RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+        AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+        NSMutableDictionary* config = [NSMutableDictionary new];
+        
+        [mapView takeSnapshotWithConfig:config callback:callback];
+        
+        [config setObject:width forKey:@"width"];
+        [config setObject:height forKey:@"height"];
+        [config setObject:format forKey:@"format"];
+        [config setObject:quality forKey:@"quality"];
+        [config setObject:result forKey:@"result"];
+        [config setObject:filePath forKey:@"filePath"];
 
       // TODO: currently we are ignoring width, height, region
 
@@ -388,13 +320,7 @@ RCT_EXPORT_METHOD(pointForCoordinate:(nonnull NSNumber *)reactTag
       RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
     } else {
       AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      CGPoint touchPoint = [mapView.projection pointForCoordinate:coord];
-
-      resolve(@{
-                @"x": @(touchPoint.x),
-                @"y": @(touchPoint.y),
-                });
+        resolve([mapView getPointForCoordinates:coord]);
     }
   }];
 }
@@ -415,13 +341,7 @@ RCT_EXPORT_METHOD(coordinateForPoint:(nonnull NSNumber *)reactTag
       RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
     } else {
       AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-
-      CLLocationCoordinate2D coordinate = [mapView.projection coordinateForPoint:pt];
-
-      resolve(@{
-                @"latitude": @(coordinate.latitude),
-                @"longitude": @(coordinate.longitude),
-                });
+        resolve([view getCoordinatesForPoint:pt]);
     }
   }];
 }
@@ -451,18 +371,7 @@ RCT_EXPORT_METHOD(getMapBoundaries:(nonnull NSNumber *)reactTag
     if (![view isKindOfClass:[AIRGoogleMap class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
     } else {
-        NSArray *boundingBox = [view getMapBoundaries];
-
-        resolve(@{
-          @"northEast" : @{
-            @"longitude" : boundingBox[0][0],
-            @"latitude" : boundingBox[0][1]
-          },
-          @"southWest" : @{
-            @"longitude" : boundingBox[1][0],
-            @"latitude" : boundingBox[1][1]
-          }
-        });
+        resolve([view getMapBoundaries]);
     }
   }];
 }

package/ios/AirGoogleMaps/AIRGoogleMapMarker.h

@@ -53,6 +53,8 @@
 - (void)didDragMarker:(AIRGMSMarker *)marker;
 - (id)makeEventData;
 - (id)makeEventData:(NSString *)action;
+- (UIView *) iconView;
+- (void) didInsertInMap:(AIRGoogleMap *) map;
 @end
 
 #endif