react-native-maps 2.0.0-beta.1 → 2.0.0-beta.10

package/ios/{AirGoogleMaps/AIRDummyView.h → GoogleMaps/RNMDummyView.h}

@@ -1,6 +1,6 @@
 //
-//  AIRDummyView.h
-//  AirMapsExplorer
+//  RNMDummyView.h
+//  RNMaps
 //
 //  Created by Gil Birman on 10/4/16.
 //
@@ -10,7 +10,7 @@
 #import <UIKit/UIKit.h>
 
 
-@interface AIRDummyView : UIView
+@interface RNMDummyView : UIView
 @property (nonatomic, weak) UIView *view;
 - (instancetype)initWithView:(UIView*)view;
 @end

package/ios/{AirGoogleMaps/AIRDummyView.m → GoogleMaps/RNMDummyView.m}

@@ -1,6 +1,6 @@
 //
-//  AIRDummyView.m
-//  AirMapsExplorer
+//  RNMDummyView.m
+//  RNMaps
 //
 //  Created by Gil Birman on 10/4/16.
 //
@@ -8,9 +8,9 @@
 #ifdef HAVE_GOOGLE_MAPS
 
 #import <Foundation/Foundation.h>
-#import "AIRDummyView.h"
+#import "RNMDummyView.h"
 
