react-native-maps 2.0.0-beta.5 → 2.0.0-beta.7

package/ios/{AirMaps/AIRMapPolylineRenderer.m → Maps/RNMMapPolylineRenderer.m}

@@ -1,14 +1,14 @@
 //
-//  AIRMapPolylineRenderer.h
+//  RNMMapPolylineRenderer.h
 //  mapDemo
 //
 //  Created by IjzerenHein on 13-11-21.
 //  Copyright (c) 2017 IjzerenHein. All rights reserved.
 //
 
-#import "AIRMapPolylineRenderer.h"
+#import "RNMMapPolylineRenderer.h"
 
-@interface AIRMapPolylineRendererSegment : NSObject
+@interface RNMMapPolylineRendererSegment : NSObject
 - (id)initWithPoint:(CGPoint)point color:(UIColor*)color;
 - (void) addPoint:(CGPoint)point color:(UIColor*)color;
 @property CGMutablePathRef path;
@@ -17,7 +17,7 @@
 @property CGPoint startPoint;
 @property CGPoint endPoint;
 @end
-@implementation AIRMapPolylineRendererSegment
+@implementation RNMMapPolylineRendererSegment
 - (id)initWithPoint:(CGPoint)point color:(UIColor*)color
 {
     self = [super init];
@@ -38,7 +38,7 @@
 }
 @end
 
