@rnmapbox/maps 10.0.15 → 10.1.0-beta.4

package/ios/RCTMGL/RCTMGLStyleValue.h

@@ -1,27 +0,0 @@
-//
-//  RCTMGLStyleValue.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/11/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-@import Mapbox;
-
-@interface RCTMGLStyleValue : NSObject
-
-@property (nonatomic, strong) NSString *styleType;
-@property (nonatomic, strong) NSDictionary *rawStyleValue;
-@property (nonatomic, readonly) NSExpression *mglStyleValue;
-
-- (BOOL)shouldAddImage;
-- (NSString *)getImageURI;
-- (double)getImageScale;
-- (MGLTransition)getTransition;
-- (NSExpression *)getSphericalPosition;
-- (BOOL)isVisible;
-
-+ (RCTMGLStyleValue*)make:(NSString*)expressionJSONStr;
-
-@end

package/ios/RCTMGL/RCTMGLStyleValue.m

@@ -1,167 +0,0 @@
-//
-//  RCTMGLStyleValue.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/11/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLStyleValue.h"
-#import "RCTMGLUtils.h"
-#import <React/RCTImageLoader.h>
-
-@implementation RCTMGLStyleValue
-{
-    NSObject *expressionJSON;
-}
-
-- (NSExpression *)mglStyleValue
-{
-    if ([_styleType isEqualToString:@"color"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        UIColor *color = [RCTMGLUtils toColor:expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:color];
-    } else if ([_styleType isEqualToString:@"color"] && [expressionJSON isKindOfClass:[NSNumber class]]) {
-      
-        UIColor *color = [RCTMGLUtils toColor:expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:color];
-    } else if ([_styleType isEqualToString:@"vector"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        CGVector vector = [RCTMGLUtils toCGVector:(NSArray<NSNumber *> *)expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:[NSValue valueWithCGVector:vector]];
-    } else if ([_styleType isEqualToString:@"image"] && [expressionJSON isKindOfClass:[NSDictionary class]]) {
-        return [NSExpression expressionForConstantValue:[self getImageURI]];
-    } else if ([_styleType isEqual:@"edgeinsets"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]){
-        UIEdgeInsets edgeInsets = [RCTMGLUtils toUIEdgeInsets:(NSArray<NSNumber *> *)expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:[NSValue valueWithUIEdgeInsets:edgeInsets]];
-    } else if ([_styleType isEqualToString:@"enum"] && [expressionJSON isKindOfClass:[NSNumber class]]) {
-        // ensure we pass through values as NSUInteger when mapping to an MGL enum
-        NSUInteger uintValue = [(NSNumber*)expressionJSON unsignedIntegerValue];
-        id rawValue = [NSValue value:&uintValue withObjCType:@encode(NSUInteger)];
-        return [NSExpression expressionWithMGLJSONObject:rawValue];
-    } else if ([expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        return [NSExpression expressionForConstantValue:expressionJSON];
-    } else {
-        return [NSExpression expressionWithMGLJSONObject:expressionJSON];
-    }
-}
-
-- (void)setStyleObject:(NSObject *)object
-{
-    expressionJSON = object;
-}
-
-- (NSObject *)parse:(NSDictionary *)rawStyleValue
-{
-    NSObject *object = nil;
-    NSString *type = (NSString *)rawStyleValue[@"type"];
-    
-    if ([type isEqualToString:@"string"]) {
-        object = (NSString *)rawStyleValue[@"value"];
-    } else if ([type isEqualToString:@"number"]) {
-        object = (NSNumber *)rawStyleValue[@"value"];
-    } else if ([type isEqualToString:@"boolean"]) {
-        object = rawStyleValue[@"value"];
-    } else if ([type isEqualToString:@"hashmap"]) {
-        NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-        NSArray *values = (NSArray *)rawStyleValue[@"value"];
-        
-        for (int i = 0; i < values.count; i++) {
-            NSObject *key = [self parse:values[i][0]];
-            NSObject *value = [self parse:values[i][1]];
-            dict[[key mutableCopy]] = value;
-        }
-        
-        object = dict;
-    } else if ([type isEqualToString:@"array"]) {
-        NSMutableArray *arr = [[NSMutableArray alloc] init];
-        NSArray *values = (NSArray *)rawStyleValue[@"value"];
-        
-        for (int i = 0; i < values.count; i++) {
-            [arr addObject:[self parse:values[i]]];
-        }
-        
-        object = arr;
-    }
-    
-    return object;
-}
-
-
-
-- (BOOL)shouldAddImage
-{
-    NSString *imageURI = [self getImageURI];
-    
-    return [imageURI containsString:@"://"];
-}
-
-- (NSString *)getImageURI
-{
-    if ([expressionJSON isKindOfClass:[NSDictionary class]]) {
-        return [expressionJSON valueForKey:@"uri"];
-    } else if ([expressionJSON isKindOfClass:[NSArray class]]) {
-        return nil;
-    } else {
-        return (NSString *)expressionJSON;
-    }
-}
-
-- (double)getImageScale
-{
-    if ([expressionJSON isKindOfClass:[NSDictionary class]]) {
-        id scale = [expressionJSON valueForKey:@"scale"];
-        if ([scale isKindOfClass:[NSNumber class]]) {
-            return [scale doubleValue];
-        } else {
-            return 1.0;
-        }
-    } else {
-        return 1.0;
-    }
-}
-
-- (MGLTransition)getTransition
-{
-    if (![expressionJSON isKindOfClass:[NSDictionary class]]) {
-        return MGLTransitionMake(0.f, 0.f);
-    }
-    
-    NSDictionary *config = (NSDictionary *)expressionJSON;
-    double duration = config[@"duration"] != nil ? [config[@"duration"] doubleValue] : 300.0;
-    double delay = config[@"delay"] != nil ? [config[@"delay"] doubleValue] : 0.0;
-
-    const double millisecondsToSeconds = 1.0/1000.0;
-    
-    return MGLTransitionMake(duration * millisecondsToSeconds, delay * millisecondsToSeconds);
-}
-
-- (NSExpression *)getSphericalPosition
-{
-    NSArray *values = (NSArray<NSNumber *> *)expressionJSON;
-    
-    CGFloat radial = [values[0] floatValue];
-    CLLocationDistance azimuthal = [values[1] doubleValue];
-    CLLocationDistance polar = [values[2] doubleValue];
-    
-    MGLSphericalPosition pos = MGLSphericalPositionMake(radial, azimuthal, polar);
-    return [NSExpression expressionWithMGLJSONObject:@(pos)];
-}
-
-- (BOOL)isVisible
-{
-    if ([expressionJSON isKindOfClass:[NSString class]]) {
-        NSString *visible = (NSString *)expressionJSON;
-        return [visible isEqualToString:@"visible"];
-    }
-    return YES;
-}
-
-+ (RCTMGLStyleValue*)make:(NSDictionary*)rawStyleValue;
-{
-    RCTMGLStyleValue *styleValue = [[RCTMGLStyleValue alloc] init];
-    styleValue.styleType = (NSString *)rawStyleValue[@"styletype"];
-    NSObject *object = [styleValue parse:(NSDictionary *)rawStyleValue[@"stylevalue"]];
-    [styleValue setStyleObject:object];
-    return styleValue;
-}
-
-@end

package/ios/RCTMGL/RCTMGLSymbolLayer.h

@@ -1,19 +0,0 @@
-//
-//  RCTMGLSymbolLayer.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/19/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <React/RCTComponent.h>
-#import "RCTMGLVectorLayer.h"
-
-@interface RCTMGLSymbolLayer : RCTMGLVectorLayer<RCTInvalidating>
-
-@property (nonatomic, strong) NSMutableArray<id<RCTComponent>> *reactSubviews;
-
-@property (nonatomic, assign) BOOL snapshot;
-@property (nonatomic, copy) NSString *sourceLayerID;
-
-@end

package/ios/RCTMGL/RCTMGLSymbolLayer.m

@@ -1,121 +0,0 @@
-//
-//  RCTMGLSymbolLayer.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/19/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLSymbolLayer.h"
-#import "RCTMGLStyle.h"
-#import <React/UIView+React.h>
-#import <React/RCTLog.h>
-
-@implementation RCTMGLSymbolLayer
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame]) {
-        _reactSubviews = [[NSMutableArray alloc] init];
-    }
-    return self;
-}
-
-- (void)invalidate
-{
-    if (_snapshot == YES && self.style != nil) {
-        [self.style removeImageForName:self.id];
-    }
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
-    [_reactSubviews insertObject:(UIView *)subview atIndex:(NSUInteger) atIndex];
-}
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (void)removeReactSubview:(id<RCTComponent>)subview {
-    [_reactSubviews removeObject:(UIView *)subview];
-}
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (NSArray<id<RCTComponent>> *)reactSubviews {
-    return nil;
-}
-#pragma clang diagnostic pop
-
-- (void)setSnapshot:(BOOL)snapshot
-{
-    _snapshot = snapshot;
-    
-    if (self.style != nil) {
-        UIImage *image;
-        MGLSymbolStyleLayer *layer = (MGLSymbolStyleLayer *) self.styleLayer;
-        
-        if (_snapshot == YES) {
-            image = [self _createViewSnapshot];
-            [self.style setImage:image forName:self.id];
-            layer.iconImageName = [NSExpression expressionWithFormat:self.id];
-        } else {
-            image = [self.style imageForName:self.id];
-            
-            if (image != nil) {
-                [self.style removeImageForName:self.id];
-                layer.iconImageName = nil;
-            }
-        }
-    }
-}
-
-- (void)addedToMap
-{
-    [super addedToMap];
-    
-    if (_snapshot == YES) {
-        UIImage *image = [self _createViewSnapshot];
-        
-        if (image != nil) {
-            [self.style setImage:image forName:self.id];
-            
-            MGLSymbolStyleLayer *layer = (MGLSymbolStyleLayer *)self.styleLayer;
-            layer.iconImageName = [NSExpression expressionForConstantValue:self.id];
-        }
-    }
-}
-
-- (MGLSymbolStyleLayer*)makeLayer:(MGLStyle*)style
-{
-    MGLSource *source = [self layerWithSourceIDInStyle: style];
-    if (source == nil) { return nil; }
-    MGLSymbolStyleLayer *layer = [[MGLSymbolStyleLayer alloc] initWithIdentifier:self.id source:source];
-    layer.sourceLayerIdentifier = self.sourceLayerID;
-    return layer;
-}
-
-- (void)addStyles
-{
-    RCTMGLStyle *style = [[RCTMGLStyle alloc] initWithMGLStyle:self.style];
-    style.bridge = self.bridge;
-    [style symbolLayer:(MGLSymbolStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{ return [self isAddedToMap];
-    }];
-}
-
-- (UIImage *)_createViewSnapshot
-{
-    if (_reactSubviews.count == 0) {
-        return nil;
-    }
-    UIView *view = (UIView *)_reactSubviews[0];
-    UIGraphicsBeginImageContextWithOptions(view.bounds.size, NO, 0.f);
-    [view drawViewHierarchyInRect:view.bounds afterScreenUpdates:YES];
-    UIImage *snapshot = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    return snapshot;
-}
-
-@end

package/ios/RCTMGL/RCTMGLSymbolLayerManager.h

@@ -1,13 +0,0 @@
-//
-//  RCTMGLSymbolLayerManager.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/19/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "ViewManager.h"
-
-@interface RCTMGLSymbolLayerManager : ViewManager
-
-@end

package/ios/RCTMGL/RCTMGLSymbolLayerManager.m

@@ -1,40 +0,0 @@
-//
-//  RCTMGLSymbolLayerManager.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/19/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLSymbolLayerManager.h"
-#import "RCTMGLSymbolLayer.h"
-
-@implementation RCTMGLSymbolLayerManager
-
-RCT_EXPORT_MODULE()
-
-// circle layer props
-RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString);
-
-// standard layer props
-RCT_EXPORT_VIEW_PROPERTY(id, NSString);
-RCT_EXPORT_VIEW_PROPERTY(sourceID, NSString);
-RCT_EXPORT_VIEW_PROPERTY(filter, NSArray);
-RCT_EXPORT_VIEW_PROPERTY(snapshot, BOOL);
-
-RCT_EXPORT_VIEW_PROPERTY(aboveLayerID, NSString);
-RCT_EXPORT_VIEW_PROPERTY(belowLayerID, NSString);
-RCT_EXPORT_VIEW_PROPERTY(layerIndex, NSNumber);
-RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
-
-RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber);
-RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber);
-
-- (UIView*)view
-{
-    RCTMGLSymbolLayer *layer = [RCTMGLSymbolLayer new];
-    layer.bridge = self.bridge;
-    return layer;
-}
-
-@end

