@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.4

package/ios/RCTMGL/RCTMGLUtils.m

@@ -1,218 +0,0 @@
-//
-//  RCTConvert+Mapbox.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 8/23/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLUtils.h"
-#import "RCTMGLImageQueue.h"
-
-@import Mapbox;
-
-@implementation RCTMGLUtils
-
-static double const MS_TO_S = 0.001;
-
-+ (CLLocationCoordinate2D)fromFeature:(NSString*)jsonStr
-{
-    NSData* data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
-    MGLPointFeature *feature = (MGLPointFeature*)[MGLShape shapeWithData:data encoding:NSUTF8StringEncoding error:nil];
-    return feature.coordinate;
-}
-
-+ (UIEdgeInsets)toUIEdgeInsets:(NSArray<NSNumber *> *)arr
-{
-    return UIEdgeInsetsMake([arr[0] floatValue], [arr[1] floatValue], [arr[2] floatValue], [arr[3] floatValue]);
-}
-
-+ (MGLShape*)shapeFromGeoJSON:(NSString*)jsonStr
-{
-    NSData* data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
-    NSError* error = nil;
-    MGLShape* result = [MGLShape shapeWithData:data encoding:NSUTF8StringEncoding error:&error];
-    if (error != nil) {
-      RCTLogWarn(@"Failed to convert data to shape error:%@ src:%@", error, jsonStr);
-    }
-    return result;
-}
-
-+ (NSString *)hashURI:(NSString *)uri
-{
-    if (uri == nil) {
-        return @"-1";
-    }
-    NSUInteger hash = [uri hash];
-    return [NSString stringWithFormat:@"%lu", (unsigned long)hash];
-}
-
-+ (MGLCoordinateBounds)fromFeatureCollection:(NSString*)jsonStr
-{
-    NSData* data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
-    MGLShapeCollectionFeature *featureCollection = (MGLShapeCollectionFeature*)[MGLShapeCollectionFeature shapeWithData:data encoding:NSUTF8StringEncoding error:nil];
-    
-    CLLocationCoordinate2D ne = featureCollection.shapes[0].coordinate;
-    CLLocationCoordinate2D sw = featureCollection.shapes[1].coordinate;
-    
-    return MGLCoordinateBoundsMake(sw, ne);
-}
-
-+ (NSArray<NSNumber *> *)fromCoordinateBounds:(MGLCoordinateBounds)bounds
-{
-    return @[
-        @[@(bounds.ne.longitude), @(bounds.ne.latitude)],
-        @[@(bounds.sw.longitude), @(bounds.sw.latitude)]
-    ];
-}
-
-+ (NSTimeInterval)fromMS:(NSNumber *)number
-{
-    return [number doubleValue] * MS_TO_S;
-}
-
-+ (NSNumber*)clamp:(NSNumber *)value min:(NSNumber *)min max:(NSNumber *)max
-{
-    if ([value doubleValue] < [min doubleValue]) return min;
-    if ([value doubleValue] > [max doubleValue]) return max;
-    return value;
-}
-
-+ (UIColor*)toColor:(id)value
-{
-    return [RCTConvert UIColor:value];
-}
-
-+ (CGVector)toCGVector:(NSArray<NSNumber *> *)arr
-{
-    return CGVectorMake([arr[0] floatValue], [arr[1] floatValue]);
-}
-
-+ (void)fetchImage:(RCTBridge*)bridge url:(NSString *)url scale:(double)scale callback:(RCTImageLoaderCompletionBlock)callback
-{
-    [RCTMGLImageQueue.sharedInstance addImage:url scale:scale bridge:bridge completionHandler:callback];
-}
-
-+ (void)fetchImages:(RCTBridge *)bridge style:(MGLStyle *)style objects:(NSDictionary<NSString *, id>*)objects forceUpdate:(BOOL)forceUpdate callback:(void (^)(void))callback
-{
-    if (objects == nil) {
-        callback();
-        return;
-    }
-    
-    NSArray<NSString *> *imageNames = objects.allKeys;
-    if (imageNames.count == 0) {
-        callback();
-        return;
-    }
-    
-    __block NSUInteger imagesLeftToLoad = imageNames.count;
-    __weak MGLStyle *weakStyle = style;
-    
-    void (^imageLoadedBlock)(void) = ^{
-        imagesLeftToLoad--;
-        
-        if (imagesLeftToLoad == 0) {
-            callback();
-        }
-    };
-    
-    for (NSString *imageName in imageNames) {
-        UIImage *foundImage = forceUpdate ? nil : [style imageForName:imageName];
-        
-        if (forceUpdate || foundImage == nil) {
-            NSDictionary* image = objects[imageName];
-            BOOL hasScale = [image isKindOfClass:[NSDictionary class]] && ([image objectForKey:@"scale"] != nil);
-            double scale = hasScale ? [[image objectForKey:@"scale"] doubleValue] : 1.0;
-            [RCTMGLImageQueue.sharedInstance addImage:objects[imageName] scale:scale bridge:bridge completionHandler:^(NSError *error, UIImage *image) {
-              if (!image) {
-                RCTLogWarn(@"Failed to fetch image: %@ error:%@", imageName, error);
-              }
-              else {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [weakStyle setImage:image forName:imageName];
-                    imageLoadedBlock();
-                });
-              }
-            }];
-        } else {
-            imageLoadedBlock();
-        }
-    }
-}
-
-+ (NSString*)getStyleJsonTempDirectory
-{
-    static NSString *styleJsonTempDirectory;
-    if (!styleJsonTempDirectory) {
-        styleJsonTempDirectory = [NSTemporaryDirectory() stringByAppendingPathComponent:@"RCTMGLStyleJSON"];
-    }
-    return styleJsonTempDirectory;
-}
-
-/**
- * Clears cached style-json entries from previous app runs. Can be safely called multiple times as it will
- * only perform the action once per app run.
- *
- * @see styleURLFromStyleJSON:
- */
-+ (void)cleanCustomStyleJSONCacheIfNeeded
-{
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSString *styleJsonTempDirectory = [RCTMGLUtils getStyleJsonTempDirectory];
-    
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        if ([fileManager fileExistsAtPath:styleJsonTempDirectory]) {
-            [fileManager removeItemAtPath:styleJsonTempDirectory error:NULL];
-        }
-    });
-}
-
-/**
- * Provides a way to convert raw style-json into a file so it can be directly referenced / used as styleURL.
- * It's a crude / alternative approach to support Android's API: Style.Builder.fromJson().
- */
-+ (NSURL*)styleURLFromStyleJSON:(NSString *)styleJSON
-{
-    [RCTMGLUtils cleanCustomStyleJSONCacheIfNeeded];
-    
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSString *styleJsonTempDirectory = [RCTMGLUtils getStyleJsonTempDirectory];
-    
-    // attempt to create the temporary directory
-    if (![fileManager fileExistsAtPath:styleJsonTempDirectory]) {
-        NSError *error;
-        [fileManager createDirectoryAtPath:styleJsonTempDirectory
-               withIntermediateDirectories:YES
-                                attributes:nil
-                                     error:&error];
-        if (error) {
-            RCTLogError(@"Failed to create temporary directory '%@' for storing style-json. Error: %@", styleJsonTempDirectory, error);
-            return nil;
-        }
-    }
-    
-    // Determine filename based on the md5 hash of the style-json.
-    // This way, the written file can also act as a cached entry in case
-    // the same style-json is used again.
-    NSString *hashedFilename = [RCTMD5Hash(styleJSON) stringByAppendingPathExtension:@"json"];
-    
-    // Construct temporary file path (tempdir + md5 hash for filename)
-    NSString *styleJsonTempPath = [styleJsonTempDirectory stringByAppendingPathComponent:hashedFilename];
-    NSURL* styleJsonTempURL = [NSURL fileURLWithPath:styleJsonTempPath isDirectory:false];
-    
-    // Write style-json to temporary file in case it doesn't already exist
-    if (![fileManager fileExistsAtPath:styleJsonTempPath isDirectory:false]) {
-        NSError *error;
-        [styleJSON writeToURL:styleJsonTempURL atomically:YES encoding:NSUTF8StringEncoding error:&error];
-        if (error) {
-            RCTLogError(@"Failed to write style-json to temporary file '%@'. Error: %@", styleJsonTempURL, error);
-            return nil;
-        }
-    }
-    
-    return styleJsonTempURL;
-}
-
-@end

