@rnmapbox/maps 10.0.15 → 10.1.0-beta.4

package/ios/RCTMGL/RCTMGLImages.m

@@ -1,126 +0,0 @@
-#import "RCTMGLImages.h"
-#import <React/UIView+React.h>
-#import "RCTMGLMapView.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLEvent.h"
-#import "RCTMGLEventTypes.h"
-
-
-@implementation RCTMGLImages : UIView
-
-static UIImage * _placeHolderImage;
-
-- (void)addToMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    [self _addNativeImages:_nativeImages];
-    [self _addRemoteImages:_images];
-}
-
-- (void)removeFromMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    
-    [self _removeImages];
-}
-
-- (void)_removeImages
-{
-    if ([self _hasImages]) {
-        NSArray<NSString *> *imageNames = _images.allKeys;
-        
-        for (NSString *imageName in imageNames) {
-            [self.map.style removeImageForName:imageName];
-        }
-    }
-    
-    if ([self _hasNativeImages]) {
-        for (NSString *imageName in _nativeImages) {
-            [self.map.style removeImageForName:imageName];
-        }
-    }
-}
-
--(BOOL)addMissingImageToStyle:(NSString *)imageName {
-    if (_nativeImages && [_nativeImages containsObject:imageName]) {
-        [self _addNativeImages:@[imageName]];
-        return true;
-    }
-    
-    NSString *remoteImage = _images != nil ? [_images objectForKey:imageName] : nil;
-    if (remoteImage) {
-        [self _addRemoteImages:@{imageName: remoteImage}];
-        return true;
-    }
-    return false;
-}
-
-- (void) sendImageMissingEvent:(NSString *)imageName {
-    NSDictionary *payload = @{ @"imageKey": imageName };
-    RCTMGLEvent *event = [RCTMGLEvent makeEvent:RCT_MAPBOX_IMAGES_MISSING_IMAGE withPayload:payload];
-    if (_onImageMissing) {
-        _onImageMissing([event toJSON]);
-    }
-}
-
-- (void)_addNativeImages:(NSArray<NSString *>*)nativeImages
-{
-    if (!nativeImages) return;
-
-    for (NSString *imageName in nativeImages) {
-        // only add native images if they are not in the style yet (similar to [RCTMGLUtils fetchImages: style:])
-        if (![self.map.style imageForName:imageName]) {
-            UIImage *image = [UIImage imageNamed:imageName];
-            [self.map.style setImage:image forName:imageName];
-        }
-    }
-}
-
-- (void)_addRemoteImages:(NSDictionary<NSString *, NSString *>*)remoteImages
-{
-    if (!remoteImages) return;
-    NSDictionary<NSString *, NSString *> *missingImages = [NSMutableDictionary new];
-    
-    // Add image placeholder for images that are not yet available in the style. This way
-    // we can load the images asynchronously and add the ShapeSource to the map without delay.
-    // The same is required when this ShapeSource is updated with new/added images and the
-    // data references them. In which case addMissingImageToStyle will take care of loading
-    // them in a similar way.
-    //
-    // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
-    for (NSString *imageName in remoteImages.allKeys) {
-        if (![self.map.style imageForName:imageName]) {
-            [self.map.style setImage:[RCTMGLImages placeholderImage] forName:imageName];
-            [missingImages setValue:_images[imageName] forKey:imageName];
-        }
-    }
-    
-    if (missingImages.count > 0) {
-        // forceUpdate to ensure the placeholder images are updated
-        [RCTMGLUtils fetchImages:_bridge style:self.map.style objects:_images forceUpdate:true callback:^{ }];
-    }
-}
-
-- (BOOL)_hasImages
-{
-    return _images != nil && _images.count > 0;
-}
-
-- (BOOL)_hasNativeImages
-{
-    return _nativeImages != nil && _nativeImages.count > 0;
-}
-
-+ (UIImage *)placeholderImage {
-    if (_placeHolderImage) return _placeHolderImage;
-    UIGraphicsBeginImageContextWithOptions(CGSizeMake(1, 1), NO, 0.0);
-    _placeHolderImage = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    return _placeHolderImage;
-}
-
-@end

package/ios/RCTMGL/RCTMGLImagesManager.h

@@ -1,5 +0,0 @@
-#import "ViewManager.h"
-
-@interface RCTMGLImagesManager : ViewManager
-
-@end

package/ios/RCTMGL/RCTMGLImagesManager.m

