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

package/ios/{AirMaps/AIRMapMarker.h → Maps/RNMMapMarker.h}

@@ -7,23 +7,23 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "AIRMapMarker.h"
-#import "AIRMapCallout.h"
+#import "RNMMapMarker.h"
+#import "RNMMapCallout.h"
 
 #import <MapKit/MapKit.h>
 #import <UIKit/UIKit.h>
 
 #import <React/RCTComponent.h>
-#import "AIRMap.h"
+#import "RNMMap.h"
 #import "SMCalloutView.h"
-#import "RCTConvert+AirMap.h"
+#import "RCTConvert+RNMMap.h"
 
 @class RCTBridge;
 
-@interface AIRMapMarker : MKAnnotationView <MKAnnotation>
+@interface RNMMapMarker : MKAnnotationView <MKAnnotation>
 
-@property (nonatomic, strong) AIRMapCallout *calloutView;
-@property (nonatomic, weak) AIRMap *map;
+@property (nonatomic, strong) RNMMapCallout *calloutView;
+@property (nonatomic, weak) RNMMap *map;
 @property (nonatomic, weak) RCTBridge *bridge;
 
 @property (nonatomic, strong) NSString *identifier;
@@ -55,5 +55,5 @@
 @end
 
 
-@interface AIREmptyCalloutBackgroundView : SMCalloutBackgroundView
+@interface RNMEmptyCalloutBackgroundView : SMCalloutBackgroundView
 @end

package/ios/{AirMaps/AIRMapMarker.m → Maps/RNMMapMarker.m}

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "AIRMapMarker.h"
+#import "RNMMapMarker.h"
 
 #import <React/RCTBridge.h>
 #import <React/RCTEventDispatcher.h>
@@ -15,15 +15,15 @@
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
-NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
+NSInteger const RNM_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
-@implementation AIREmptyCalloutBackgroundView
+@implementation RNMEmptyCalloutBackgroundView
 @end
 
-@implementation AIRMapMarker {
+@implementation RNMMapMarker {
     BOOL _hasSetCalloutOffset;
     RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
-    MKPinAnnotationView *_pinView;
+    MKMarkerAnnotationView *_pinView;
     BOOL _calloutIsOpen;
     NSInteger _zIndexBeforeOpen;
 }
@@ -62,15 +62,15 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 }
 
 - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