package/ios/RCTMGL/RCTMGLTileSource.h

@@ -1,22 +0,0 @@
-//
-//  RCTMGLTileSource.h
-//  RCTMGL
-//
-
-#import "RCTMGLSource.h"
-@import Mapbox;
-
-@interface RCTMGLTileSource : RCTMGLSource
-
-@property (nonatomic, copy) NSString *url;
-@property (nonatomic, strong) NSArray<NSString *> *tileUrlTemplates;
-@property (nonatomic, copy) NSString *attribution;
-
-@property (nonatomic, strong) NSNumber *minZoomLevel;
-@property (nonatomic, strong) NSNumber *maxZoomLevel;
-
-@property (nonatomic, assign) BOOL tms;
-
-- (NSDictionary<MGLTileSourceOption, id>*)getOptions;
-
-@end

package/ios/RCTMGL/RCTMGLTileSource.m

@@ -1,31 +0,0 @@
-//
-//  BaseSource.m
-//  RCTMGL
-//
-
-#import "RCTMGLTileSource.h"
-
-@implementation RCTMGLTileSource
-
-- (NSDictionary<MGLTileSourceOption, id>*)getOptions {
-    NSMutableDictionary<MGLTileSourceOption, id> *options = [[NSMutableDictionary alloc] init];
-    
-    if (self.maxZoomLevel != nil) {
-        options[MGLTileSourceOptionMaximumZoomLevel] = self.maxZoomLevel;
-    }
-    
-    if (self.minZoomLevel != nil) {
-        options[MGLTileSourceOptionMinimumZoomLevel] = self.minZoomLevel;
-    }
-    
-    if (self.tms) {
-        options[MGLTileSourceOptionTileCoordinateSystem] = [NSNumber numberWithUnsignedInteger:MGLTileCoordinateSystemTMS];
-    }
-    
-    if (self.attribution != nil) {
-        options[MGLTileSourceOptionAttributionHTMLString] = self.attribution;
-    }
-    
-    return options;
-}
-@end