-@implementation AIRMapPolylineRenderer {
+@implementation RNMMapPolylineRenderer {
     MKPolyline* _polyline;
     NSArray<UIColor *> *_strokeColors;
     MKMapSnapshot* _snapshot;
@@ -114,14 +114,14 @@
 {
     NSMutableArray* segments = [NSMutableArray new];
     if (_polyline.pointCount <= 1) return segments;
-    AIRMapPolylineRendererSegment* segment = nil;
+    RNMMapPolylineRendererSegment* segment = nil;
     for (NSUInteger i = 0, n = _polyline.pointCount; i < n; i++){
         CGPoint point = [self pointForIndex:i];
         UIColor* color = [self colorForIndex:i];
         if (segment == nil) {
             
             // Start new segment
-            segment = [[AIRMapPolylineRendererSegment alloc] initWithPoint:point color:color];
+            segment = [[RNMMapPolylineRendererSegment alloc] initWithPoint:point color:color];
             [segments addObject:segment];
         }
         else if (((color == nil) && (segment.endColor == nil)) ||
@@ -139,14 +139,14 @@
             else {
                 
                 // Add transition gradient
-                segment = [[AIRMapPolylineRendererSegment alloc] initWithPoint:segment.endPoint color:segment.endColor];
+                segment = [[RNMMapPolylineRendererSegment alloc] initWithPoint:segment.endPoint color:segment.endColor];
                 [segment addPoint:point color:color];
                 [segments addObject:segment];
             }
             
             // Start new segment
             if (i < (n - 1)) {
-                segment = [[AIRMapPolylineRendererSegment alloc] initWithPoint:point color:color];
+                segment = [[RNMMapPolylineRendererSegment alloc] initWithPoint:point color:color];
                 [segments addObject:segment];
             }
         }
@@ -199,7 +199,7 @@
     
     NSArray* segments = [self createSegments];
     for (NSUInteger i = 0, n = segments.count; i < n; i++) {
-        AIRMapPolylineRendererSegment* segment = segments[i];
+        RNMMapPolylineRendererSegment* segment = segments[i];
         
         CGContextBeginPath(context);
         CGContextAddPath(context, segment.path);

package/ios/{AirMaps/AIRMapSnapshot.h → Maps/RNMMapSnapshot.h}

@@ -1,17 +1,17 @@
 //
-//  AIRMapSnapshot.h
-//  AirMaps
+//  RNMMapSnapshot.h
+//  RNMaps
 //
 //  Created by Hein Rutjes on 26/09/16.
 //  Copyright © 2016 Christopher. All rights reserved.
 //
 
-#ifndef AIRMapSnapshot_h
-#define AIRMapSnapshot_h
+#ifndef RNMMapSnapshot_h
+#define RNMMapSnapshot_h
 
-@protocol AIRMapSnapshot <NSObject>
+@protocol RNMMapSnapshot <NSObject>
 @optional
 - (void) drawToSnapshot:(MKMapSnapshot *) snapshot context:(CGContextRef) context;
 @end
 
-#endif /* AIRMapSnapshot_h */
+#endif /* RNMMapSnapshot_h */

package/ios/{AirMaps/AIRMapUrlTile.h → Maps/RNMMapUrlTile.h}

@@ -1,6 +1,6 @@
 //
-//  AIRUrlTileOverlay.h
-//  AirMaps
+//  RNMUrlTileOverlay.h
+//  RNMaps
 //
 //  Created by cascadian on 3/19/16.
 //  Copyright © 2016. All rights reserved.
@@ -12,25 +12,25 @@
 
 #import <React/RCTComponent.h>
 #import <React/RCTView.h>
-#import "AIRMapCoordinate.h"
-#import "AIRMap.h"
-#import "RCTConvert+AirMap.h"
-#import "AIRMapUrlTileCachedOverlay.h"
-
-@interface AIRMapUrlTile : MKAnnotationView <MKOverlay> {
-	BOOL _urlTemplateSet;
-	BOOL _tileSizeSet;
-	BOOL _flipYSet;
-	BOOL _tileCachePathSet;
-	BOOL _tileCacheMaxAgeSet;
-	BOOL _maximumNativeZSet;
-	BOOL _cachedOverlayCreated;
-	BOOL _opacitySet;
+#import "RNMMapCoordinate.h"
+#import "RNMMap.h"
+#import "RCTConvert+RNMMap.h"
+#import "RNMMapUrlTileCachedOverlay.h"
+
+@interface RNMMapUrlTile : MKAnnotationView <MKOverlay> {
+    BOOL _urlTemplateSet;
+    BOOL _tileSizeSet;
+    BOOL _flipYSet;
+    BOOL _tileCachePathSet;
+    BOOL _tileCacheMaxAgeSet;
+    BOOL _maximumNativeZSet;
+    BOOL _cachedOverlayCreated;
+    BOOL _opacitySet;
 }
 
-@property (nonatomic, weak) AIRMap *map;
+@property (nonatomic, weak) RNMMap *map;
 
-@property (nonatomic, strong) AIRMapUrlTileCachedOverlay *tileOverlay;
+@property (nonatomic, strong) RNMMapUrlTileCachedOverlay *tileOverlay;
 @property (nonatomic, strong) MKTileOverlayRenderer *renderer;
 @property (nonatomic, copy) NSString *urlTemplate;
 @property NSInteger maximumZ;

package/ios/{AirMaps/AIRMapUrlTile.m → Maps/RNMMapUrlTile.m}

@@ -1,16 +1,16 @@
 //
-//  AIRUrlTileOverlay.m
-//  AirMaps
+//  RNMUrlTileOverlay.m
+//  RNMaps
 //
 //  Created by cascadian on 3/19/16.
 //  Copyright © 2016. All rights reserved.
 //
 
-#import "AIRMapUrlTile.h"
+#import "RNMMapUrlTile.h"
 #import <React/UIView+React.h>
-#import "AIRMapUrlTileCachedOverlay.h"
+#import "RNMMapUrlTileCachedOverlay.h"
 
-@implementation AIRMapUrlTile 
+@implementation RNMMapUrlTile
 
 - (void)setShouldReplaceMapContent:(BOOL)shouldReplaceMapContent
 {
@@ -122,7 +122,7 @@
     if (!_urlTemplateSet) return;
     if (_tileCachePathSet || _maximumNativeZSet) {
         NSLog(@"tileCache dir %@", _tileCachePath);
-        self.tileOverlay = [[AIRMapUrlTileCachedOverlay alloc] initWithURLTemplate:self.urlTemplate];
+        self.tileOverlay = [[RNMMapUrlTileCachedOverlay alloc] initWithURLTemplate:self.urlTemplate];
         _cachedOverlayCreated = YES;
         if (_tileCachePathSet) {
             NSURL *urlPath = [NSURL URLWithString:[self.tileCachePath stringByAppendingString:@"/"]];
@@ -183,7 +183,7 @@
     [_map removeOverlay:self];
     [_map addOverlay:self level:MKOverlayLevelAboveLabels];
     for (id<MKOverlay> overlay in _map.overlays) {
-        if ([overlay isKindOfClass:[AIRMapUrlTile class]]) {
+        if ([overlay isKindOfClass:[RNMMapUrlTile class]]) {
             continue;
         }
         [_map removeOverlay:overlay];

package/ios/{AirMaps/AIRMapUrlTileCachedOverlay.h → Maps/RNMMapUrlTileCachedOverlay.h}

@@ -1,13 +1,13 @@
 //
-//  AIRMapUrlTileCachedOverlay.h
-//  Airmaps
+//  RNMMapUrlTileCachedOverlay.h
+//  RNMaps
 //
 //  Created by Markus Suomi on 10/04/2021.
 //
 
 #import <MapKit/MapKit.h>
 
-@interface AIRMapUrlTileCachedOverlay : MKTileOverlay
+@interface RNMMapUrlTileCachedOverlay : MKTileOverlay
 
 @property NSInteger maximumNativeZ;
 @property (nonatomic, copy) NSURL *tileCachePath;

package/ios/{AirMaps/AIRMapUrlTileCachedOverlay.m → Maps/RNMMapUrlTileCachedOverlay.m}

@@ -1,17 +1,17 @@
 //
-//  AIRMapUrlTileCachedOverlay.m
-//  Airmaps
+//  RNMMapUrlTileCachedOverlay.m
+//  RNMaps
 //
 //  Created by Markus Suomi on 10/04/2021.
 //
 
-#import "AIRMapUrlTileCachedOverlay.h"
+#import "RNMMapUrlTileCachedOverlay.h"
 
-@interface AIRMapUrlTileCachedOverlay ()
+@interface RNMMapUrlTileCachedOverlay ()
 
 @end
 
-@implementation AIRMapUrlTileCachedOverlay {
+@implementation RNMMapUrlTileCachedOverlay {
     CIContext *_ciContext;
     CGColorSpaceRef _colorspace;
     NSURLSession *_urlSession;
@@ -24,12 +24,12 @@
     NSInteger maximumZ = self.maximumNativeZ ? self.maximumNativeZ : path.z;
     [self scaleIfNeededLowerZoomTile:path maximumZ:maximumZ result:^(NSData *image, NSError *error) {
         if (!image && self.offlineMode && self.tileCachePath) {
-            NSInteger zoomLevelToStart = (path.z > maximumZ) ? maximumZ - 1 : path.z - 1; 
+            NSInteger zoomLevelToStart = (path.z > maximumZ) ? maximumZ - 1 : path.z - 1;
             NSInteger minimumZoomToSearch = self.minimumZ >= zoomLevelToStart - 3 ? self.minimumZ : zoomLevelToStart - 3;
             [self findLowerZoomTileAndScale:path tryZ:zoomLevelToStart minZ:minimumZoomToSearch result:result];
         } else {
             result(image, error);
-        }    
+        }
     }];
 }
 
@@ -79,7 +79,7 @@
 
         NSData *finalImage = [_ciContext PNGRepresentationOfImage:scaledCIImage format:kCIFormatABGR8 colorSpace:_colorspace options:nil];
         result(finalImage, nil);
-    }];    
+    }];
 }
 
 - (void)findLowerZoomTileAndScale:(MKTileOverlayPath)path tryZ:(NSInteger)tryZ minZ:(NSInteger)minZ result:(void (^)(NSData *, NSError *))result
@@ -209,7 +209,7 @@
                         [[NSFileManager defaultManager] createFileAtPath:[tileCacheFilePath path] contents:data attributes:nil];
                         NSLog(@"tileCache File refreshed at %@", [tileCacheFilePath path]);
                     }
-                }] resume];             
+                }] resume];
             }
         });
     }