@@ -1,21 +0,0 @@
-#import "RCTMGLImagesManager.h"
-#import "RCTMGLImages.h"
-
-@implementation RCTMGLImagesManager
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_VIEW_PROPERTY(id, NSString)
-RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
-
-RCT_REMAP_VIEW_PROPERTY(onImageMissing, onImageMissing, RCTBubblingEventBlock)
-
-- (UIView*)view
-{
-    RCTMGLImages *images = [RCTMGLImages new];
-    images.bridge = self.bridge;
-    return images;
-}
-
-@end

package/ios/RCTMGL/RCTMGLLayer.h

@@ -1,52 +0,0 @@
-//
-//  BaseLayer.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <React/RCTBridge.h>
-
-
-@class RCTMGLMapView;
-
-@import Mapbox;
-
-@interface RCTMGLLayer<T> : UIView
-
-@property (nonatomic, weak, nullable) RCTBridge* bridge;
-
-@property (nonatomic, strong, nullable) MGLStyleLayer *styleLayer;
-@property (nonatomic, strong, nullable) MGLStyle *style;
-@property (nonatomic, weak, nullable) RCTMGLMapView* map;
-@property (nonatomic, strong, nullable) NSDictionary *reactStyle;
-@property (nonatomic, strong, nullable) NSArray *filter;
-
-@property (nonatomic, copy, nullable) NSString *id;
-@property (nonatomic, copy, nullable) NSString *sourceID;
-
-@property (nonatomic, copy, nullable) NSString *aboveLayerID;
-@property (nonatomic, copy, nullable) NSString *belowLayerID;
-@property (nonatomic, copy, nullable) NSNumber *layerIndex;
-
-@property (nonatomic, copy, nullable) NSNumber *maxZoomLevel;
-@property (nonatomic, copy, nullable) NSNumber *minZoomLevel;
-
-- (void)addToMap:(nonnull RCTMGLMapView*)map style:(nonnull MGLStyle*)style;
-- (void)addedToMap;
-- (void)removeFromMap:(nonnull MGLStyle*)style;
-- (nullable T)makeLayer:(nonnull MGLStyle*)style;
-- (void)addStyles;
-- (void)insertAbove:(nonnull NSString*)layer;
-- (void)insertBelow:(nonnull NSString*)layer;
-- (void)insertAtIndex:(NSUInteger)index;
-- (void)insertLayer;
-- (void)setZoomBounds;
-
-- (BOOL)isAddedToMap;
-
-- (nullable MGLSource*)layerWithSourceIDInStyle:(nonnull MGLStyle*) style;
-
-@end

package/ios/RCTMGL/RCTMGLLayer.m