package/ios/RCTMGL/RCTMGLUserLocation.h

@@ -1,15 +0,0 @@
-//
-//  RCTMGLUserLocation.h
-//  RCTMGL
-
-#import <Foundation/Foundation.h>
-#import <CoreLocation/CoreLocation.h>
-#import <Mapbox/MGLUserLocationAnnotationView.h>
-
-@interface RCTMGLUserLocation : NSObject
-
-+ (id)sharedInstance;
-
-- (MGLUserLocationAnnotationView*)hiddenUserAnnotation;
-
-@end

package/ios/RCTMGL/RCTMGLUserLocation.m

@@ -1,38 +0,0 @@
-//
-//  RCTMGLUserLocation.m
-//  RCTMGL
-//
-
-#import "RCTMGLUserLocation.h"
-#import <Mapbox/MGLUserLocationAnnotationView.h>
-
-@interface HiddenUserLocationAnnotationView : MGLUserLocationAnnotationView
-
-@end
-
-@implementation HiddenUserLocationAnnotationView
-
-
-- (void)update {
-    self.frame = CGRectNull;
-}
-
-@end
-
-
-@implementation RCTMGLUserLocation : NSObject
-
-+ (id)sharedInstance
-{
-    static RCTMGLUserLocation *userLocation = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{ userLocation = [[self alloc] init]; });
-    return userLocation;
-}
-
-- (MGLUserLocationAnnotationView*)hiddenUserAnnotation
-{
-    return [[HiddenUserLocationAnnotationView alloc] init];
-}
-
-@end