-@implementation AIRDummyView
+@implementation RNMDummyView
 - (instancetype)initWithView:(UIView*)view
 {
   if ((self = [super init])) {

package/ios/{AirGoogleMaps/AIRGMSMarker.h → GoogleMaps/RNMGMSMarker.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGMSMarker.h
-//  AirMaps
+//  RNMGMSMarker.h
+//  RNMaps
 //
 //  Created by Gil Birman on 9/5/16.
 //
@@ -10,16 +10,16 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/UIView+React.h>
 
-@class AIRGoogleMapMarker;
+@class RNMGoogleMapMarker;
 
-@interface AIRGMSMarker : GMSMarker
+@interface RNMGMSMarker : GMSMarker
 @property (nonatomic, strong) NSString *identifier;
-@property (nonatomic, weak) AIRGoogleMapMarker *fakeMarker;
+@property (nonatomic, weak) RNMGoogleMapMarker *fakeMarker;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @end
 
 
-@protocol AIRGMSMarkerDelegate <NSObject>
+@protocol RNMGMSMarkerDelegate <NSObject>
 @required
 -(void)didTapMarker;
 @end

package/ios/{AirGoogleMaps/AIRGMSMarker.m → GoogleMaps/RNMGMSMarker.m}

@@ -1,15 +1,15 @@
 //
-//  AIRGMSMarker.m
-//  AirMaps
+//  RNMGMSMarker.m
+//  RNMaps
 //
 //  Created by Gil Birman on 9/5/16.
 //
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGMSMarker.h"
+#import "RNMGMSMarker.h"
 
-@implementation AIRGMSMarker
+@implementation RNMGMSMarker
 
 @end
 

package/ios/{AirGoogleMaps/AIRGMSPolygon.h → GoogleMaps/RNMGMSPolygon.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGMSPolygon.h
-//  AirMaps
+//  RNMGMSPolygon.h
+//  RNMaps
 //
 //  Created by Gerardo Pacheco 02/05/2017.
 //
@@ -10,9 +10,9 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/UIView+React.h>
 
-@class AIRGoogleMapPolygon;
+@class RNMGoogleMapPolygon;
 
-@interface AIRGMSPolygon : GMSPolygon
+@interface RNMGMSPolygon : GMSPolygon
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @end

package/ios/{AirGoogleMaps/AIRGMSPolygon.m → GoogleMaps/RNMGMSPolygon.m}

@@ -1,15 +1,15 @@
 //
-//  AIRGMSPolygon.m
-//  AirMaps
+//  RNMGMSPolygon.m
+//  RNMaps
 //
 //  Created by Gerardo Pacheco 02/05/2017.
 //
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGMSPolygon.h"
+#import "RNMGMSPolygon.h"
 
-@implementation AIRGMSPolygon
+@implementation RNMGMSPolygon
 
 @end
 

package/ios/{AirGoogleMaps/AIRGMSPolyline.h → GoogleMaps/RNMGMSPolyline.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGMSPolyline.h
-//  AirMaps
+//  RNMGMSPolyline.h
+//  RNMaps
 //
 //  Created by Guilherme Pontes 04/05/2017.
 //
@@ -10,9 +10,9 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/UIView+React.h>
 
-@class AIRGoogleMapPolyline;
+@class RNMGoogleMapPolyline;
 
-@interface AIRGMSPolyline : GMSPolyline
+@interface RNMGMSPolyline : GMSPolyline
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @end

package/ios/{AirGoogleMaps/AIRGMSPolyline.m → GoogleMaps/RNMGMSPolyline.m}

@@ -1,15 +1,15 @@
 //
-//  AIRGMSPolyline.m
-//  AirMaps
+//  RNMGMSPolyline.m
+//  RNMaps
 //
 //  Created by Guilherme Pontes 04/05/2017.
 //
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGMSPolyline.h"
+#import "RNMGMSPolyline.h"
 
-@implementation AIRGMSPolyline
+@implementation RNMGMSPolyline
 @end
 
 #endif

package/ios/{AirGoogleMaps/AIRGoogleMap.h → GoogleMaps/RNMGoogleMap.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMap.h
-//  AirMaps
+//  RNMGoogleMap.h
+//  RNMaps
 //
 //  Created by Gil Birman on 9/1/16.
 //
@@ -12,10 +12,10 @@
 #import <React/RCTBridge.h>
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
-#import "AIRGMSMarker.h"
-#import "RCTConvert+AirMap.h"
+#import "RNMGMSMarker.h"
+#import "RCTConvert+RNMMap.h"
 
-@interface AIRGoogleMap : GMSMapView
+@interface RNMGoogleMap : GMSMapView
 
 // TODO: don't use MK region?
 @property (nonatomic, weak) RCTBridge *bridge;

package/ios/{AirGoogleMaps/AIRGoogleMap.m → GoogleMaps/RNMGoogleMap.m}

@@ -1,27 +1,27 @@
 //
-//  AIRGoogleMap.m
-//  AirMaps
+//  RNMGoogleMap.m
+//  RNMaps
 //
 //  Created by Gil Birman on 9/1/16.
 //
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGoogleMap.h"
-#import "AIRGoogleMapMarker.h"
-#import "AIRGoogleMapMarkerManager.h"
-#import "AIRGoogleMapPolygon.h"
-#import "AIRGoogleMapPolyline.h"
-#import "AIRGoogleMapCircle.h"
-#import "AIRGoogleMapHeatmap.h"
-#import "AIRGoogleMapUrlTile.h"
-#import "AIRGoogleMapWMSTile.h"
-#import "AIRGoogleMapOverlay.h"
+#import "RNMGoogleMap.h"
+#import "RNMGoogleMapMarker.h"
+#import "RNMGoogleMapMarkerManager.h"
+#import "RNMGoogleMapPolygon.h"
+#import "RNMGoogleMapPolyline.h"
+#import "RNMGoogleMapCircle.h"
+#import "RNMGoogleMapHeatmap.h"
+#import "RNMGoogleMapUrlTile.h"
+#import "RNMGoogleMapWMSTile.h"
+#import "RNMGoogleMapOverlay.h"
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import <React/UIView+React.h>
 #import <React/RCTBridge.h>
-#import "RCTConvert+AirMap.h"
+#import "RCTConvert+RNMMap.h"
 #import <objc/runtime.h>
 
 #ifdef HAVE_GOOGLE_MAPS_UTILS
@@ -49,7 +49,7 @@ id regionAsJSON(MKCoordinateRegion region) {
            };
 }
 
-@interface AIRGoogleMap () <GMSIndoorDisplayDelegate>
+@interface RNMGoogleMap () <GMSIndoorDisplayDelegate>
 
 - (id)eventFromCoordinate:(CLLocationCoordinate2D)coordinate;
 
@@ -57,7 +57,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
 @end
 
-@implementation AIRGoogleMap
+@implementation RNMGoogleMap
 {
   NSMutableArray<UIView *> *_reactSubviews;
   MKCoordinateRegion _initialRegion;
@@ -132,36 +132,36 @@ id regionAsJSON(MKCoordinateRegion region) {
 - (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:[AIRGoogleMapMarker class]]) {
-    AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
+  if ([subview isKindOfClass:[RNMGoogleMapMarker class]]) {
+    RNMGoogleMapMarker *marker = (RNMGoogleMapMarker*)subview;
     marker.realMarker.map = self;
     [self.markers addObject:marker];
-  } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
-    AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapPolygon class]]) {
+    RNMGoogleMapPolygon *polygon = (RNMGoogleMapPolygon*)subview;
     polygon.polygon.map = self;
     [self.polygons addObject:polygon];
-  } else if ([subview isKindOfClass:[AIRGoogleMapPolyline class]]) {
-    AIRGoogleMapPolyline *polyline = (AIRGoogleMapPolyline*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapPolyline class]]) {
+    RNMGoogleMapPolyline *polyline = (RNMGoogleMapPolyline*)subview;
     polyline.polyline.map = self;
     [self.polylines addObject:polyline];
-  } else if ([subview isKindOfClass:[AIRGoogleMapCircle class]]) {
-    AIRGoogleMapCircle *circle = (AIRGoogleMapCircle*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapCircle class]]) {
+    RNMGoogleMapCircle *circle = (RNMGoogleMapCircle*)subview;
     circle.circle.map = self;
     [self.circles addObject:circle];
-  } else if ([subview isKindOfClass:[AIRGoogleMapUrlTile class]]) {
-    AIRGoogleMapUrlTile *tile = (AIRGoogleMapUrlTile*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapUrlTile class]]) {
+    RNMGoogleMapUrlTile *tile = (RNMGoogleMapUrlTile*)subview;
     tile.tileLayer.map = self;
     [self.tiles addObject:tile];
-  } else if ([subview isKindOfClass:[AIRGoogleMapWMSTile class]]) {
-    AIRGoogleMapWMSTile *tile = (AIRGoogleMapWMSTile*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapWMSTile class]]) {
+    RNMGoogleMapWMSTile *tile = (RNMGoogleMapWMSTile*)subview;
     tile.tileLayer.map = self;
     [self.tiles addObject:tile];
-  } else if ([subview isKindOfClass:[AIRGoogleMapOverlay class]]) {
-    AIRGoogleMapOverlay *overlay = (AIRGoogleMapOverlay*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapOverlay class]]) {
+    RNMGoogleMapOverlay *overlay = (RNMGoogleMapOverlay*)subview;
     overlay.overlay.map = self;
     [self.overlays addObject:overlay];
-  } else if ([subview isKindOfClass:[AIRGoogleMapHeatmap class]]){
-    AIRGoogleMapHeatmap *heatmap = (AIRGoogleMapHeatmap*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapHeatmap class]]){
+    RNMGoogleMapHeatmap *heatmap = (RNMGoogleMapHeatmap*)subview;
     heatmap.heatmap.map = self;
     [self.heatmaps addObject:heatmap];
   } else {
@@ -180,36 +180,36 @@ id regionAsJSON(MKCoordinateRegion region) {
 - (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:[AIRGoogleMapMarker class]]) {
-    AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
+  if ([subview isKindOfClass:[RNMGoogleMapMarker class]]) {
+    RNMGoogleMapMarker *marker = (RNMGoogleMapMarker*)subview;
     marker.realMarker.map = nil;
     [self.markers removeObject:marker];
-  } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
-    AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapPolygon class]]) {
+    RNMGoogleMapPolygon *polygon = (RNMGoogleMapPolygon*)subview;
     polygon.polygon.map = nil;
     [self.polygons removeObject:polygon];
-  } else if ([subview isKindOfClass:[AIRGoogleMapPolyline class]]) {
-    AIRGoogleMapPolyline *polyline = (AIRGoogleMapPolyline*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapPolyline class]]) {
+    RNMGoogleMapPolyline *polyline = (RNMGoogleMapPolyline*)subview;
     polyline.polyline.map = nil;
     [self.polylines removeObject:polyline];
-  } else if ([subview isKindOfClass:[AIRGoogleMapCircle class]]) {
-    AIRGoogleMapCircle *circle = (AIRGoogleMapCircle*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapCircle class]]) {
+    RNMGoogleMapCircle *circle = (RNMGoogleMapCircle*)subview;
     circle.circle.map = nil;
     [self.circles removeObject:circle];
-  } else if ([subview isKindOfClass:[AIRGoogleMapUrlTile class]]) {
-    AIRGoogleMapUrlTile *tile = (AIRGoogleMapUrlTile*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapUrlTile class]]) {
+    RNMGoogleMapUrlTile *tile = (RNMGoogleMapUrlTile*)subview;
     tile.tileLayer.map = nil;
     [self.tiles removeObject:tile];
-  } else if ([subview isKindOfClass:[AIRGoogleMapWMSTile class]]) {
-    AIRGoogleMapWMSTile *tile = (AIRGoogleMapWMSTile*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapWMSTile class]]) {
+    RNMGoogleMapWMSTile *tile = (RNMGoogleMapWMSTile*)subview;
     tile.tileLayer.map = nil;
     [self.tiles removeObject:tile];
-  } else if ([subview isKindOfClass:[AIRGoogleMapOverlay class]]) {
-    AIRGoogleMapOverlay *overlay = (AIRGoogleMapOverlay*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapOverlay class]]) {
+    RNMGoogleMapOverlay *overlay = (RNMGoogleMapOverlay*)subview;
     overlay.overlay.map = nil;
     [self.overlays removeObject:overlay];
-  } else if ([subview isKindOfClass:[AIRGoogleMapHeatmap class]]){
-    AIRGoogleMapHeatmap *heatmap = (AIRGoogleMapHeatmap*)subview;
+  } else if ([subview isKindOfClass:[RNMGoogleMapHeatmap class]]){
+    RNMGoogleMapHeatmap *heatmap = (RNMGoogleMapHeatmap*)subview;
     heatmap.heatmap.map = nil;
     [self.heatmaps removeObject:heatmap];
   } else {
@@ -260,18 +260,18 @@ id regionAsJSON(MKCoordinateRegion region) {
   }
   else if (_initialRegion.span.latitudeDelta != 0.0 &&
       _initialRegion.span.longitudeDelta != 0.0) {
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_initialRegion];
+    self.camera = [RNMGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_initialRegion];
     _initialRegionSet = true;
   } else if (_region.span.latitudeDelta != 0.0 &&
       _region.span.longitudeDelta != 0.0) {
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_region];
+    self.camera = [RNMGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_region];
   }
 }
 
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
   _initialRegion = initialRegion;
   if(!_initialRegionSet && _didLayoutSubviews){
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:initialRegion];
+    self.camera = [RNMGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:initialRegion];
     _initialRegionSet = true;
   }
 }
