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

package/ios/{AirGoogleMaps/AIRGoogleMapManager.m → GoogleMaps/RNMGoogleMapManager.m}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapManager.m
-//  AirMaps
+//  RNMGoogleMapManager.m
+//  RNMaps
 //
 //  Created by Gil Birman on 9/1/16.
 //
@@ -8,7 +8,7 @@
 #ifdef HAVE_GOOGLE_MAPS
 
 
-#import "AIRGoogleMapManager.h"
+#import "RNMGoogleMapManager.h"
 #import <React/RCTViewManager.h>
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
@@ -18,14 +18,14 @@
 #import <React/RCTConvert.h>
 #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 "RNMGoogleMap.h"
+#import "RNMMapMarker.h"
+#import "RNMMapPolyline.h"
+#import "RNMMapPolygon.h"
+#import "RNMMapCircle.h"
 #import "SMCalloutView.h"
-#import "AIRGoogleMapMarker.h"
-#import "RCTConvert+AirMap.h"
+#import "RNMGoogleMapMarker.h"
+#import "RCTConvert+RNMMap.h"
 
 #import <MapKit/MapKit.h>
 #import <QuartzCore/QuartzCore.h>
@@ -33,21 +33,21 @@
 static NSString *const RCTMapViewKey = @"MapView";
 
 
-@interface AIRGoogleMapManager() <GMSMapViewDelegate>
+@interface RNMGoogleMapManager() <GMSMapViewDelegate>
 {
   BOOL didCallOnMapReady;
 }
 @end
 