-    if ([subview isKindOfClass:[AIRMapCallout class]]) {
-        self.calloutView = (AIRMapCallout *)subview;
+    if ([subview isKindOfClass:[RNMMapCallout class]]) {
+        self.calloutView = (RNMMapCallout *)subview;
     } else {
         [super insertReactSubview:(UIView *)subview atIndex:atIndex];
     }
 }
 
 - (void)removeReactSubview:(id<RCTComponent>)subview {
-    if ([subview isKindOfClass:[AIRMapCallout class]] && self.calloutView == subview) {
+    if ([subview isKindOfClass:[RNMMapCallout class]] && self.calloutView == subview) {
         self.calloutView = nil;
     } else {
         [super removeReactSubview:(UIView *)subview];
@@ -82,26 +82,25 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     if ([self shouldUsePinView]) {
         // In this case, we want to render a platform "default" marker.
         if (_pinView == nil) {
-            _pinView = [[MKPinAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
+            _pinView = [[MKMarkerAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
             [self addGestureRecognizerToView:_pinView];
             _pinView.annotation = self;
         }
 
         _pinView.draggable = self.draggable;
         _pinView.layer.zPosition = self.zIndex;
+        _pinView.markerTintColor = self.pinColor;
 
-        // TODO(lmr): Looks like this API was introduces in iOS 8. We may want to handle differently for earlier
-        // versions. Right now it's just leaving it with the default color. People needing the colors are free to
-        // use their own custom markers.
-        if ([_pinView respondsToSelector:@selector(setPinTintColor:)]) {
-            _pinView.pinTintColor = self.pinColor;
-        }
+        // Hiding title and subtitle to match behaviour of MKPinAnnotationView
+        // MKMarkerAnnotationView shows the title and subtitle underneath the marker
+        _pinView.titleVisibility = MKFeatureVisibilityHidden;
+        _pinView.subtitleVisibility = MKFeatureVisibilityHidden;
 
         return _pinView;
     } else {
         // If it has subviews, it means we are wanting to render a custom marker with arbitrary react views.
         // if it has a non-null image, it means we want to render a custom marker with the image.
-        // In either case, we want to return the AIRMapMarker since it is both an MKAnnotation and an
+        // In either case, we want to return the RNMMapMarker since it is both an MKAnnotation and an
         // MKAnnotationView all at the same time.
         self.layer.zPosition = self.zIndex;
         return self;
@@ -114,7 +113,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
     // Apply the MKAnnotationView's desired calloutOffset (from the top-middle of the view)
     if ([self shouldUsePinView] && !_hasSetCalloutOffset) {
-        calloutView.calloutOffset = CGPointMake(-8,0);
+        calloutView.calloutOffset = CGPointMake(0,-45);
     } else {
         calloutView.calloutOffset = self.calloutOffset;
     }
@@ -125,7 +124,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         if (self.calloutView.tooltip) {
             // if tooltip is true, then the user wants their react view to be the "tooltip" as wwell, so we set
             // the background view to something empty/transparent
-            calloutView.backgroundView = [AIREmptyCalloutBackgroundView new];
+            calloutView.backgroundView = [RNMEmptyCalloutBackgroundView new];
         } else {
             // the default tooltip look is wanted, and the user is just filling the content with their react subviews.
             // as a result, we use the default "masked" background view.
@@ -201,7 +200,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 }
 
 - (void)_handleTap:(UITapGestureRecognizer *)recognizer {
-    AIRMapMarker *marker = self;
+    RNMMapMarker *marker = self;
     if (!marker) return;
 
     if (marker.selected) {
@@ -213,11 +212,11 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         if (calloutView) {
             // the callout (or its subview) got clicked, not the marker
             UIWindow* win = [[[UIApplication sharedApplication] windows] firstObject];
-            AIRMapCalloutSubview* calloutSubview = nil;
+            RNMMapCalloutSubview* calloutSubview = nil;
             UIView* tmp = calloutView;
             while (tmp && tmp != win && tmp != self.calloutView && tmp != self.map) {
                 if ([tmp respondsToSelector:@selector(onPress)]) {
-                    calloutSubview = (AIRMapCalloutSubview*) tmp;
+                    calloutSubview = (RNMMapCalloutSubview*) tmp;
                     break;
                 }
                 tmp = tmp.superview;
@@ -336,15 +335,13 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 {
     _pinColor = pinColor;
 
-    if ([_pinView respondsToSelector:@selector(setPinTintColor:)]) {
-        _pinView.pinTintColor = _pinColor;
-    }
+    _pinView.markerTintColor = _pinColor;
 }
 
 - (void)setZIndex:(NSInteger)zIndex
 {
     _zIndexBeforeOpen = zIndex;
-    _zIndex = _calloutIsOpen ? zIndex + AIR_CALLOUT_OPEN_ZINDEX_BASELINE : zIndex;
+    _zIndex = _calloutIsOpen ? zIndex + RNM_CALLOUT_OPEN_ZINDEX_BASELINE : zIndex;
     self.layer.zPosition = zIndex;
 }
 

package/ios/{AirMaps/AIRMapMarkerManager.h → Maps/RNMMapMarkerManager.h}

@@ -9,6 +9,6 @@
 
 #import <React/RCTViewManager.h>
 
-@interface AIRMapMarkerManager : RCTViewManager
+@interface RNMMapMarkerManager : RCTViewManager
 
 @end

package/ios/{AirMaps/AIRMapMarkerManager.m → Maps/RNMMapMarkerManager.m}

@@ -7,24 +7,24 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "AIRMapMarkerManager.h"
+#import "RNMMapMarkerManager.h"
 
 #import <React/RCTConvert+CoreLocation.h>
 #import <React/RCTUIManager.h>
 #import <React/UIView+React.h>
-#import "AIRMapMarker.h"
+#import "RNMMapMarker.h"
 
-@interface AIRMapMarkerManager () <MKMapViewDelegate>
+@interface RNMMapMarkerManager () <MKMapViewDelegate>
 
 @end
 
-@implementation AIRMapMarkerManager
+@implementation RNMMapMarkerManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMMapMarker)
 
 - (UIView *)view
 {
-    AIRMapMarker *marker = [AIRMapMarker new];
+    RNMMapMarker *marker = [RNMMapMarker new];
     [marker addTapGestureRecognizer];
     marker.bridge = self.bridge;
     marker.isAccessibilityElement = YES;
@@ -60,10 +60,10 @@ RCT_EXPORT_METHOD(showCallout:(nonnull NSNumber *)reactTag)
 {
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[AIRMapMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+        if (![view isKindOfClass:[RNMMapMarker class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
         } else {
-            [(AIRMapMarker *) view showCalloutView];
+            [(RNMMapMarker *) view showCalloutView];
         }
     }];
 }
@@ -72,10 +72,10 @@ RCT_EXPORT_METHOD(hideCallout:(nonnull NSNumber *)reactTag)
 {
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[AIRMapMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+        if (![view isKindOfClass:[RNMMapMarker class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
         } else {
-            [(AIRMapMarker *) view hideCalloutView];
+            [(RNMMapMarker *) view hideCalloutView];
         }
     }];
 }
@@ -84,8 +84,8 @@ RCT_EXPORT_METHOD(redrawCallout:(nonnull NSNumber *)reactTag)
 {
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[AIRMapMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+        if (![view isKindOfClass:[RNMMapMarker class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
         } else {
             //no need to do anything here
         }

package/ios/{AirMaps/AIRMapOverlay.h → Maps/RNMMapOverlay.h}

@@ -1,19 +1,19 @@
-#import "AIRMapCallout.h"
+#import "RNMMapCallout.h"
 
 #import <MapKit/MapKit.h>
 #import <UIKit/UIKit.h>
 
-#import "RCTConvert+AirMap.h"
+#import "RCTConvert+RNMMap.h"
 #import <React/RCTComponent.h>
-#import "AIRMap.h"
-#import "AIRMapOverlayRenderer.h"
+#import "RNMMap.h"
+#import "RNMMapOverlayRenderer.h"
 
 @class RCTBridge;
 
-@interface AIRMapOverlay : UIView <MKOverlay>
+@interface RNMMapOverlay : UIView <MKOverlay>
 
-@property (nonatomic, strong) AIRMapOverlayRenderer *renderer;
-@property (nonatomic, weak) AIRMap *map;
+@property (nonatomic, strong) RNMMapOverlayRenderer *renderer;
+@property (nonatomic, weak) RNMMap *map;
 @property (nonatomic, weak) RCTBridge *bridge;
 
 @property (nonatomic, strong) NSString *name;

package/ios/{AirMaps/AIRMapOverlay.m → Maps/RNMMapOverlay.m}

@@ -1,4 +1,4 @@
-#import "AIRMapOverlay.h"
+#import "RNMMapOverlay.h"
 
 #import <React/RCTBridge.h>
 #import <React/RCTEventDispatcher.h>
@@ -6,11 +6,11 @@
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
-@interface AIRMapOverlay()
+@interface RNMMapOverlay()
 @property (nonatomic, strong, readwrite) UIImage *overlayImage;
 @end
 
-@implementation AIRMapOverlay {
+@implementation RNMMapOverlay {
     RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
     CLLocationCoordinate2D _southWest;
     CLLocationCoordinate2D _northEast;
@@ -65,7 +65,7 @@
 {
     if (MKMapRectIsEmpty(_mapRect) || !self.overlayImage) return;
     __weak typeof(self) weakSelf = self;
-    self.renderer = [[AIRMapOverlayRenderer alloc] initWithOverlay:weakSelf];
+    self.renderer = [[RNMMapOverlayRenderer alloc] initWithOverlay:weakSelf];
 }
 
 - (void)update

package/ios/Maps/RNMMapOverlayManager.h

@@ -0,0 +1,5 @@
+#import <React/RCTViewManager.h>
+
+@interface RNMMapOverlayManager : RCTViewManager
+
+@end

package/ios/{AirMaps/AIRMapOverlayManager.m → Maps/RNMMapOverlayManager.m}

@@ -1,21 +1,21 @@
-#import "AIRMapOverlayManager.h"
+#import "RNMMapOverlayManager.h"
 
 #import <React/RCTConvert+CoreLocation.h>
 #import <React/RCTUIManager.h>
 #import <React/UIView+React.h>
-#import "AIRMapOverlay.h"
+#import "RNMMapOverlay.h"
 
-@interface AIRMapOverlayManager () <MKMapViewDelegate>
+@interface RNMMapOverlayManager () <MKMapViewDelegate>
 
 @end
 
-@implementation AIRMapOverlayManager
+@implementation RNMMapOverlayManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMMapOverlay)
 
 - (UIView *)view
 {
-    AIRMapOverlay *overlay = [AIRMapOverlay new];
+    RNMMapOverlay *overlay = [RNMMapOverlay new];
     overlay.bridge = self.bridge;
     return overlay;
 }

package/ios/{AirMaps/AIRMapOverlayRenderer.h → Maps/RNMMapOverlayRenderer.h}

@@ -1,6 +1,6 @@
 #import <MapKit/MapKit.h>
 
-@interface AIRMapOverlayRenderer : MKOverlayRenderer
+@interface RNMMapOverlayRenderer : MKOverlayRenderer
 
 @property (nonatomic, assign) NSInteger rotation;
 @property (nonatomic, assign) CGFloat transparency;

package/ios/{AirMaps/AIRMapOverlayRenderer.m → Maps/RNMMapOverlayRenderer.m}

@@ -1,10 +1,10 @@
-#import "AIRMapOverlayRenderer.h"
-#import "AIRMapOverlay.h"
+#import "RNMMapOverlayRenderer.h"
+#import "RNMMapOverlay.h"
 
-@implementation AIRMapOverlayRenderer
+@implementation RNMMapOverlayRenderer
 
 - (void)drawMapRect:(MKMapRect)mapRect zoomScale:(MKZoomScale)zoomScale inContext:(CGContextRef)context {
-    UIImage *image = [(AIRMapOverlay *)self.overlay overlayImage];
+    UIImage *image = [(RNMMapOverlay *)self.overlay overlayImage];
     
     CGContextSaveGState(context);
     
@@ -23,7 +23,7 @@
 }
 
 - (BOOL)canDrawMapRect:(MKMapRect)mapRect zoomScale:(MKZoomScale)zoomScale {
-    return [(AIRMapOverlay *)self.overlay overlayImage] != nil;
+    return [(RNMMapOverlay *)self.overlay overlayImage] != nil;
 }
 
 @end

package/ios/{AirMaps/AIRMapPolygon.h → Maps/RNMMapPolygon.h}

@@ -10,22 +10,22 @@
 
 #import <React/RCTComponent.h>
 #import <React/RCTView.h>
-#import "AIRMapCoordinate.h"
-#import "AIRMap.h"
-#import "RCTConvert+AirMap.h"
+#import "RNMMapCoordinate.h"
+#import "RNMMap.h"
+#import "RCTConvert+RNMMap.h"
 
 
 
-@interface AIRMapPolygon: MKAnnotationView <MKOverlay>
+@interface RNMMapPolygon: MKAnnotationView <MKOverlay>
 
-@property (nonatomic, weak) AIRMap *map;
+@property (nonatomic, weak) RNMMap *map;
 
 @property (nonatomic, strong) MKPolygon *polygon;
 @property (nonatomic, strong) MKPolygonRenderer *renderer;
 @property (nonatomic, strong) NSArray<MKPolygon *> *interiorPolygons;
 
-@property (nonatomic, strong) NSArray<AIRMapCoordinate *> *coordinates;
-@property (nonatomic, strong) NSArray<NSArray<AIRMapCoordinate *> *> *holes;
+@property (nonatomic, strong) NSArray<RNMMapCoordinate *> *coordinates;
+@property (nonatomic, strong) NSArray<NSArray<RNMMapCoordinate *> *> *holes;
 @property (nonatomic, strong) UIColor *fillColor;
 @property (nonatomic, strong) UIColor *strokeColor;
 @property (nonatomic, assign) CGFloat strokeWidth;

package/ios/{AirMaps/AIRMapPolygon.m → Maps/RNMMapPolygon.m}

@@ -3,11 +3,11 @@
 // Copyright (c) 2015 Facebook. All rights reserved.
 //
 
-#import "AIRMapPolygon.h"
+#import "RNMMapPolygon.h"
 #import <React/UIView+React.h>
 
 
-@implementation AIRMapPolygon {
+@implementation RNMMapPolygon {
 
 }
 
@@ -51,7 +51,7 @@
     [self update];
 }
 
-- (void)setCoordinates:(NSArray<AIRMapCoordinate *> *)coordinates {
+- (void)setCoordinates:(NSArray<RNMMapCoordinate *> *)coordinates {
     _coordinates = coordinates;
     CLLocationCoordinate2D coords[coordinates.count];
     for(int i = 0; i < coordinates.count; i++)
@@ -65,7 +65,7 @@
     [self update];
 }
 
-- (void)setHoles:(NSArray<NSArray<AIRMapCoordinate *> *> *)holes {
+- (void)setHoles:(NSArray<NSArray<RNMMapCoordinate *> *> *)holes {
     _holes = holes;
     if (holes.count)
     {

package/ios/{AirMaps/AIRMapPolygonManager.h → Maps/RNMMapPolygonManager.h}

@@ -6,5 +6,5 @@
 #import <React/RCTViewManager.h>
 
 
-@interface AIRMapPolygonManager : RCTViewManager
-@end
+@interface RNMMapPolygonManager : RCTViewManager
+@end

package/ios/{AirMaps/AIRMapPolygonManager.m → Maps/RNMMapPolygonManager.m}

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "AIRMapPolygonManager.h"
+#import "RNMMapPolygonManager.h"
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
@@ -15,26 +15,26 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTViewManager.h>
 #import <React/UIView+React.h>
-#import "RCTConvert+AirMap.h"
-#import "AIRMapMarker.h"
-#import "AIRMapPolygon.h"
+#import "RCTConvert+RNMMap.h"
+#import "RNMMapMarker.h"
+#import "RNMMapPolygon.h"
 
-@interface AIRMapPolygonManager()
+@interface RNMMapPolygonManager()
 
 @end
 
-@implementation AIRMapPolygonManager
+@implementation RNMMapPolygonManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMMapPolygon)
 
 - (UIView *)view
 {
-    AIRMapPolygon *polygon = [AIRMapPolygon new];
+    RNMMapPolygon *polygon = [RNMMapPolygon new];
     return polygon;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRMapCoordinateArray)
-RCT_EXPORT_VIEW_PROPERTY(holes, AIRMapCoordinateArrayArray)
+RCT_EXPORT_VIEW_PROPERTY(coordinates, RNMMapCoordinateArray)
+RCT_EXPORT_VIEW_PROPERTY(holes, RNMMapCoordinateArrayArray)
 RCT_EXPORT_VIEW_PROPERTY(fillColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeWidth, CGFloat)

package/ios/{AirMaps/AIRMapPolyline.h → Maps/RNMMapPolyline.h}

@@ -10,19 +10,19 @@
 
 #import <React/RCTComponent.h>
 #import <React/RCTView.h>
-#import "AIRMapCoordinate.h"
-#import "AIRMap.h"
-#import "RCTConvert+AirMap.h"
+#import "RNMMapCoordinate.h"
+#import "RNMMap.h"
+#import "RCTConvert+RNMMap.h"
 
 
-@interface AIRMapPolyline: MKAnnotationView <MKOverlay>
+@interface RNMMapPolyline: MKAnnotationView <MKOverlay>
 
-@property (nonatomic, weak) AIRMap *map;
+@property (nonatomic, weak) RNMMap *map;
 
 @property (nonatomic, strong) MKPolyline *polyline;
 @property (nonatomic, strong) MKOverlayPathRenderer *renderer;
 
-@property (nonatomic, strong) NSArray<AIRMapCoordinate *> *coordinates;
+@property (nonatomic, strong) NSArray<RNMMapCoordinate *> *coordinates;
 @property (nonatomic, strong) UIColor *fillColor;
 @property (nonatomic, strong) UIColor *strokeColor;
 @property (nonatomic, strong) NSArray<UIColor *> *strokeColors;

package/ios/{AirMaps/AIRMapPolyline.m → Maps/RNMMapPolyline.m}

@@ -3,12 +3,12 @@
 // Copyright (c) 2015 Facebook. All rights reserved.
 //
 
-#import "AIRMapPolyline.h"
-#import "AIRMapPolylineRenderer.h"
+#import "RNMMapPolyline.h"
+#import "RNMMapPolylineRenderer.h"
 #import <React/UIView+React.h>
 
 
-@implementation AIRMapPolyline {
+@implementation RNMMapPolyline {
     
 }
 
@@ -24,7 +24,7 @@
 
 - (void)setStrokeColors:(NSArray<UIColor *> *)strokeColors {
     _strokeColors = strokeColors;
-    if ((self.renderer != nil) && ![_renderer isKindOfClass:[AIRMapPolylineRenderer class]]) {
+    if ((self.renderer != nil) && ![_renderer isKindOfClass:[RNMMapPolylineRenderer class]]) {
         self.renderer = [self createRenderer];
     }
     [self update];
@@ -68,7 +68,7 @@
     }
 }
 
-- (void)setCoordinates:(NSArray<AIRMapCoordinate *> *)coordinates {
+- (void)setCoordinates:(NSArray<RNMMapCoordinate *> *)coordinates {
     _coordinates = coordinates;
     CLLocationCoordinate2D *coords = calloc(coordinates.count, sizeof(CLLocationCoordinate2D));
     for(int i = 0; i < coordinates.count; i++)
@@ -90,13 +90,13 @@
     if (self.polyline == nil) return nil;
     if (self.strokeColors == nil) {
         // Use the default renderer when no array of stroke-colors is defined.
-        // This behaviour may be changed in the future if we permanently want to 
+        // This behaviour may be changed in the future if we permanently want to
         // use the custom renderer, because it can add funtionality that is not
         // supported by the default renderer.
         return [[MKPolylineRenderer alloc] initWithPolyline:self.polyline];
     }
     else {
-        return [[AIRMapPolylineRenderer alloc] initWithOverlay:self polyline:self.polyline];
+        return [[RNMMapPolylineRenderer alloc] initWithOverlay:self polyline:self.polyline];
     }
 }
 
@@ -120,8 +120,8 @@
     renderer.lineDashPhase = _lineDashPhase;
     renderer.lineDashPattern = _lineDashPattern;
     
-    if ([renderer isKindOfClass:[AIRMapPolylineRenderer class]]) {
-        ((AIRMapPolylineRenderer*)renderer).strokeColors = _strokeColors;
+    if ([renderer isKindOfClass:[RNMMapPolylineRenderer class]]) {
+        ((RNMMapPolylineRenderer*)renderer).strokeColors = _strokeColors;
     }
 }
 
@@ -149,11 +149,11 @@
 }
 
 
-#pragma mark AIRMapSnapshot implementation
+#pragma mark RNMMapSnapshot implementation
 
 - (void) drawToSnapshot:(MKMapSnapshot *) snapshot context:(CGContextRef) context
 {
-    AIRMapPolylineRenderer* renderer = [[AIRMapPolylineRenderer alloc] initWithSnapshot:snapshot overlay:self polyline:self.polyline];
+    RNMMapPolylineRenderer* renderer = [[RNMMapPolylineRenderer alloc] initWithSnapshot:snapshot overlay:self polyline:self.polyline];
     [self updateRenderer:renderer];
     [renderer drawWithZoomScale:2 inContext:context];
 }

package/ios/{AirMaps/AIRMapPolylineManager.h → Maps/RNMMapPolylineManager.h}

@@ -6,5 +6,5 @@
 #import <React/RCTViewManager.h>
 
 
-@interface AIRMapPolylineManager : RCTViewManager
-@end
+@interface RNMMapPolylineManager : RCTViewManager
+@end

package/ios/{AirMaps/AIRMapPolylineManager.m → Maps/RNMMapPolylineManager.m}

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "AIRMapPolylineManager.h"
+#import "RNMMapPolylineManager.h"
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
@@ -15,25 +15,25 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTViewManager.h>
 #import <React/UIView+React.h>
-#import "RCTConvert+AirMap.h"
-#import "AIRMapMarker.h"
-#import "AIRMapPolyline.h"
+#import "RCTConvert+RNMMap.h"
+#import "RNMMapMarker.h"
+#import "RNMMapPolyline.h"
 
-@interface AIRMapPolylineManager()
+@interface RNMMapPolylineManager()
 
 @end
 
-@implementation AIRMapPolylineManager
+@implementation RNMMapPolylineManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMMapPolyline)
 
 - (UIView *)view
 {
-    AIRMapPolyline *polyline = [AIRMapPolyline new];
+    RNMMapPolyline *polyline = [RNMMapPolyline new];
     return polyline;
 }
 
-RCT_EXPORT_VIEW_PROPERTY(coordinates, AIRMapCoordinateArray)
+RCT_EXPORT_VIEW_PROPERTY(coordinates, RNMMapCoordinateArray)
 RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(strokeColors, UIColorArray)
 RCT_EXPORT_VIEW_PROPERTY(strokeWidth, CGFloat)