@@ -288,7 +288,7 @@ id regionAsJSON(MKCoordinateRegion region) {
   // TODO: The JS component is repeatedly setting region unnecessarily. We might want to deal with that in here.
   _region = region;
   if(_didLayoutSubviews) {
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self  andMKCoordinateRegion:region];
+    self.camera = [RNMGoogleMap makeGMSCameraPositionFromMap:self  andMKCoordinateRegion:region];
   }
 }
 
@@ -305,6 +305,10 @@ id regionAsJSON(MKCoordinateRegion region) {
     }
 }
 
+- (void)setBoundary:(GMSCoordinateBounds*)boundary {
+    self.cameraTargetBounds = boundary;
+}
+
 - (void)didPrepareMap {
   UIView* mapView = [self valueForKey:@"mapView"]; //GMSVectorMapView
   [self overrideGestureRecognizersForView:mapView];
@@ -321,17 +325,17 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (BOOL)didTapMarker:(GMSMarker *)marker {
-  AIRGMSMarker *airMarker = (AIRGMSMarker *)marker;
+  RNMGMSMarker *rnmMarker = (RNMGMSMarker *)marker;
 
   id event = @{@"action": @"marker-press",
-               @"id": airMarker.identifier ?: @"unknown",
+               @"id": rnmMarker.identifier ?: @"unknown",
                @"coordinate": @{
-                   @"latitude": @(airMarker.position.latitude),
-                   @"longitude": @(airMarker.position.longitude)
+                   @"latitude": @(rnmMarker.position.latitude),
+                   @"longitude": @(rnmMarker.position.longitude)
                    }
                };
 
-  if (airMarker.onPress) airMarker.onPress(event);
+  if (rnmMarker.onPress) rnmMarker.onPress(event);
   if (self.onMarkerPress) self.onMarkerPress(event);
 
   // TODO: not sure why this is necessary
@@ -340,23 +344,23 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)didTapPolyline:(GMSOverlay *)polyline {
-  AIRGMSPolyline *airPolyline = (AIRGMSPolyline *)polyline;
+  RNMGMSPolyline *rnmPolyline = (RNMGMSPolyline *)polyline;
 
   id event = @{@"action": @"polyline-press",
-               @"id": airPolyline.identifier ?: @"unknown",
+               @"id": rnmPolyline.identifier ?: @"unknown",
                };
 
-   if (airPolyline.onPress) airPolyline.onPress(event);
+   if (rnmPolyline.onPress) rnmPolyline.onPress(event);
 }
 
 - (void)didTapPolygon:(GMSOverlay *)polygon {
-    AIRGMSPolygon *airPolygon = (AIRGMSPolygon *)polygon;
+    RNMGMSPolygon *rnmPolygon = (RNMGMSPolygon *)polygon;
 
     id event = @{@"action": @"polygon-press",
-                 @"id": airPolygon.identifier ?: @"unknown",
+                 @"id": rnmPolygon.identifier ?: @"unknown",
                  };
 
-    if (airPolygon.onPress) airPolygon.onPress(event);
+    if (rnmPolygon.onPress) rnmPolygon.onPress(event);
 }
 
 - (void)didTapAtCoordinate:(CLLocationCoordinate2D)coordinate {
@@ -371,7 +375,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
 - (void)didChangeCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture{
   id event = @{@"continuous": @YES,
-               @"region": regionAsJSON([AIRGoogleMap makeGMSCameraPositionFromMap:self andGMSCameraPosition:position]),
+               @"region": regionAsJSON([RNMGoogleMap makeGMSCameraPositionFromMap:self andGMSCameraPosition:position]),
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
 
@@ -394,7 +398,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
 - (void)idleAtCameraPosition:(GMSCameraPosition *)position  isGesture:(BOOL)isGesture{
   id event = @{@"continuous": @NO,
-               @"region": regionAsJSON([AIRGoogleMap makeGMSCameraPositionFromMap:self andGMSCameraPosition:position]),
+               @"region": regionAsJSON([RNMGoogleMap makeGMSCameraPositionFromMap:self andGMSCameraPosition:position]),
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
   if (self.onChange) self.onChange(event);  // complete
@@ -601,7 +605,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
 #pragma mark - Utils
 
-- (CGRect) frameForMarker:(AIRGoogleMapMarker*) mrkView {
+- (CGRect) frameForMarker:(RNMGoogleMapMarker*) mrkView {
     CGPoint mrkAnchor = mrkView.realMarker.groundAnchor;
     CGPoint mrkPoint = [self.projection pointForCoordinate:mrkView.coordinate];
     CGSize mrkSize = mrkView.realMarker.iconView ? mrkView.realMarker.iconView.bounds.size : CGSizeMake(20, 30);
@@ -613,7 +617,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
     NSMutableDictionary* markersFrames = [NSMutableDictionary new];
-    for (AIRGoogleMapMarker* mrkView in self.markers) {
+    for (RNMGoogleMapMarker* mrkView in self.markers) {
         CGRect frame = [self frameForMarker:mrkView];
         CGPoint point = [self.projection pointForCoordinate:mrkView.coordinate];
         NSDictionary* frameDict = @{
@@ -635,9 +639,9 @@ id regionAsJSON(MKCoordinateRegion region) {
     return markersFrames;
 }
 
-- (AIRGoogleMapMarker*) markerAtPoint:(CGPoint)point {
-    AIRGoogleMapMarker* mrk = nil;
-    for (AIRGoogleMapMarker* mrkView in self.markers) {
+- (RNMGoogleMapMarker*) markerAtPoint:(CGPoint)point {
+    RNMGoogleMapMarker* mrk = nil;
+    for (RNMGoogleMapMarker* mrkView in self.markers) {
         CGRect frame = [self frameForMarker:mrkView];
         if (CGRectContainsPoint(frame, point)) {
             mrk = mrkView;
@@ -739,9 +743,9 @@ id regionAsJSON(MKCoordinateRegion region) {
         }
         if (isTapInsideBubble) {
             //find bubble's marker
-            AIRGoogleMapMarker* markerView = nil;
-            AIRGMSMarker* marker = nil;
-            for (AIRGoogleMapMarker* mrk in self.markers) {
+            RNMGoogleMapMarker* markerView = nil;
+            RNMGMSMarker* marker = nil;
+            for (RNMGoogleMapMarker* mrk in self.markers) {
                 if ([mrk.calloutView isEqual:bubbleView]) {
                     markerView = mrk;
                     marker = markerView.realMarker;
@@ -751,12 +755,12 @@ id regionAsJSON(MKCoordinateRegion region) {
 
             //find real tap target subview
             UIView* realSubview = [(RCTView*)bubbleView hitTest:tapPointInBubble withEvent:nil];
-            AIRGoogleMapCalloutSubview* realPressableSubview = nil;
+            RNMGoogleMapCalloutSubview* realPressableSubview = nil;
             if (realSubview) {
                 UIView* tmp = realSubview;
                 while (tmp && tmp != win && tmp != bubbleView) {
                     if ([tmp respondsToSelector:@selector(onPress)]) {
-                        realPressableSubview = (AIRGoogleMapCalloutSubview*) tmp;
+                        realPressableSubview = (RNMGoogleMapCalloutSubview*) tmp;
                         break;
                     }
                     tmp = tmp.superview;
@@ -768,7 +772,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                 if (isInsideCallout) {
                     [markerView didTapInfoWindowOfMarker:marker subview:realPressableSubview point:tapPointInBubble frame:bubbleFrame];
                 } else {
-                    AIRGoogleMapMarker* markerAtTapPoint = [self markerAtPoint:tapPoint];
+                    RNMGoogleMapMarker* markerAtTapPoint = [self markerAtPoint:tapPoint];
                     if (markerAtTapPoint != nil) {
                         [self didTapMarker:markerAtTapPoint.realMarker];
                     } else {
@@ -874,7 +878,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
     CLLocationCoordinate2D location =((GMUPoint *) place.geometry).coordinate;
 
-    AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)[[AIRGoogleMapMarkerManager alloc] view];
+    RNMGoogleMapMarker *marker = (RNMGoogleMapMarker *)[[RNMGoogleMapMarkerManager alloc] view];
     if (!marker.bridge) {
       marker.bridge = _bridge;
     }
@@ -883,7 +887,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     marker.title = place.title;
     marker.subtitle = place.snippet;
     marker.pinColor = place.style.fillColor;
-    marker.imageSrc = [AIRGoogleMap GetIconUrl:place parser:parser];
+    marker.imageSrc = [RNMGoogleMap GetIconUrl:place parser:parser];
     marker.layer.backgroundColor = [UIColor clearColor].CGColor;
     marker.layer.position = CGPointZero;
 

package/ios/{AirGoogleMaps/AIRGoogleMapCallout.h → GoogleMaps/RNMGoogleMapCallout.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapCallout.h
-//  AirMaps
+//  RNMGoogleMapCallout.h
+//  RNMaps
 //
 //  Created by Gil Birman on 9/6/16.
 //
@@ -11,7 +11,7 @@
 #import <UIKit/UIKit.h>
 #import <React/RCTView.h>
 
-@interface AIRGoogleMapCallout : UIView
+@interface RNMGoogleMapCallout : UIView
 @property (nonatomic, assign) BOOL tooltip;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, assign) BOOL alphaHitTest;

package/ios/{AirGoogleMaps/AIRGoogleMapCallout.m → GoogleMaps/RNMGoogleMapCallout.m}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapCallout.m
-//  AirMaps
+//  RNMGoogleMapCallout.m
+//  RNMaps
 //
 //  Created by Gil Birman on 9/6/16.
 //
@@ -8,12 +8,12 @@
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGoogleMapCallout.h"
+#import "RNMGoogleMapCallout.h"
 #import <React/RCTUtils.h>
 #import <React/RCTView.h>
 #import <React/RCTBridge.h>
 
-@implementation AIRGoogleMapCallout
+@implementation RNMGoogleMapCallout
 
 - (BOOL) isPointInside:(CGPoint)pointInCallout {
     if (!self.alphaHitTest)

package/ios/{AirGoogleMaps/AIRGoogleMapCalloutManager.h → GoogleMaps/RNMGoogleMapCalloutManager.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapCalloutManager.h
-//  AirMaps
+//  RNMGoogleMapCalloutManager.h
+//  RNMaps
 //
 //  Created by Gil Birman on 9/6/16.
 //
@@ -10,7 +10,7 @@
 
 #import <React/RCTViewManager.h>
 
-@interface AIRGoogleMapCalloutManager : RCTViewManager
+@interface RNMGoogleMapCalloutManager : RCTViewManager
 
 @end
 

package/ios/{AirGoogleMaps/AIRGoogleMapCalloutManager.m → GoogleMaps/RNMGoogleMapCalloutManager.m}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapCalloutManager.m
-//  AirMaps
+//  RNMGoogleMapCalloutManager.m
+//  RNMaps
 //
 //  Created by Gil Birman on 9/6/16.
 //
@@ -8,16 +8,16 @@
 
 #ifdef HAVE_GOOGLE_MAPS
 
-#import "AIRGoogleMapCalloutManager.h"
-#import "AIRGoogleMapCallout.h"
+#import "RNMGoogleMapCalloutManager.h"
+#import "RNMGoogleMapCallout.h"
 #import <React/RCTView.h>
 
-@implementation AIRGoogleMapCalloutManager
-RCT_EXPORT_MODULE()
+@implementation RNMGoogleMapCalloutManager
+RCT_EXPORT_MODULE(RNMGoogleMapCallout)
 
 - (UIView *)view
 {
-  AIRGoogleMapCallout *callout = [AIRGoogleMapCallout new];
+  RNMGoogleMapCallout *callout = [RNMGoogleMapCallout new];
   return callout;
 }