package/ios/RCTMGL/RCTMGLVectorLayer.h

@@ -1,15 +0,0 @@
-//
-//  RCTMGLCircleLayer.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/18/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLLayer.h"
-
-@interface RCTMGLVectorLayer : RCTMGLLayer
-
-@property (nonatomic, copy) NSString *sourceLayerID;
-
-@end

package/ios/RCTMGL/RCTMGLVectorLayer.m

@@ -1,59 +0,0 @@
-//
-//  RCTMGLCircleLayer.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/18/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLVectorLayer.h"
-#import "RCTMGLStyle.h"
-#import "FilterParser.h"
-#import <React/RCTLog.h>
-
-@implementation RCTMGLVectorLayer
-
-
-- (NSPredicate*)buildFilters
-{
-    return self.filter ? [FilterParser parse:self.filter] : nil;
-}
-
-- (void)updateFilter:(NSPredicate *)predicate
-{
-    @try {
-        ((MGLVectorStyleLayer *) self.styleLayer).predicate = predicate;
-    }
-    @catch (NSException* exception) {
-        RCTLogError(@"Invalid predicate: %@ on layer %@ - %@ reason: %@", predicate, self, exception.name, exception.reason);
-    }
-}
-
-- (void)setSourceLayerID:(NSString *)sourceLayerID
-{
-    _sourceLayerID = sourceLayerID;
-    
-    if (self.styleLayer != nil) {
-        ((MGLVectorStyleLayer*) self.styleLayer).sourceLayerIdentifier = _sourceLayerID;
-    }
-}
-
-- (void)addedToMap
-{
-    NSPredicate *filter = [self buildFilters];
-    if (filter != nil) {
-        [self updateFilter:filter];
-    }
-}
-
-- (void)setFilter:(NSArray*)filter
-{
-    [super setFilter: filter];
-
-    if (self.styleLayer != nil) {
-        NSPredicate *predicate = [self buildFilters];
-        [self updateFilter:predicate];
-    }
-}
-
-@end