package/ios/RCTMGL/RCTMGLUtils.h

@@ -1,31 +0,0 @@
-//
-//  RCTConvert+Mapbox.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 8/23/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <MapKit/MapKit.h>
-#import <React/RCTBridge.h>
-#import <React/RCTConvert.h>
-#import <React/RCTImageLoader.h>
-
-@import Mapbox;
-
-@interface RCTMGLUtils: NSObject
-
-+ (CLLocationCoordinate2D)fromFeature:(NSString*)json;
-+ (MGLShape*)shapeFromGeoJSON:(NSString*)json;
-+ (MGLCoordinateBounds)fromFeatureCollection:(NSString*)json;
-+ (NSArray<NSNumber *> *)fromCoordinateBounds:(MGLCoordinateBounds)bounds;
-+ (NSTimeInterval)fromMS:(NSNumber*)number;
-+ (NSNumber*)clamp:(NSNumber*)value min:(NSNumber*)min max:(NSNumber*)max;
-+ (UIColor*)toColor:(id)value;
-+ (void)fetchImage:(RCTBridge*)bridge url:(NSString*)url scale:(double)scale callback:(RCTImageLoaderCompletionBlock)callback;
-+ (void)fetchImages:(RCTBridge *)bridge style:(MGLStyle *)style objects:(NSDictionary<NSString *, NSString *>*)objects forceUpdate:(BOOL)forceUpdate callback:(void (^)(void))callback;
-+ (CGVector)toCGVector:(NSArray<NSNumber*>*)arr;
-+ (UIEdgeInsets)toUIEdgeInsets:(NSArray<NSNumber *> *)arr;
-+ (NSURL*)styleURLFromStyleJSON:(NSString *)styleJSON;
-
-@end