@@ -1,236 +0,0 @@
-//
-//  BaseLayer.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLLayer.h"
-#import "RCTMGLSource.h"
-#import "RCTMGLStyleValue.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLMapView.h"
-
-@implementation RCTMGLLayer
-
-- (void)setMinZoomLevel:(NSNumber*)minZoomLevel
-{
-    _minZoomLevel = minZoomLevel;
-    
-    if (_styleLayer != nil) {
-        _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
-    }
-}
-
-- (void)setMaxZoomLevel:(NSNumber*)maxZoomLevel
-{
-    _maxZoomLevel = maxZoomLevel;
-    
-    if (_styleLayer != nil) {
-        _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
-    }
-}
-
-- (void)setAboveLayerID:(NSString *)aboveLayerID
-{
-    if (_aboveLayerID != nil && _aboveLayerID == aboveLayerID) {
-        return;
-    }
-    
-    _aboveLayerID = aboveLayerID;
-    if (_styleLayer != nil) {
-        [self removeFromMap:_style];
-        [self insertAbove:aboveLayerID];
-    }
-}
-
-- (void)setBelowLayerID:(NSString *)belowLayerID
-{
-    if (_belowLayerID != nil && _belowLayerID == belowLayerID) {
-        return;
-    }
-    
-    _belowLayerID = belowLayerID;
-    if (_styleLayer != nil) {
-        [self removeFromMap:_style];
-        [self insertBelow:_belowLayerID];
-    }
-}
-
-- (void)setLayerIndex:(NSNumber *)layerIndex
-{
-    if (_layerIndex != nil && _layerIndex == layerIndex) {
-        return;
-    }
-    
-    _layerIndex = layerIndex;
-    if (_styleLayer != nil) {
-        [self removeFromMap:_style];
-        [self insertAtIndex:_layerIndex.unsignedIntegerValue];
-    }
-}
-
-- (void)setMap:(RCTMGLMapView *)map {
-    if (map == nil) {
-        [self removeFromMap:_map.style];
-        _map = nil;
-    } else {
-        _map = map;
-        [self addToMap:map style:map.style];
-    }
-}
-
--(void)setReactStyle:(NSDictionary *)reactStyle
-{
-    _reactStyle = reactStyle;
-    
-    if (_styleLayer != nil) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-           [self addStyles];
-        });
-    }
-}
-
-- (void)addToMap:(RCTMGLMapView*) map style:(MGLStyle *)style
-{
-    if (style == nil) {
-        return;
-    }
-    _map = map;
-    _style = style;
-    if (_id == nil) {
-      RCTLogError(@"Cannot add a layer without id to the map: %@", self);
-      return;
-    }
-    MGLStyleLayer *existingLayer = [style layerWithIdentifier:_id];
-    if (existingLayer != nil) {
-        _styleLayer = existingLayer;
-    } else {
-        _styleLayer = [self makeLayer:style];
-        if (_styleLayer == nil) {
-            RCTLogError(@"Failed to make layer: %@", _id);
-            return;
-        }
-        [self insertLayer: map];
-    }
-    
-    [self addStyles];
-    [self addedToMap];
-}
-
-- (nullable MGLSource*)layerWithSourceIDInStyle:(nonnull MGLStyle*) style
-{
-    MGLSource* result = [style sourceWithIdentifier: self.sourceID];
-    if (result == NULL) {
-        RCTLogError(@"Cannot find layer with id: %@ referenced by layer:%@", self.sourceID, _id);
-    }
-    return result;
-}
-
-- (void)removeFromMap:(MGLStyle *)style
-{
-    if (_styleLayer != nil) {
-        [style removeLayer:_styleLayer];
-    }
-    _style = nil;
-}
-
-- (BOOL)isAddedToMap
-{
-    return (_style != nil);
-}
-
-- (nullable MGLStyleLayer*)makeLayer:(MGLStyle*)style
-{
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                        reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
-                        userInfo:nil];
-}
-
-- (void)addStyles
-{
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                                   reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
-                                 userInfo:nil];
-}
-
-- (void)addedToMap
-{
-    // override if you want
-}
-
-- (void)insertLayer: (RCTMGLMapView*) map
-{
-    if ([_style layerWithIdentifier:_id] != nil) {
-        return; // prevent layer from being added twice
-    }
-
-    if (_aboveLayerID != nil) {
-        [self insertAbove:_aboveLayerID];
-    } else if (_belowLayerID != nil) {
-        [self insertBelow:_belowLayerID];
-    } else if (_layerIndex != nil) {
-        [self insertAtIndex:_layerIndex.unsignedIntegerValue];
-    } else {
-        [_style addLayer:_styleLayer];
-        [_map layerAdded:_styleLayer];
-    }
-    
-    [self setZoomBounds];
-}
-
-- (void)setZoomBounds
-{
-    if (_maxZoomLevel != nil) {
-        _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
-    }
-    
-    if (_minZoomLevel != nil) {
-        _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
-    }
-}
-
--(void)insertAbove:(NSString*)aboveLayerIDs
-{
-    [_map waitForLayerWithID: aboveLayerIDs then:^void (MGLStyleLayer* layer) {
-        if (![self _hasInitialized]) {
-            return;
-        }
-        [self->_style insertLayer:self->_styleLayer aboveLayer:layer];
-        [self->_map layerAdded:self->_styleLayer];
-    }];
-}
-
--(void)insertBelow:(NSString*)belowLayerID
-{
-    [_map waitForLayerWithID: belowLayerID then:^void (MGLStyleLayer* layer) {
-        if (![self _hasInitialized]) {
-            return;
-        }
-        
-        [self->_style insertLayer:self->_styleLayer belowLayer:layer];
-        [self->_map layerAdded:self->_styleLayer];
-    }];
-}
-
--(void)insertAtIndex:(NSUInteger)index
-{
-    if (![self _hasInitialized]) {
-        return;
-    }
-    NSArray *layers = _style.layers;
-    if (index >= layers.count) {
-        RCTLogWarn(@"Layer index is greater than number of layers on map. Layer inserted at end of layer stack.");
-        index = layers.count - 1;
-    }
-    [_style insertLayer:self->_styleLayer atIndex:index];
-    [_map layerAdded:self->_styleLayer];
-}
-
-- (BOOL)_hasInitialized
-{
-    return _style != nil && _styleLayer != nil;
-}
-
-@end

package/ios/RCTMGL/RCTMGLLight.h

@@ -1,17 +0,0 @@
-//
-//  RCTMGLLight.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/26/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-@import Mapbox;
-
-@interface RCTMGLLight : UIView
-
-@property (nonatomic, strong) MGLMapView *map;
-@property (nonatomic, strong) NSDictionary *reactStyle;
-
-@end

package/ios/RCTMGL/RCTMGLLight.m

