react-native-maps 1.21.0-alpha.8 → 1.21.0-alpha.9

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -13,10 +13,10 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import "AIRGMSMarker.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;

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -748,6 +748,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 callback:(RCTPromiseResolveBlock) callback
+{
+    /* 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"];
+    NSString *filePath = [config objectForKey:@"filePath"];
+
+    
+    // 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];
+        callback(filePath);
+    } else if ([result isEqualToString:@"base64"]) {
+          callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
+    }
+  
+  UIGraphicsEndImageContext();
+}
+
 #pragma mark - Utils
 
 - (CGRect) frameForMarker:(AIRGoogleMapMarker*) mrkView {

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -253,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];
@@ -264,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
 
@@ -310,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]);
     }
   }];
 }
@@ -337,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]);
     }
   }];
 }
@@ -373,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/RNMapsGoogleMapView.h

@@ -10,13 +10,13 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
+#import "RNMapsHostVewDelegate.h"
+
 @class AIRGoogleMap;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNMapsGoogleMapView : RCTViewComponentView
-
-- (AIRGoogleMap *) mapView;
+@interface RNMapsGoogleMapView : RCTViewComponentView<RNMapsHostVewDelegate>
 
 @end
 

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -34,7 +34,7 @@ using namespace facebook::react;
 }
 
 
-- (AIRGoogleMap *) mapView {
+- (id<RNMapsAirModuleDelegate>) mapView {
     return _view;
 }
 

package/ios/AirMaps/AIRMap.h

@@ -14,6 +14,8 @@
 #import "SMCalloutView.h"
 #import "RCTConvert+AirMap.h"
 #import "AIRMapCalloutSubview.h"
+#import "RNMapsAirModuleDelegate.h"
+
 @class AIRMapCoordinate;
 @class AIRMapMarker;
 
@@ -21,7 +23,7 @@ extern const NSTimeInterval AIRMapRegionChangeObserveInterval;
 extern const CGFloat AIRMapZoomBoundBuffer;
 extern const NSInteger AIRMapMaxZoomLevel;
 
-@interface AIRMap: MKMapView<SMCalloutViewDelegate>
+@interface AIRMap: MKMapView<SMCalloutViewDelegate, RNMapsAirModuleDelegate>
 
 @property (nonatomic, strong) SMCalloutView *calloutView;
 @property (nonatomic, strong) UIImageView *cacheImageView;

package/ios/AirMaps/AIRMap.m

@@ -20,6 +20,7 @@
 #import "AIRMapWMSTile.h"
 #import "AIRMapLocalTile.h"
 #import "AIRMapOverlay.h"
+#import "AIRMapSnapshot.h"
 
 const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
 const CGFloat AIRMapZoomBoundBuffer = 0.01;
@@ -218,29 +219,6 @@ MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordina
     return mrkFrame;
 }
 
-- (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
-    NSMutableDictionary* markersFrames = [NSMutableDictionary new];
-    for (AIRMapMarker* mrkAnn in self.markers) {
-        CGRect frame = [self frameForMarker:mrkAnn];
-        CGPoint point = [self convertCoordinate:mrkAnn.coordinate toPointToView:self];
-        NSDictionary* frameDict = @{
-            @"x": @(frame.origin.x),
-            @"y": @(frame.origin.y),
-            @"width": @(frame.size.width),
-            @"height": @(frame.size.height)
-        };
-        NSDictionary* pointDict = @{
-            @"x": @(point.x),
-            @"y": @(point.y)
-        };
-        NSString* k = mrkAnn.identifier;
-        BOOL isVisible = CGRectIntersectsRect(self.bounds, frame);
-        if (k != nil && (!onlyVisible || isVisible)) {
-            [markersFrames setObject:@{ @"frame": frameDict, @"point": pointDict } forKey:k];
-        }
-    }
-    return markersFrames;
-}
 
 - (AIRMapMarker*) markerAtPoint:(CGPoint)point {
     AIRMapMarker* mrk = nil;
@@ -334,7 +312,7 @@ MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordina
     return kSMCalloutViewRepositionDelayForUIScrollView;
 }
 
-#pragma mark Accessors
+#pragma mark RNMapsAirModuleDelegate.h
 
 - (NSArray *)getMapBoundaries
 {
@@ -354,6 +332,169 @@ MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordina
         ]
     ];
 }
+- (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location
+{
+    CGPoint touchPoint = [self convertCoordinate:location toPointToView:self];
+    
+    return @{
+              @"x": @(touchPoint.x),
+              @"y": @(touchPoint.y),
+    };
+}
+- (NSDictionary *) getCoordinatesForPoint:(CGPoint)point
+{
+    CLLocationCoordinate2D coordinate = [self convertPoint:point toCoordinateFromView:self];
+    return @{
+              @"latitude": @(coordinate.latitude),
+              @"longitude": @(coordinate.longitude),
+    };
+    
+}
+
+- (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
+    NSMutableDictionary* markersFrames = [NSMutableDictionary new];
+    for (AIRMapMarker* mrkAnn in self.markers) {
+        CGRect frame = [self frameForMarker:mrkAnn];
+        CGPoint point = [self convertCoordinate:mrkAnn.coordinate toPointToView:self];
+        NSDictionary* frameDict = @{
+            @"x": @(frame.origin.x),
+            @"y": @(frame.origin.y),
+            @"width": @(frame.size.width),
+            @"height": @(frame.size.height)
+        };
+        NSDictionary* pointDict = @{
+            @"x": @(point.x),
+            @"y": @(point.y)
+        };
+        NSString* k = mrkAnn.identifier;
+        BOOL isVisible = CGRectIntersectsRect(self.bounds, frame);
+        if (k != nil && (!onlyVisible || isVisible)) {
+            [markersFrames setObject:@{ @"frame": frameDict, @"point": pointDict } forKey:k];
+        }
+    }
+    return markersFrames;
+}
+
+- (NSDictionary *) getCamera {
+    MKMapCamera *camera = [self camera];
+    return @{
+              @"center": @{
+                      @"latitude": @(camera.centerCoordinate.latitude),
+                      @"longitude": @(camera.centerCoordinate.longitude),
+              },
+              @"pitch": @(camera.pitch),
+              @"heading": @(camera.heading),
+              @"altitude": @(camera.altitude),
+    };
+}
+- (void)takeSnapshotWithConfig:(NSDictionary *)config
+                      callback:(RCTPromiseResolveBlock) callback
+{
+    
+  MKMapSnapshotOptions *options = [[MKMapSnapshotOptions alloc] init];
+ 
+  options.mapType = self.mapType;
+  NSNumber *width = config[@"width"];
+  NSNumber *height = config[@"height"];
+  NSNumber *quality = config[@"quality"];
+  NSString*format =config[@"format"];
+  NSString*result =config[@"result"];
+  MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:config[@"region"]];
+ 
+
+  options.region = (region.center.latitude && region.center.longitude) ? region : self.region;
+  options.size = CGSizeMake(
+    ([width floatValue] == 0) ? self.bounds.size.width : [width floatValue],
+    ([height floatValue] == 0) ? self.bounds.size.height : [height floatValue]
+  );
+  
+  options.scale = [[UIScreen mainScreen] scale];
+
+
+  MKMapSnapshotter *snapshotter = [[MKMapSnapshotter alloc] initWithOptions:options];
+
+  [self takeMapSnapshot:snapshotter
+                 format:format
+                quality:[quality floatValue]
+                 result:result
+               callback:callback];
+}
+
+#pragma mark Take Snapshot
+- (void)takeMapSnapshot:(MKMapSnapshotter *) snapshotter
+        format:(NSString *)format
+        quality:(CGFloat) quality
+        result:(NSString *)result
+        callback:(RCTPromiseResolveBlock) callback {
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
+    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
+
+    [snapshotter startWithQueue:dispatch_get_main_queue()
+              completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
+                  if (error) {
+                      callback(@[error]);
+                      return;
+                  }
+                  MKAnnotationView *pin = [[MKPinAnnotationView alloc] initWithAnnotation:nil reuseIdentifier:nil];
+
+                  UIImage *image = snapshot.image;
+                  UIGraphicsBeginImageContextWithOptions(image.size, YES, image.scale);
+                  {
+                      [image drawAtPoint:CGPointMake(0.0f, 0.0f)];
+
+                      CGRect rect = CGRectMake(0.0f, 0.0f, image.size.width, image.size.height);
+
+                      for (id <AIRMapSnapshot> overlay in self.overlays) {
+                          if ([overlay respondsToSelector:@selector(drawToSnapshot:context:)]) {
+                                  [overlay drawToSnapshot:snapshot context:UIGraphicsGetCurrentContext()];
+                          }
+                      }
+                      
+                      for (id <MKAnnotation> annotation in self.annotations) {
+                          CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
+                          
+                          MKAnnotationView* anView = [self viewForAnnotation: annotation];
+                          
+                          if (anView){
+                              pin = anView;
+                          }
+                          
+                          if (CGRectContainsPoint(rect, point)) {
+                              point.x = point.x + pin.centerOffset.x - (pin.bounds.size.width / 2.0f);
+                              point.y = point.y + pin.centerOffset.y - (pin.bounds.size.height / 2.0f);
+                              if (pin.image) {
+                                  [pin.image drawAtPoint:point];
+                              } else {
+                                  CGRect pinRect = CGRectMake(point.x, point.y, pin.bounds.size.width, pin.bounds.size.height);
+                                  [pin drawViewHierarchyInRect:pinRect afterScreenUpdates:NO];
+                              }
+                          }
+                      }
+
+                      UIImage *compositeImage = UIGraphicsGetImageFromCurrentImageContext();
+
+                      NSData *data;
+                      if ([format isEqualToString:@"png"]) {
+                          data = UIImagePNGRepresentation(compositeImage);
+                      }
+                      else if([format isEqualToString:@"jpg"]) {
+                          data = UIImageJPEGRepresentation(compositeImage, quality);
+                      }
+
+                      if ([result isEqualToString:@"file"]) {
+                          [data writeToFile:filePath atomically:YES];
+                          callback(filePath);
+                      }
+                      else if ([result isEqualToString:@"base64"]) {
+                          callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
+                      }
+                  }
+                  UIGraphicsEndImageContext();
+              }];
+}
+
+
 
 - (void)setShowsUserLocation:(BOOL)showsUserLocation
 {

package/ios/AirMaps/RNMapsAirModule.mm

@@ -20,15 +20,15 @@
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
 
 - (void)executeWithMapView:(double)tag
-                   success:(void (^)(AIRMap *mapView))success
+                   success:(void (^)(id<RNMapsAirModuleDelegate> mapView))success
                    reject:(RCTPromiseRejectBlock)reject {
     dispatch_async(dispatch_get_main_queue(), ^{
         id view = [_viewRegistry_DEPRECATED viewForReactTag:[NSNumber numberWithDouble:tag]];
-        if (![view isKindOfClass:[RNMapsMapView class]]) {
-            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RNMapsMapView, got: %@", view], NULL);
+        if ([view conformsToProtocol:@protocol(RNMapsHostVewDelegate)]) {
+            id<RNMapsAirModuleDelegate> mapViewDelegate = [view mapView];
+            success(mapViewDelegate);
         } else {
-            AIRMap *mapView = [view mapView];
-            success(mapView);
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RNMapsMapView, got: %@", view], NULL);
         }
     });
 }
@@ -36,17 +36,8 @@
 - (void)getCamera:(double)tag
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject {
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-            MKMapCamera *camera = [mapView camera];
-            resolve(@{
-                      @"center": @{
-                              @"latitude": @(camera.centerCoordinate.latitude),
-                              @"longitude": @(camera.centerCoordinate.longitude),
-                      },
-                      @"pitch": @(camera.pitch),
-                      @"heading": @(camera.heading),
-                      @"altitude": @(camera.altitude),
-            });
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        resolve([mapView getCamera]);
     } reject:reject];
 
 }
@@ -56,7 +47,7 @@
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
         resolve([mapView getMarkersFramesWithOnlyVisible:onlyVisible]);
     } reject:reject];
 }
@@ -64,7 +55,7 @@
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
         resolve([mapView getMapBoundaries]);
     } reject:reject];
 }
@@ -73,42 +64,11 @@
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
-
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-          
-        MKMapSnapshotOptions *options = [[MKMapSnapshotOptions alloc] init];
-       
-        options.mapType = mapView.mapType;
-        NSNumber *width = config[@"width"];
-        NSNumber *height = config[@"height"];
-        NSNumber *quality = config[@"quality"];
-        NSString*format =config[@"format"];
-        NSString*result =config[@"result"];
-        MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:config[@"region"]];
-       
-     
-        options.region = (region.center.latitude && region.center.longitude) ? region : mapView.region;
-        options.size = CGSizeMake(
-          ([width floatValue] == 0) ? mapView.bounds.size.width : [width floatValue],
-          ([height floatValue] == 0) ? mapView.bounds.size.height : [height floatValue]
-        );
-        
-        options.scale = [[UIScreen mainScreen] scale];
-
-
-        MKMapSnapshotter *snapshotter = [[MKMapSnapshotter alloc] initWithOptions:options];
-
-        [self takeMapSnapshot:mapView
-            snapshotter:snapshotter
-            format:format
-            quality:[quality floatValue]
-            result:result
-            callback:resolve];
-        
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        [mapView takeSnapshotWithConfig:config callback:resolve];
     } reject:reject];
-    
-   
 }
+
 - (void)getAddressFromCoordinates:(double)tag
                        coordinate:(JS::NativeAirMapsModule::LatLng &)coordinate
                           resolve:(RCTPromiseResolveBlock)resolve
@@ -117,32 +77,30 @@
     double latitude = coordinate.latitude();
     double longitude = coordinate.longitude();
     
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-        CLLocation *location = [[CLLocation alloc] initWithLatitude:latitude
+  
+    CLLocation *location = [[CLLocation alloc] initWithLatitude:latitude
                                                           longitude:longitude];
-        CLGeocoder *geoCoder = [[CLGeocoder alloc] init];
-        [geoCoder reverseGeocodeLocation:location
+    CLGeocoder *geoCoder = [[CLGeocoder alloc] init];
+    [geoCoder reverseGeocodeLocation:location
                        completionHandler:^(NSArray *placemarks, NSError *error) {
-            if (error == nil && [placemarks count] > 0){
-                CLPlacemark *placemark = placemarks[0];
-                resolve(@{
-                    @"name" : [NSString stringWithFormat:@"%@", placemark.name],
-                    @"thoroughfare" : [NSString stringWithFormat:@"%@", placemark.thoroughfare],
-                    @"subThoroughfare" : [NSString stringWithFormat:@"%@", placemark.subThoroughfare],
-                    @"locality" : [NSString stringWithFormat:@"%@", placemark.locality],
-                    @"subLocality" : [NSString stringWithFormat:@"%@", placemark.subLocality],
-                    @"administrativeArea" : [NSString stringWithFormat:@"%@", placemark.administrativeArea],
-                    @"subAdministrativeArea" : [NSString stringWithFormat:@"%@", placemark.subAdministrativeArea],
-                    @"postalCode" : [NSString stringWithFormat:@"%@", placemark.postalCode],
-                    @"countryCode" : [NSString stringWithFormat:@"%@", placemark.ISOcountryCode],
-                    @"country" : [NSString stringWithFormat:@"%@", placemark.country],
-                });
-            } else {
-                reject(@"Invalid argument", [NSString stringWithFormat:@"Can not get address location"], NULL);
-            }
-        }];
-        
-    } reject:reject];
+        if (error == nil && [placemarks count] > 0){
+            CLPlacemark *placemark = placemarks[0];
+            resolve(@{
+                @"name" : [NSString stringWithFormat:@"%@", placemark.name],
+                @"thoroughfare" : [NSString stringWithFormat:@"%@", placemark.thoroughfare],
+                @"subThoroughfare" : [NSString stringWithFormat:@"%@", placemark.subThoroughfare],
+                @"locality" : [NSString stringWithFormat:@"%@", placemark.locality],
+                @"subLocality" : [NSString stringWithFormat:@"%@", placemark.subLocality],
+                @"administrativeArea" : [NSString stringWithFormat:@"%@", placemark.administrativeArea],
+                @"subAdministrativeArea" : [NSString stringWithFormat:@"%@", placemark.subAdministrativeArea],
+                @"postalCode" : [NSString stringWithFormat:@"%@", placemark.postalCode],
+                @"countryCode" : [NSString stringWithFormat:@"%@", placemark.ISOcountryCode],
+                @"country" : [NSString stringWithFormat:@"%@", placemark.country],
+            });
+        } else {
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Can not get address location"], NULL);
+        }
+    }];
 }
 
 - (void)getPointForCoordinate:(double)tag
@@ -153,16 +111,10 @@
     double latitude = coordinate.latitude();
     double longitude = coordinate.longitude();
     
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    CLLocationCoordinate2D location = CLLocationCoordinate2DMake(latitude,longitude);
     
-        CGPoint touchPoint = [mapView convertCoordinate:
-                              CLLocationCoordinate2DMake(latitude,longitude)
-                                          toPointToView:mapView];
-
-        resolve(@{
-                  @"x": @(touchPoint.x),
-                  @"y": @(touchPoint.y),
-                  });
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        resolve([mapView getPointForCoordinates:location]);
         
     } reject:reject];
     
@@ -174,20 +126,10 @@
 {
     double x = point.x();
     double y = point.y();
-    
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-    
-       
-        CLLocationCoordinate2D coordinate = [mapView convertPoint:CGPointMake(x,y)
-            toCoordinateFromView:mapView];
-
-            resolve(@{
-                      @"latitude": @(coordinate.latitude),
-                      @"longitude": @(coordinate.longitude),
-                      });
-        
+    CGPoint pt = CGPointMake(x,y);
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        resolve([mapView getCoordinatesForPoint:pt]);
     } reject:reject];
-    
    
 }
 
@@ -201,80 +143,7 @@
     return nil;
 }
 
-#pragma mark Take Snapshot
-- (void)takeMapSnapshot:(AIRMap *)mapView
-        snapshotter:(MKMapSnapshotter *) snapshotter
-        format:(NSString *)format
-        quality:(CGFloat) quality
-        result:(NSString *)result
-        callback:(RCTPromiseResolveBlock) callback {
-    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
-    NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
-    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
-
-    [snapshotter startWithQueue:dispatch_get_main_queue()
-              completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
-                  if (error) {
-                      callback(@[error]);
-                      return;
-                  }
-                  MKAnnotationView *pin = [[MKPinAnnotationView alloc] initWithAnnotation:nil reuseIdentifier:nil];
-
-                  UIImage *image = snapshot.image;
-                  UIGraphicsBeginImageContextWithOptions(image.size, YES, image.scale);
-                  {
-                      [image drawAtPoint:CGPointMake(0.0f, 0.0f)];
-
-                      CGRect rect = CGRectMake(0.0f, 0.0f, image.size.width, image.size.height);
 
-                      for (id <AIRMapSnapshot> overlay in mapView.overlays) {
-                          if ([overlay respondsToSelector:@selector(drawToSnapshot:context:)]) {
-                                  [overlay drawToSnapshot:snapshot context:UIGraphicsGetCurrentContext()];
-                          }
-                      }
-                      
-                      for (id <MKAnnotation> annotation in mapView.annotations) {
-                          CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
-                          
-                          MKAnnotationView* anView = [mapView viewForAnnotation: annotation];
-                          
-                          if (anView){
-                              pin = anView;
-                          }
-                          
-                          if (CGRectContainsPoint(rect, point)) {
-                              point.x = point.x + pin.centerOffset.x - (pin.bounds.size.width / 2.0f);
-                              point.y = point.y + pin.centerOffset.y - (pin.bounds.size.height / 2.0f);
-                              if (pin.image) {
-                                  [pin.image drawAtPoint:point];
-                              } else {
-                                  CGRect pinRect = CGRectMake(point.x, point.y, pin.bounds.size.width, pin.bounds.size.height);
-                                  [pin drawViewHierarchyInRect:pinRect afterScreenUpdates:NO];
-                              }
-                          }
-                      }
-
-                      UIImage *compositeImage = UIGraphicsGetImageFromCurrentImageContext();
-
-                      NSData *data;
-                      if ([format isEqualToString:@"png"]) {
-                          data = UIImagePNGRepresentation(compositeImage);
-                      }
-                      else if([format isEqualToString:@"jpg"]) {
-                          data = UIImageJPEGRepresentation(compositeImage, quality);
-                      }
-
-                      if ([result isEqualToString:@"file"]) {
-                          [data writeToFile:filePath atomically:YES];
-                          callback(filePath);
-                      }
-                      else if ([result isEqualToString:@"base64"]) {
-                          callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
-                      }
-                  }
-                  UIGraphicsEndImageContext();
-              }];
-}
 
 @end
 

package/ios/AirMaps/RNMapsMapView.h

@@ -9,13 +9,13 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
+#import "RNMapsHostVewDelegate.h"
+
 @class AIRMap;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNMapsMapView : RCTViewComponentView
-
-- (AIRMap *) mapView;
+@interface RNMapsMapView : RCTViewComponentView<RNMapsHostVewDelegate>
 
 @end
 

package/ios/AirMaps/RNMapsMapView.mm

@@ -29,7 +29,7 @@ using namespace facebook::react;
 }
 
 
-- (AIRMap *) mapView {
+- (id<RNMapsAirModuleDelegate>) mapView {
     return _view;
 }
 

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.8",
+  "version": "1.21.0-alpha.9",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",