react-native-maps 2.0.0-beta.4 → 2.0.0-beta.6

package/ios/{AirGoogleMaps/AIRGoogleMapURLTileManager.m → GoogleMaps/RNMGoogleMapUrlTileManager.m}

@@ -1,24 +1,24 @@
 //
-//  AIRGoogleMapURLTileManager.m
+//  RNMGoogleMapURLTileManager.m
 //  Created by Nick Italiano on 11/5/16.
 //
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGoogleMapUrlTileManager.h"
-#import "AIRGoogleMapUrlTile.h"
+#import "RNMGoogleMapUrlTileManager.h"
+#import "RNMGoogleMapUrlTile.h"
 
-@interface AIRGoogleMapUrlTileManager()
+@interface RNMGoogleMapUrlTileManager()
 
 @end
 
-@implementation AIRGoogleMapUrlTileManager
+@implementation RNMGoogleMapUrlTileManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMGoogleMapUrlTile)
 
 - (UIView *)view
 {
-  AIRGoogleMapUrlTile *tileLayer = [AIRGoogleMapUrlTile new];
+  RNMGoogleMapUrlTile *tileLayer = [RNMGoogleMapUrlTile new];
   return tileLayer;
 }
 

package/ios/GoogleMaps/RNMGoogleMapViewModule.h

@@ -0,0 +1,5 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RNMGoogleMapViewModule : NSObject <RCTBridgeModule>
+
+@end

package/ios/GoogleMaps/RNMGoogleMapViewModule.m

@@ -0,0 +1,183 @@
+#import "RNMGoogleMapViewModule.h"
+#import "RNMGoogleMap.h"
+#import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
+
+@implementation RNMGoogleMapViewModule
+
+@synthesize bridge = _bridge;
+
+- (dispatch_queue_t)methodQueue
+{
+    return RCTGetUIManagerQueue();
+}
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(getCamera:(nonnull NSNumber *)reactTag
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view], NULL);
+        } else {
+            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
+            resolve(@{
+                @"center": @{
+                    @"latitude": @(mapView.camera.target.latitude),
+                    @"longitude": @(mapView.camera.target.longitude),
+                },
+                @"pitch": @(mapView.camera.viewingAngle),
+                @"heading": @(mapView.camera.bearing),
+                @"zoom": @(mapView.camera.zoom),
+            });
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
+                  config:(NSDictionary *)config
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSString *format = config[@"format"];
+    NSNumber *quality = config[@"quality"];
+    NSString *result = config[@"result"];
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
+    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
+    
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
+        } else {
+            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
+            
+            // TODO: currently we are ignoring width, height, region
+            
+            UIGraphicsBeginImageContextWithOptions(mapView.frame.size, YES, 0.0f);
+            [mapView.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];
+                resolve(filePath);
+            }
+            else if ([result isEqualToString:@"base64"]) {
+                NSString *base64 = [data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
+                resolve(base64);
+            }
+        }
+        UIGraphicsEndImageContext();
+    }];
+}
+
+RCT_EXPORT_METHOD(pointForCoordinate:(nonnull NSNumber *)reactTag
+                  coordinate:(NSDictionary *)coordinate
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    CLLocationCoordinate2D coord =
+    CLLocationCoordinate2DMake(
+                               [coordinate[@"latitude"] doubleValue],
+                               [coordinate[@"longitude"] doubleValue]
+                               );
+    
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
+        } else {
+            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
+            
+            CGPoint touchPoint = [mapView.projection pointForCoordinate:coord];
+            
+            resolve(@{
+                @"x": @(touchPoint.x),
+                @"y": @(touchPoint.y),
+            });
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(coordinateForPoint:(nonnull NSNumber *)reactTag
+                  point:(NSDictionary *)point
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    CGPoint pt = CGPointMake(
+                             [point[@"x"] doubleValue],
+                             [point[@"y"] doubleValue]
+                             );
+    
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
+        } else {
+            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
+            
+            CLLocationCoordinate2D coordinate = [mapView.projection coordinateForPoint:pt];
+            
+            resolve(@{
+                @"latitude": @(coordinate.latitude),
+                @"longitude": @(coordinate.longitude),
+            });
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(getMarkersFrames:(nonnull NSNumber *)reactTag
+                  onlyVisible:(BOOL)onlyVisible
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
+        } else {
+            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
+            resolve([mapView getMarkersFramesWithOnlyVisible:onlyVisible]);
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(getMapBoundaries:(nonnull NSNumber *)reactTag
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, 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]
+                }
+            });
+        }
+    }];
+}
+
+@end