@@ -1,46 +0,0 @@
-//
-//  RCTMGLLight.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/26/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLLight.h"
-#import "RCTMGLStyle.h"
-
-@implementation RCTMGLLight
-{
-    MGLLight *internalLight;
-}
-
-- (void)setReactStyle:(NSDictionary *)reactStyle
-{
-    _reactStyle = reactStyle;
-    
-    if (_map != nil) {
-        [self addStyles];
-    }
-}
-
-- (void)setMap:(MGLMapView *)map
-{
-    _map = map;
-    [self addStyles];
-}
-
-- (BOOL)isAddedToMap {
-    return _map != NULL;
-}
-
-- (void)addStyles
-{
-    MGLLight *light = [[MGLLight alloc] init];
-    RCTMGLStyle *style = [[RCTMGLStyle alloc] init];
-    [style lightLayer:light withReactStyle:_reactStyle isValid:^{
-        return [self isAddedToMap];
-    }];
-    _map.style.light = light;
-}
-
-@end

package/ios/RCTMGL/RCTMGLLightManager.h

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

package/ios/RCTMGL/RCTMGLLightManager.m

@@ -1,23 +0,0 @@
-//
-//  RCTMGLLightManager.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/26/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLLightManager.h"
-#import "RCTMGLLight.h"
-
-@implementation RCTMGLLightManager
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
-
-- (UIView*)view
-{
-    return [RCTMGLLight new];
-}
-
-@end

package/ios/RCTMGL/RCTMGLLineLayer.h

@@ -1,14 +0,0 @@
-//
-//  RCTMGLLineLayer.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/18/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLVectorLayer.h"
-@import Mapbox;
-
-@interface RCTMGLLineLayer : RCTMGLVectorLayer
-
-@end

package/ios/RCTMGL/RCTMGLLineLayer.m

@@ -1,33 +0,0 @@
-//
-//  RCTMGLLineLayer.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/18/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLLineLayer.h"
-#import "RCTMGLStyle.h"
-#import <React/RCTLog.h>
-
-@implementation RCTMGLLineLayer
-
-- (MGLLineStyleLayer*)makeLayer:(MGLStyle*)style
-{
-    MGLSource *source = [self layerWithSourceIDInStyle:style];
-    if (source == nil) { return nil; }
-    MGLLineStyleLayer *layer = [[MGLLineStyleLayer 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 lineLayer:(MGLLineStyleLayer *)self.styleLayer withReactStyle:self.reactStyle isValid:^{
-        return [self isAddedToMap];
-    }];
-}
-
-@end

package/ios/RCTMGL/RCTMGLLineLayerManager.h

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

package/ios/RCTMGL/RCTMGLLineLayerManager.m

@@ -1,40 +0,0 @@
-//
-//  RCTMGLLineLayerManager.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/18/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLLineLayerManager.h"
-#import "RCTMGLLineLayer.h"
-
-@implementation RCTMGLLineLayerManager
-
-RCT_EXPORT_MODULE()
-
-// line 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(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
-{
-    RCTMGLLineLayer *layer = [RCTMGLLineLayer new];
-    layer.bridge = self.bridge;
-    return layer;
-}
-
-
-@end

package/ios/RCTMGL/RCTMGLLocation.h

@@ -1,19 +0,0 @@
-//
-//  RCTMGLLocation.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 6/21/18.
-//  Copyright © 2018 Mapbox Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreLocation/CoreLocation.h>
-
-@interface RCTMGLLocation : NSObject
-
-@property (nonatomic, strong) CLLocation *location;
-@property (nonatomic, strong) CLHeading *heading;
-
-- (NSDictionary<NSString *, id> *)toJSON;
-
-@end

package/ios/RCTMGL/RCTMGLLocation.m

@@ -1,32 +0,0 @@
-//
-//  RCTMGLLocation.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 6/21/18.
-//  Copyright © 2018 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLLocation.h"
-
-@implementation RCTMGLLocation
-
-- (NSDictionary<NSString *, id> *)toJSON
-{
-    NSMutableDictionary<NSString *, id> *json = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary<NSString *, NSNumber *> *coords = [[NSMutableDictionary alloc] init];
-    coords[@"longitude"] = @(_location.coordinate.longitude);
-    coords[@"latitude"] = @(_location.coordinate.latitude);
-    coords[@"altitude"] = @(_location.altitude);
-    coords[@"accuracy"] = @(_location.horizontalAccuracy);
-    coords[@"heading"] = @(_heading.trueHeading);
-    coords[@"course"] = @(_location.course);
-    coords[@"speed"] = @(_location.speed);
-    
-    json[@"coords"] = coords;
-    json[@"timestamp"] = @([_location.timestamp timeIntervalSince1970] * 1000);
-    
-    return json;
-}
-
-@end