package/ios/RCTMGL/RCTMGLVectorSource.h

@@ -1,16 +0,0 @@
-//
-//  RCTMGLVectorSource.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLTileSource.h"
-@import Mapbox;
-
-@interface RCTMGLVectorSource : RCTMGLTileSource
-
-- (nonnull NSArray<id <MGLFeature>> *)featuresInSourceLayersWithIdentifiers:(nonnull NSSet<NSString *> *)sourceLayerIdentifiers predicate:(nullable NSPredicate *)predicate;
-
-@end

package/ios/RCTMGL/RCTMGLVectorSource.m

@@ -1,28 +0,0 @@
-//
-//  RCTMGLVectorSource.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLVectorSource.h"
-
-@implementation RCTMGLVectorSource
-
-- (nullable MGLSource*)makeSource
-{
-    if (self.url != nil) {
-        return [[MGLVectorTileSource alloc] initWithIdentifier:self.id configurationURL:[NSURL URLWithString:self.url]];
-    }
-    return [[MGLVectorTileSource alloc] initWithIdentifier:self.id tileURLTemplates:self.tileUrlTemplates options:[self getOptions]];
-}
-
-- (nonnull NSArray<id <MGLFeature>> *)featuresInSourceLayersWithIdentifiers:(nonnull NSSet<NSString *> *)sourceLayerIdentifiers predicate:(nullable NSPredicate *)predicate
-{
-    MGLVectorTileSource* vectorSource = (MGLVectorTileSource*)self.source;
-    
-    return [vectorSource featuresInSourceLayersWithIdentifiers:sourceLayerIdentifiers predicate: predicate];
-}
-
-@end

package/ios/RCTMGL/RCTMGLVectorSourceManager.h

@@ -1,14 +0,0 @@
-//
-//  RCTMGLVectorSourceManager.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "ViewManager.h"
-#import <React/RCTBridgeModule.h>
-
-@interface RCTMGLVectorSourceManager : ViewManager<RCTBridgeModule>
-
-@end

package/ios/RCTMGL/RCTMGLVectorSourceManager.m