@@ -218,7 +218,7 @@
 - (BOOL)doesFileNeedRefresh:(MKTileOverlayPath)path fromFilePath:(NSURL *)tileCacheFilePath withMaxAge:(NSInteger)tileCacheMaxAge
 {
     NSError *error;
-    NSDictionary<NSFileAttributeKey, id> *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[tileCacheFilePath path] error:&error]; 
+    NSDictionary<NSFileAttributeKey, id> *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[tileCacheFilePath path] error:&error];
 
     if (fileAttributes) {
         NSDate *modificationDate = fileAttributes[@"NSFileModificationDate"];

package/ios/{AirMaps/AIRMapUrlTileManager.h → Maps/RNMMapUrlTileManager.h}

@@ -1,6 +1,6 @@
 //
-//  AIRMapUrlTileManager.h
-//  AirMaps
+//  RNMMapUrlTileManager.h
+//  RNMaps
 //
 //  Created by cascadian on 3/19/16.
 //  Copyright © 2016. All rights reserved.
@@ -9,6 +9,6 @@
 
 #import <React/RCTViewManager.h>
 
-@interface AIRMapUrlTileManager : RCTViewManager
+@interface RNMMapUrlTileManager : RCTViewManager
 
 @end

package/ios/{AirMaps/AIRMapUrlTileManager.m → Maps/RNMMapUrlTileManager.m}

@@ -1,6 +1,6 @@
 //
-//  AIRMapUrlTileManager.m
-//  AirMaps
+//  RNMMapUrlTileManager.m
+//  RNMaps
 //
 //  Created by cascadian on 3/19/16.
 //  Copyright © 2016. All rights reserved.
@@ -12,23 +12,23 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTViewManager.h>
 #import <React/UIView+React.h>
-#import "AIRMapMarker.h"
-#import "AIRMapUrlTile.h"
+#import "RNMMapMarker.h"
+#import "RNMMapUrlTile.h"
 
-#import "AIRMapUrlTileManager.h"
+#import "RNMMapUrlTileManager.h"
 
-@interface AIRMapUrlTileManager()
+@interface RNMMapUrlTileManager()
 
 @end
 
-@implementation AIRMapUrlTileManager
+@implementation RNMMapUrlTileManager
 
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RNMMapUrlTile)
 
 - (UIView *)view
 {
-    AIRMapUrlTile *tile = [AIRMapUrlTile new];
+    RNMMapUrlTile *tile = [RNMMapUrlTile new];
     return tile;
 }
 

package/ios/Maps/RNMMapViewModule.h

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