package/ios/{AirGoogleMaps/AIRGoogleMapWMSTile.h → GoogleMaps/RNMGoogleMapWMSTile.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapWMSTile.h
-//  AirMaps
+//  RNMGoogleMapWMSTile.h
+//  RNMaps
 //
 //  Created by nizam on 10/28/18.
 //  Copyright © 2018. All rights reserved.
@@ -18,7 +18,7 @@
 @property (nonatomic, assign) NSInteger minimumZ;
 @end
 
-@interface AIRGoogleMapWMSTile : UIView
+@interface RNMGoogleMapWMSTile : UIView
 @property (nonatomic, strong) WMSTileOverlay *tileLayer;
 @property (nonatomic, assign) NSString *urlTemplate;
 @property (nonatomic, assign) int zIndex;

package/ios/{AirGoogleMaps/AIRGoogleMapWMSTile.m → GoogleMaps/RNMGoogleMapWMSTile.m}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapWMSTile.m
-//  AirMaps
+//  RNMGoogleMapWMSTile.m
+//  RNMaps
 //
 //  Created by nizam on 10/28/18.
 //  Copyright © 2018. All rights reserved.
@@ -8,9 +8,9 @@
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGoogleMapWMSTile.h"
+#import "RNMGoogleMapWMSTile.h"
 
-@implementation AIRGoogleMapWMSTile
+@implementation RNMGoogleMapWMSTile
 
 -(id) init
 {

package/ios/{AirGoogleMaps/AIRGoogleMapWMSTileManager.h → GoogleMaps/RNMGoogleMapWMSTileManager.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapWMSTileManager.h
-//  AirMaps
+//  RNMGoogleMapWMSTileManager.h
+//  RNMaps
 //
 //  Created by nizam on 10/28/18.
 //  Copyright © 2018. All rights reserved.
@@ -11,7 +11,7 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTViewManager.h>
 
-@interface AIRGoogleMapWMSTileManager : RCTViewManager
+@interface RNMGoogleMapWMSTileManager : RCTViewManager
 @end
 
 #endif

package/ios/{AirGoogleMaps/AIRGoogleMapWMSTileManager.m → GoogleMaps/RNMGoogleMapWMSTileManager.m}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapWMSTileManager.m
-//  AirMaps
+//  RNMGoogleMapWMSTileManager.m
+//  RNMaps
 //
 //  Created by nizam on 10/28/18.
 //  Copyright © 2018. All rights reserved.
@@ -8,20 +8,20 @@
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGoogleMapWMSTileManager.h"
-#import "AIRGoogleMapWMSTile.h"
+#import "RNMGoogleMapWMSTileManager.h"
+#import "RNMGoogleMapWMSTile.h"
 
-@interface AIRGoogleMapWMSTileManager()
+@interface RNMGoogleMapWMSTileManager()
 
 @end
 
-@implementation AIRGoogleMapWMSTileManager
+@implementation RNMGoogleMapWMSTileManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMGoogleMapWMSTile)
 
 - (UIView *)view
 {
-    AIRGoogleMapWMSTile *tileLayer = [AIRGoogleMapWMSTile new];
+    RNMGoogleMapWMSTile *tileLayer = [RNMGoogleMapWMSTile new];
     return tileLayer;
 }
 

package/ios/{AirMaps → Maps}/Callout/SMCalloutView.h

@@ -176,11 +176,11 @@ extern NSTimeInterval const kSMCalloutViewRepositionDelayForUIScrollView;
 - (void)calloutViewClicked:(SMCalloutView *)calloutView;
 
 /**
- Called when the callout view detects that it will be outside the constrained view when it appears, 
- or if the target rect was already outside the constrained view. You can implement this selector 
+ Called when the callout view detects that it will be outside the constrained view when it appears,
+ or if the target rect was already outside the constrained view. You can implement this selector
  to respond to this situation by repositioning your content first in order to make everything visible.
- The @c CGSize passed is the calculated offset necessary to make everything visible (plus a nice margin). 
- It expects you to return the amount of time you need to reposition things so the popup can be delayed. 
+ The @c CGSize passed is the calculated offset necessary to make everything visible (plus a nice margin).
+ It expects you to return the amount of time you need to reposition things so the popup can be delayed.
  Typically you would return @c kSMCalloutViewRepositionDelayForUIScrollView if you're repositioning by calling @c [UIScrollView @c setContentOffset:animated:].
  
  @param calloutView the @c SMCalloutView to reposition

package/ios/{AirMaps/RCTConvert+AirMap.h → Maps/RCTConvert+RNMMap.h}

@@ -7,7 +7,7 @@
 #import <MapKit/MapKit.h>
 #import <React/RCTConvert.h>
 
-@interface RCTConvert (AirMap)
+@interface RCTConvert (RNMMap)
 
 + (MKCoordinateSpan)MKCoordinateSpan:(id)json;
 + (MKCoordinateRegion)MKCoordinateRegion:(id)json;

package/ios/{AirMaps/RCTConvert+AirMap.m → Maps/RCTConvert+RNMMap.m}

@@ -3,12 +3,12 @@
 // Copyright (c) 2015 Facebook. All rights reserved.
 //
 
-#import "RCTConvert+AirMap.h"
+#import "RCTConvert+RNMMap.h"
 
 #import <React/RCTConvert+CoreLocation.h>
-#import "AIRMapCoordinate.h"
+#import "RNMMapCoordinate.h"
 
-@implementation RCTConvert (AirMap)
+@implementation RCTConvert (RNMMap)
 
 + (MKCoordinateSpan)MKCoordinateSpan:(id)json
 {
@@ -71,18 +71,18 @@ RCT_ENUM_CONVERTER(MKMapType, (@{
 // around a `CLLocationCoordinate2D`, since I was unable to figure out
 // how to handle an array of structs like CLLocationCoordinate2D. Would love
 // to get rid of this if someone can show me how...
-+ (AIRMapCoordinate *)AIRMapCoordinate:(id)json
++ (RNMMapCoordinate *)RNMMapCoordinate:(id)json
 {
-    AIRMapCoordinate *coord = [AIRMapCoordinate new];
+    RNMMapCoordinate *coord = [RNMMapCoordinate new];
     coord.coordinate = [self CLLocationCoordinate2D:json];
     return coord;
 }
 
-RCT_ARRAY_CONVERTER(AIRMapCoordinate)
+RCT_ARRAY_CONVERTER(RNMMapCoordinate)
 
-+ (NSArray<NSArray<AIRMapCoordinate *> *> *)AIRMapCoordinateArrayArray:(id)json
++ (NSArray<NSArray<RNMMapCoordinate *> *> *)RNMMapCoordinateArrayArray:(id)json
 {
-    return RCTConvertArrayValue(@selector(AIRMapCoordinateArray:), json);
+    return RCTConvertArrayValue(@selector(RNMMapCoordinateArray:), json);
 }
 
 @end

package/ios/{AirMaps/AIRMap.h → Maps/RNMMap.h}

@@ -12,16 +12,16 @@
 
 #import <React/RCTComponent.h>
 #import "SMCalloutView.h"
-#import "RCTConvert+AirMap.h"
-#import "AIRMapCalloutSubview.h"
+#import "RCTConvert+RNMMap.h"
+#import "RNMMapCalloutSubview.h"
 
-@class AIRMapMarker;
+@class RNMMapMarker;
 
-extern const NSTimeInterval AIRMapRegionChangeObserveInterval;
-extern const CGFloat AIRMapZoomBoundBuffer;
-extern const NSInteger AIRMapMaxZoomLevel;
+extern const NSTimeInterval RNMMapRegionChangeObserveInterval;
+extern const CGFloat RNMMapZoomBoundBuffer;
+extern const NSInteger RNMMapMaxZoomLevel;
 
-@interface AIRMap: MKMapView<SMCalloutViewDelegate>
+@interface RNMMap: MKMapView<SMCalloutViewDelegate>
 
 @property (nonatomic, strong) SMCalloutView *calloutView;
 @property (nonatomic, strong) UIImageView *cacheImageView;
@@ -73,7 +73,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 - (void)finishLoading;
 - (NSArray *)getMapBoundaries;
 
-- (AIRMapMarker*) markerAtPoint:(CGPoint)point;
+- (RNMMapMarker*) markerAtPoint:(CGPoint)point;
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
 
 @end

package/ios/{AirMaps/AIRMap.m → Maps/RNMMap.m}

@@ -7,23 +7,23 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "AIRMap.h"
+#import "RNMMap.h"
 
 #import <React/RCTEventDispatcher.h>
 #import <React/UIView+React.h>
-#import "AIRMapMarker.h"
-#import "AIRMapPolyline.h"
-#import "AIRMapPolygon.h"
-#import "AIRMapCircle.h"
+#import "RNMMapMarker.h"
+#import "RNMMapPolyline.h"
+#import "RNMMapPolygon.h"
+#import "RNMMapCircle.h"
 #import <QuartzCore/QuartzCore.h>
-#import "AIRMapUrlTile.h"
-#import "AIRMapWMSTile.h"
-#import "AIRMapLocalTile.h"
-#import "AIRMapOverlay.h"
+#import "RNMMapUrlTile.h"
+#import "RNMMapWMSTile.h"
+#import "RNMMapLocalTile.h"
+#import "RNMMapOverlay.h"
 
-const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
-const CGFloat AIRMapZoomBoundBuffer = 0.01;
-const NSInteger AIRMapMaxZoomLevel = 20;
+const NSTimeInterval RNMMapRegionChangeObserveInterval = 0.1;
+const CGFloat RNMMapZoomBoundBuffer = 0.01;
+const NSInteger RNMMapMaxZoomLevel = 20;
 
 
 @interface MKMapView (UIGestureRecognizer)
@@ -33,7 +33,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 @end
 
-@interface AIRMap ()
+@interface RNMMap ()
 
 @property (nonatomic, strong) UIActivityIndicatorView *activityIndicatorView;
 @property (nonatomic, assign) NSNumber *shouldZoomEnabled;
@@ -44,7 +44,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 @end
 
-@implementation AIRMap
+@implementation RNMMap
 {
     UIView *_legalLabel;
     BOOL _initialRegionSet;
@@ -52,7 +52,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
     // Array to manually track RN subviews
     //
-    // AIRMap implicitly creates subviews that aren't regular RN children
+    // RNMMap implicitly creates subviews that aren't regular RN children
     // (SMCalloutView injects an overlay subview), which otherwise confuses RN
     // during component re-renders:
     // https://github.com/facebook/react-native/blob/v0.16.0/React/Modules/RCTUIManager.m#L657
@@ -84,14 +84,14 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         self.calloutView.delegate = self;
 
         self.minZoomLevel = 0;
-        self.maxZoomLevel = AIRMapMaxZoomLevel;
+        self.maxZoomLevel = RNMMapMaxZoomLevel;
         self.compassOffset = CGPointMake(0, 0);
     }
     return self;
 }
 
 -(void)addSubview:(UIView *)view {
-    if([view isKindOfClass:[AIRMapMarker class]]) {
+    if([view isKindOfClass:[RNMMapMarker class]]) {
         [self addAnnotation:(id <MKAnnotation>)view];
     } else {
         [super addSubview:view];
@@ -103,28 +103,28 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
     // Our desired API is to pass up markers/overlays as children to the mapview component.
     // This is where we intercept them and do the appropriate underlying mapview action.
-    if ([subview isKindOfClass:[AIRMapMarker class]]) {
+    if ([subview isKindOfClass:[RNMMapMarker class]]) {
         [self addAnnotation:(id <MKAnnotation>) subview];
-    } else if ([subview isKindOfClass:[AIRMapPolyline class]]) {
-        ((AIRMapPolyline *)subview).map = self;
+    } else if ([subview isKindOfClass:[RNMMapPolyline class]]) {
+        ((RNMMapPolyline *)subview).map = self;
         [self addOverlay:(id<MKOverlay>)subview];
-    } else if ([subview isKindOfClass:[AIRMapPolygon class]]) {
-        ((AIRMapPolygon *)subview).map = self;
+    } else if ([subview isKindOfClass:[RNMMapPolygon class]]) {
+        ((RNMMapPolygon *)subview).map = self;
         [self addOverlay:(id<MKOverlay>)subview];
-    } else if ([subview isKindOfClass:[AIRMapCircle class]]) {
-        ((AIRMapCircle *)subview).map = self;
+    } else if ([subview isKindOfClass:[RNMMapCircle class]]) {
+        ((RNMMapCircle *)subview).map = self;
         [self addOverlay:(id<MKOverlay>)subview];
-    } else if ([subview isKindOfClass:[AIRMapUrlTile class]]) {
-        ((AIRMapUrlTile *)subview).map = self;
+    } else if ([subview isKindOfClass:[RNMMapUrlTile class]]) {
+        ((RNMMapUrlTile *)subview).map = self;
         [self addOverlay:(id<MKOverlay>)subview];
-    }else if ([subview isKindOfClass:[AIRMapWMSTile class]]) {
-        ((AIRMapWMSTile *)subview).map = self;
+    }else if ([subview isKindOfClass:[RNMMapWMSTile class]]) {
+        ((RNMMapWMSTile *)subview).map = self;
         [self addOverlay:(id<MKOverlay>)subview];
-    } else if ([subview isKindOfClass:[AIRMapLocalTile class]]) {
-        ((AIRMapLocalTile *)subview).map = self;
+    } else if ([subview isKindOfClass:[RNMMapLocalTile class]]) {
+        ((RNMMapLocalTile *)subview).map = self;
         [self addOverlay:(id<MKOverlay>)subview];
-    } else if ([subview isKindOfClass:[AIRMapOverlay class]]) {
-        ((AIRMapOverlay *)subview).map = self;
+    } else if ([subview isKindOfClass:[RNMMapOverlay class]]) {
+        ((RNMMapOverlay *)subview).map = self;
         [self addOverlay:(id<MKOverlay>)subview];
     } else {
         NSArray<id<RCTComponent>> *childSubviews = [subview reactSubviews];
@@ -141,21 +141,21 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (void)removeReactSubview:(id<RCTComponent>)subview {
     // similarly, when the children are being removed we have to do the appropriate
     // underlying mapview action here.
-    if ([subview isKindOfClass:[AIRMapMarker class]]) {
+    if ([subview isKindOfClass:[RNMMapMarker class]]) {
         [self removeAnnotation:(id<MKAnnotation>)subview];
-    } else if ([subview isKindOfClass:[AIRMapPolyline class]]) {
+    } else if ([subview isKindOfClass:[RNMMapPolyline class]]) {
         [self removeOverlay:(id <MKOverlay>) subview];
-    } else if ([subview isKindOfClass:[AIRMapPolygon class]]) {
+    } else if ([subview isKindOfClass:[RNMMapPolygon class]]) {
         [self removeOverlay:(id <MKOverlay>) subview];
-    } else if ([subview isKindOfClass:[AIRMapCircle class]]) {
+    } else if ([subview isKindOfClass:[RNMMapCircle class]]) {
         [self removeOverlay:(id <MKOverlay>) subview];
-    } else if ([subview isKindOfClass:[AIRMapUrlTile class]]) {
+    } else if ([subview isKindOfClass:[RNMMapUrlTile class]]) {
         [self removeOverlay:(id <MKOverlay>) subview];
-    } else if ([subview isKindOfClass:[AIRMapWMSTile class]]) {
+    } else if ([subview isKindOfClass:[RNMMapWMSTile class]]) {
         [self removeOverlay:(id <MKOverlay>) subview];
-    } else if ([subview isKindOfClass:[AIRMapLocalTile class]]) {
+    } else if ([subview isKindOfClass:[RNMMapLocalTile class]]) {
         [self removeOverlay:(id <MKOverlay>) subview];
-    } else if ([subview isKindOfClass:[AIRMapOverlay class]]) {
+    } else if ([subview isKindOfClass:[RNMMapOverlay class]]) {
         [self removeOverlay:(id <MKOverlay>) subview];
     } else {
         NSArray<id<RCTComponent>> *childSubviews = [subview reactSubviews];
@@ -178,17 +178,17 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (NSArray*) markers {
     NSPredicate *filterMarkers = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
-        AIRMapMarker *marker = (AIRMapMarker *)evaluatedObject;
-        return [marker isKindOfClass:[AIRMapMarker class]];
+        RNMMapMarker *marker = (RNMMapMarker *)evaluatedObject;
+        return [marker isKindOfClass:[RNMMapMarker class]];
     }];
     NSArray *filteredMarkers = [self.annotations filteredArrayUsingPredicate:filterMarkers];
     return filteredMarkers;
 }
 
-- (AIRMapMarker*) markerForCallout:(AIRMapCallout*)callout {
-    AIRMapMarker* marker = nil;
+- (RNMMapMarker*) markerForCallout:(RNMMapCallout*)callout {
+    RNMMapMarker* marker = nil;
     NSArray* markers = [self markers];
-    for (AIRMapMarker* mrk in markers) {
+    for (RNMMapMarker* mrk in markers) {
         if (mrk.calloutView == callout) {
             marker = mrk;
             break;
@@ -197,7 +197,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     return marker;
 }
 
-- (CGRect) frameForMarker:(AIRMapMarker*) mrkAnn {
+- (CGRect) frameForMarker:(RNMMapMarker*) mrkAnn {
     MKAnnotationView* mrkView = [self viewForAnnotation: mrkAnn];
     CGRect mrkFrame = mrkView.frame;
     return mrkFrame;
@@ -205,7 +205,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
     NSMutableDictionary* markersFrames = [NSMutableDictionary new];
-    for (AIRMapMarker* mrkAnn in self.markers) {
+    for (RNMMapMarker* mrkAnn in self.markers) {
         CGRect frame = [self frameForMarker:mrkAnn];
         CGPoint point = [self convertCoordinate:mrkAnn.coordinate toPointToView:self];
         NSDictionary* frameDict = @{
@@ -227,9 +227,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     return markersFrames;
 }
 
-- (AIRMapMarker*) markerAtPoint:(CGPoint)point {
-    AIRMapMarker* mrk = nil;
-    for (AIRMapMarker* mrkAnn in self.markers) {
+- (RNMMapMarker*) markerAtPoint:(CGPoint)point {
+    RNMMapMarker* mrk = nil;
+    for (RNMMapMarker* mrkAnn in self.markers) {
         CGRect frame = [self frameForMarker:mrkAnn];
         if (CGRectContainsPoint(frame, point)) {
             mrk = mrkAnn;
@@ -260,17 +260,17 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     
     if (touchedView) {
         UIWindow* win = [[[UIApplication sharedApplication] windows] firstObject];
-        AIRMapCalloutSubview* calloutSubview = nil;
-        AIRMapCallout* callout = nil;
-        AIRMapMarker* marker = nil;
+        RNMMapCalloutSubview* calloutSubview = nil;
+        RNMMapCallout* callout = nil;
+        RNMMapMarker* marker = nil;
         
         UIView* tmp = touchedView;
         while (tmp && tmp != win && tmp != self.calloutView) {
             if ([tmp respondsToSelector:@selector(onPress)]) {
-                calloutSubview = (AIRMapCalloutSubview*) tmp;
+                calloutSubview = (RNMMapCalloutSubview*) tmp;
             }
-            if ([tmp isKindOfClass:[AIRMapCallout class]]) {
-                callout = (AIRMapCallout*) tmp;
+            if ([tmp isKindOfClass:[RNMMapCallout class]]) {
+                callout = (RNMMapCallout*) tmp;
                 break;
             }
             tmp = tmp.superview;

package/ios/{AirMaps/AIRMapCallout.h → Maps/RNMMapCallout.h}

@@ -7,7 +7,7 @@
 #import <React/RCTView.h>
 
 
-@interface AIRMapCallout : RCTView
+@interface RNMMapCallout : RCTView
 
 @property (nonatomic, assign) BOOL tooltip;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;