-@implementation AIRGoogleMapManager
+@implementation RNMGoogleMapManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMGoogleMap)
 
 - (UIView *)view
 {
   [GMSServices setMetalRendererEnabled:YES];
   
-  AIRGoogleMap *map = [AIRGoogleMap new];
+  RNMGoogleMap *map = [RNMGoogleMap new];
   map.bridge = self.bridge;
   map.delegate = self;
   map.isAccessibilityElement = NO;
@@ -107,38 +107,15 @@ RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(kmlSrc, NSString)
 
-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:[AIRGoogleMap class]]) {
-            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view], NULL);
-        } else {
-            AIRGoogleMap *mapView = (AIRGoogleMap *)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(setCamera:(nonnull NSNumber *)reactTag
                   camera:(id)json)
 {
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[AIRGoogleMap class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
         } else {
-            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
             GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
             [mapView setCamera:camera];
         }
@@ -152,12 +129,12 @@ RCT_EXPORT_METHOD(animateCamera:(nonnull NSNumber *)reactTag
 {
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[AIRGoogleMap class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+        if (![view isKindOfClass:[RNMGoogleMap class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
         } else {
             [CATransaction begin];
             [CATransaction setAnimationDuration:duration/1000];
-            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
             GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
             [mapView animateToCameraPosition:camera];
             [CATransaction commit];
@@ -171,15 +148,15 @@ RCT_EXPORT_METHOD(animateToRegion:(nonnull NSNumber *)reactTag
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[AIRGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    if (![view isKindOfClass:[RNMGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
     } else {
       // Core Animation must be used to control the animation's duration
       // See http://stackoverflow.com/a/15663039/171744
       [CATransaction begin];
       [CATransaction setAnimationDuration:duration/1000];
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
-      GMSCameraPosition *camera = [AIRGoogleMap makeGMSCameraPositionFromMap:mapView andMKCoordinateRegion:region];
+      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
+      GMSCameraPosition *camera = [RNMGoogleMap makeGMSCameraPositionFromMap:mapView andMKCoordinateRegion:region];
       [mapView animateToCameraPosition:camera];
       [CATransaction commit];
     }
@@ -192,15 +169,15 @@ RCT_EXPORT_METHOD(fitToElements:(nonnull NSNumber *)reactTag
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[AIRGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    if (![view isKindOfClass:[RNMGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
 
-      CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(mapView.markers.firstObject)).realMarker.position;
+      CLLocationCoordinate2D myLocation = ((RNMGoogleMapMarker *)(mapView.markers.firstObject)).realMarker.position;
       GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
 
-      for (AIRGoogleMapMarker *marker in mapView.markers)
+      for (RNMGoogleMapMarker *marker in mapView.markers)
         bounds = [bounds includingCoordinate:marker.realMarker.position];
         
         GMSCameraUpdate* cameraUpdate;
@@ -232,22 +209,22 @@ RCT_EXPORT_METHOD(fitToSuppliedMarkers:(nonnull NSNumber *)reactTag
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[AIRGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    if (![view isKindOfClass:[RNMGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
 
       NSPredicate *filterMarkers = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
-        AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)evaluatedObject;
-        return [marker isKindOfClass:[AIRGoogleMapMarker class]] && [markers containsObject:marker.identifier];
+        RNMGoogleMapMarker *marker = (RNMGoogleMapMarker *)evaluatedObject;
+        return [marker isKindOfClass:[RNMGoogleMapMarker class]] && [markers containsObject:marker.identifier];
       }];
 
       NSArray *filteredMarkers = [mapView.markers filteredArrayUsingPredicate:filterMarkers];
 
-      CLLocationCoordinate2D myLocation = ((AIRGoogleMapMarker *)(filteredMarkers.firstObject)).realMarker.position;
+      CLLocationCoordinate2D myLocation = ((RNMGoogleMapMarker *)(filteredMarkers.firstObject)).realMarker.position;
       GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
 
-      for (AIRGoogleMapMarker *marker in filteredMarkers)
+      for (RNMGoogleMapMarker *marker in filteredMarkers)
         bounds = [bounds includingCoordinate:marker.realMarker.position];
 
       // Set Map viewport
@@ -268,21 +245,21 @@ RCT_EXPORT_METHOD(fitToSuppliedMarkers:(nonnull NSNumber *)reactTag
 }
 
 RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
-                  coordinates:(nonnull NSArray<AIRMapCoordinate *> *)coordinates
+                  coordinates:(nonnull NSArray<RNMMapCoordinate *> *)coordinates
                   edgePadding:(nonnull NSDictionary *)edgePadding
                   animated:(BOOL)animated)
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[AIRGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    if (![view isKindOfClass:[RNMGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
 
       CLLocationCoordinate2D myLocation = coordinates.firstObject.coordinate;
       GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:myLocation coordinate:myLocation];
 
-      for (AIRMapCoordinate *coordinate in coordinates)
+      for (RNMMapCoordinate *coordinate in coordinates)
         bounds = [bounds includingCoordinate:coordinate.coordinate];
 
       // Set Map viewport
@@ -302,159 +279,16 @@ RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
   }];
 }
 
-RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
-                  withWidth:(nonnull NSNumber *)width
-                  withHeight:(nonnull NSNumber *)height
-                  withRegion:(MKCoordinateRegion)region
-                  format:(nonnull NSString *)format
-                  quality:(nonnull NSNumber *)quality
-                  result:(nonnull NSString *)result
-                  withCallback:(RCTResponseSenderBlock)callback)
-{
-  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:[AIRGoogleMap class]]) {
-        RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
-    } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)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];
-            callback(@[[NSNull null], filePath]);
-        }
-        else if ([result isEqualToString:@"base64"]) {
-            callback(@[[NSNull null], [data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]]);
-        }
-    }
-    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:[AIRGoogleMap class]]) {
-      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),
-                });
-    }
-  }];
-}
-
-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:[AIRGoogleMap class]]) {
-      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),
-                });
-    }
-  }];
-}
-
-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:[AIRGoogleMap class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
-        } else {
-            AIRGoogleMap *mapView = (AIRGoogleMap *)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:[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]
-          }
-        });
-    }
-  }];
-}
-
 RCT_EXPORT_METHOD(setMapBoundaries:(nonnull NSNumber *)reactTag
                   northEast:(CLLocationCoordinate2D)northEast
                   southWest:(CLLocationCoordinate2D)southWest)
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[AIRGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    if (![view isKindOfClass:[RNMGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
 
       GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:northEast coordinate:southWest];
 
@@ -468,10 +302,10 @@ RCT_EXPORT_METHOD(setIndoorActiveLevelIndex:(nonnull NSNumber *)reactTag
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[AIRGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting AIRGoogleMap, got: %@", view);
+    if (![view isKindOfClass:[RNMGoogleMap class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
     } else {
-      AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
       if (!mapView.indoorDisplay) {
         return;
       }
@@ -495,71 +329,71 @@ RCT_EXPORT_METHOD(setIndoorActiveLevelIndex:(nonnull NSNumber *)reactTag
 }
 
 - (void)mapViewDidStartTileRendering:(GMSMapView *)mapView {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   [googleMapView didPrepareMap];
 }
 
 - (void)mapViewDidFinishTileRendering:(GMSMapView *)mapView {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   [googleMapView mapViewDidFinishTileRendering];
 }
 
 - (BOOL)mapView:(GMSMapView *)mapView didTapMarker:(GMSMarker *)marker {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   return [googleMapView didTapMarker:marker];
 }
 
 - (void)mapView:(GMSMapView *)mapView didTapOverlay:(GMSPolygon *)polygon {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   [googleMapView didTapPolygon:polygon];
 }
 
 - (void)mapView:(GMSMapView *)mapView didTapAtCoordinate:(CLLocationCoordinate2D)coordinate {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   [googleMapView didTapAtCoordinate:coordinate];
 }
 
 - (void)mapView:(GMSMapView *)mapView didLongPressAtCoordinate:(CLLocationCoordinate2D)coordinate {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   [googleMapView didLongPressAtCoordinate:coordinate];
 }
 
 - (void)mapView:(GMSMapView *)mapView didChangeCameraPosition:(GMSCameraPosition *)position {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   [googleMapView didChangeCameraPosition:position isGesture:self.isGesture];
 }
 
 - (void)mapView:(GMSMapView *)mapView idleAtCameraPosition:(GMSCameraPosition *)position {
-  AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+  RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
   [googleMapView idleAtCameraPosition:position isGesture:self.isGesture];
 }
 
 - (UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker *)marker {
-  AIRGMSMarker *aMarker = (AIRGMSMarker *)marker;
+  RNMGMSMarker *aMarker = (RNMGMSMarker *)marker;
   return [aMarker.fakeMarker markerInfoWindow];}
 
 - (UIView *)mapView:(GMSMapView *)mapView markerInfoContents:(GMSMarker *)marker {
-  AIRGMSMarker *aMarker = (AIRGMSMarker *)marker;
+  RNMGMSMarker *aMarker = (RNMGMSMarker *)marker;
   return [aMarker.fakeMarker markerInfoContents];
 }
 
 - (void)mapView:(GMSMapView *)mapView didTapInfoWindowOfMarker:(GMSMarker *)marker {
-  AIRGMSMarker *aMarker = (AIRGMSMarker *)marker;
+  RNMGMSMarker *aMarker = (RNMGMSMarker *)marker;
   [aMarker.fakeMarker didTapInfoWindowOfMarker:aMarker];
 }
 
 - (void)mapView:(GMSMapView *)mapView didBeginDraggingMarker:(GMSMarker *)marker {
-  AIRGMSMarker *aMarker = (AIRGMSMarker *)marker;
+  RNMGMSMarker *aMarker = (RNMGMSMarker *)marker;
   [aMarker.fakeMarker didBeginDraggingMarker:aMarker];
 }
 
 - (void)mapView:(GMSMapView *)mapView didEndDraggingMarker:(GMSMarker *)marker {
-  AIRGMSMarker *aMarker = (AIRGMSMarker *)marker;
+  RNMGMSMarker *aMarker = (RNMGMSMarker *)marker;
   [aMarker.fakeMarker didEndDraggingMarker:aMarker];
 }
 
 - (void)mapView:(GMSMapView *)mapView didDragMarker:(GMSMarker *)marker {
-  AIRGMSMarker *aMarker = (AIRGMSMarker *)marker;
+  RNMGMSMarker *aMarker = (RNMGMSMarker *)marker;
   [aMarker.fakeMarker didDragMarker:aMarker];
 }
 
@@ -567,14 +401,14 @@ RCT_EXPORT_METHOD(setIndoorActiveLevelIndex:(nonnull NSNumber *)reactTag
     didTapPOIWithPlaceID:(NSString *)placeID
                     name:(NSString *)name
                 location:(CLLocationCoordinate2D)location {
-    AIRGoogleMap *googleMapView = (AIRGoogleMap *)mapView;
+    RNMGoogleMap *googleMapView = (RNMGoogleMap *)mapView;
     [googleMapView didTapPOIWithPlaceID:placeID name:name location:location];
 }
 
 #pragma mark Gesture Recognizer Handlers
 
 - (void)handleMapDrag:(UIPanGestureRecognizer*)recognizer {
-  AIRGoogleMap *map = (AIRGoogleMap *)recognizer.view;
+  RNMGoogleMap *map = (RNMGoogleMap *)recognizer.view;
   if (!map.onPanDrag) return;
 
   CGPoint touchPoint = [recognizer locationInView:map];

package/ios/{AirGoogleMaps/AIRGoogleMapMarker.h → GoogleMaps/RNMGoogleMapMarker.h}

@@ -1,6 +1,6 @@
 //
-//  AIRGoogleMapMarker.h
-//  AirMaps
+//  RNMGoogleMapMarker.h
+//  RNMaps
 //
 //  Created by Gil Birman on 9/2/16.
 //
@@ -9,19 +9,19 @@
 
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
-#import "AIRGMSMarker.h"
-#import "AIRGoogleMap.h"
-#import "AIRGoogleMapCallout.h"
-#import "AIRGoogleMapCalloutSubview.h"
+#import "RNMGMSMarker.h"
+#import "RNMGoogleMap.h"
+#import "RNMGoogleMapCallout.h"
+#import "RNMGoogleMapCalloutSubview.h"
 
-@interface AIRGoogleMapMarker : UIView
+@interface RNMGoogleMapMarker : UIView
 
 @property (nonatomic, weak) RCTBridge *bridge;
-@property (nonatomic, strong) AIRGoogleMapCallout *calloutView;
+@property (nonatomic, strong) RNMGoogleMapCallout *calloutView;
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property (nonatomic, assign) CLLocationDegrees rotation;
-@property (nonatomic, strong) AIRGMSMarker* realMarker;
+@property (nonatomic, strong) RNMGMSMarker* realMarker;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, copy) RCTDirectEventBlock onDragStart;
 @property (nonatomic, copy) RCTDirectEventBlock onDrag;
@@ -45,12 +45,12 @@
 - (void)redraw;
 - (UIView *)markerInfoContents;
 - (UIView *)markerInfoWindow;
-- (void)didTapInfoWindowOfMarker:(AIRGMSMarker *)marker;
-- (void)didTapInfoWindowOfMarker:(AIRGMSMarker *)marker point:(CGPoint)point frame:(CGRect)frame;
-- (void)didTapInfoWindowOfMarker:(AIRGMSMarker *)marker subview:(AIRGoogleMapCalloutSubview*)subview point:(CGPoint)point frame:(CGRect)frame;
-- (void)didBeginDraggingMarker:(AIRGMSMarker *)marker;
-- (void)didEndDraggingMarker:(AIRGMSMarker *)marker;
-- (void)didDragMarker:(AIRGMSMarker *)marker;
+- (void)didTapInfoWindowOfMarker:(RNMGMSMarker *)marker;
+- (void)didTapInfoWindowOfMarker:(RNMGMSMarker *)marker point:(CGPoint)point frame:(CGRect)frame;
+- (void)didTapInfoWindowOfMarker:(RNMGMSMarker *)marker subview:(RNMGoogleMapCalloutSubview*)subview point:(CGPoint)point frame:(CGRect)frame;
+- (void)didBeginDraggingMarker:(RNMGMSMarker *)marker;
+- (void)didEndDraggingMarker:(RNMGMSMarker *)marker;
+- (void)didDragMarker:(RNMGMSMarker *)marker;
 @end
 
 #endif