@@ -1,79 +0,0 @@
-//
-//  RCTMGLVectorSourceManager.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <React/RCTUIManager.h>
-
-#import "RCTMGLVectorSourceManager.h"
-#import "RCTMGLVectorSource.h"
-
-#import "FilterParser.h"
-
-@implementation RCTMGLVectorSourceManager
-
-RCT_EXPORT_MODULE(RCTMGLVectorSource);
-
-RCT_EXPORT_VIEW_PROPERTY(id, NSString);
-
-- (UIView*)view
-{
-    return [RCTMGLVectorSource new];
-}
-
-RCT_EXPORT_VIEW_PROPERTY(url, NSString)
-RCT_EXPORT_VIEW_PROPERTY(tileUrlTemplates, NSArray)
-RCT_EXPORT_VIEW_PROPERTY(attribution, NSString)
-
-RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
-
-RCT_EXPORT_VIEW_PROPERTY(tms, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL)
-RCT_REMAP_VIEW_PROPERTY(onMapboxVectorSourcePress, onPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
-
-
-RCT_EXPORT_METHOD(features:(nonnull NSNumber*)reactTag
-                  withLayerIDs:(NSArray<NSString*>*)layerIDs
-                  withFilter:(NSArray<NSDictionary<NSString *, id> *> *)filter
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLVectorSource* vectorSource = viewRegistry[reactTag];
-        
-        if (![vectorSource isKindOfClass:[RCTMGLVectorSource class]]) {
-            RCTLogError(@"Invalid react tag, could not find RCTMGLMapView");
-            return;
-        }
-
-        NSSet* layerIDSet = nil;
-        if (layerIDs != nil && layerIDs.count > 0) {
-            layerIDSet = [NSSet setWithArray:layerIDs];
-        }
-        NSPredicate* predicate = [FilterParser parse:filter];
-        NSArray<id<MGLFeature>> *shapes = [vectorSource
-                                           featuresInSourceLayersWithIdentifiers: layerIDSet
-                                           predicate: predicate];
-        
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-        
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-
-RCT_EXPORT_METHOD(addEvent:(NSString *)name location:(NSString *)location)
-{
-    RCTLogInfo(@"Pretending to create an event %@ at %@", name, location);
-}
-
-@end

package/ios/RCTMGL/RNMBImageUtils.h

@@ -1,17 +0,0 @@
-//
-//  RNMBImageUtils.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 1/18/18.
-//  Copyright © 2018 Mapbox Inc. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
-
-@interface RNMBImageUtils : NSObject
-
-+(NSString *)createTempFile:(UIImage *)image;
-+(NSString *)createBase64:(UIImage *)image;
-
-@end

package/ios/RCTMGL/RNMBImageUtils.m

@@ -1,31 +0,0 @@
-//
-//  RNMBImageUtils.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 1/18/18.
-//  Copyright © 2018 Mapbox Inc. All rights reserved.
-//
-
-#import "RNMBImageUtils.h"
-
-@implementation RNMBImageUtils
-
-+ (NSString *)createTempFile:(UIImage *)image
-{
-    NSString *fileID = [[NSUUID UUID] UUIDString];
-    NSString *pathComponent = [NSString stringWithFormat:@"Documents/rctmgl-snapshot-%@.%@", fileID, @"png"];
-    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
-    
-    NSData *data = UIImagePNGRepresentation(image);
-    [data writeToFile:filePath atomically:YES];
-    
-    return filePath;
-}
-
-+ (NSString *)createBase64:(UIImage *)image
-{
-    NSData *data = UIImagePNGRepresentation(image);
-    return [NSString stringWithFormat:@"%@%@",  @"data:image/png;base64,", [data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]];
-}
-
-@end

package/ios/RCTMGL/ViewManager.h

@@ -1,16 +0,0 @@
-//
-//  ViewManager.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 8/31/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <React/RCTViewManager.h>
-#import "RCTMGLEvent.h"
-
-@interface ViewManager : RCTViewManager
-
--(void)fireEvent:(RCTMGLEvent*)event withCallback:(RCTBubblingEventBlock)callback;
-
-@end

package/ios/RCTMGL/ViewManager.m

@@ -1,63 +0,0 @@
-//
-//  ViewManager.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 8/31/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "ViewManager.h"
-
-@implementation ViewManager
-{
-    NSMutableDictionary<NSString*, NSNumber*> *eventTimestampCache;
-}
-
-+ (BOOL)requiresMainQueueSetup
-{
-    return YES;
-}
-
-+ (NSString *)moduleName
-{
-    // Hack, to prevent JS from throwing a useless warning
-    return @"RCTViewManager";
-}
-
-static NSTimeInterval EVENT_THROTTLE_S = 0.01;
-
-- (instancetype)init
-{
-    if (self = [super init]) {
-        eventTimestampCache = [[NSMutableDictionary alloc] init];
-    }
-    
-    return self;
-}
-
-- (void)fireEvent:(RCTMGLEvent*)event withCallback:(RCTBubblingEventBlock)callback
-{
-    if (![self _shouldDropEvent:event]) {
-        NSString *cacheKey = [self _getCacheKey:event];
-        NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
-        [eventTimestampCache setObject:[NSNumber numberWithDouble:now] forKey:cacheKey];
-        
-        if (callback != nil) {
-            callback([event toJSON]);
-        }
-    }
-}
-
-- (BOOL)_shouldDropEvent:(RCTMGLEvent *)event
-{
-    NSString *cacheKey = [self _getCacheKey:event];
-    NSNumber *lastTimestamp = [eventTimestampCache objectForKey:cacheKey];
-    return lastTimestamp != nil && (event.timestamp - [lastTimestamp doubleValue]) <= EVENT_THROTTLE_S;
-}
-
-- (NSString*)_getCacheKey:(RCTMGLEvent*)event
-{
-    return event.type;
-}
-
-@end