@rnmapbox/maps 10.0.15 → 10.1.0-beta.10

package/ios/RNMBX/RNMBXSymbolLayer.swift

@@ -0,0 +1,58 @@
+import MapboxMaps
+
+@objc(RNMBXSymbolLayer)
+public class RNMBXSymbolLayer: RNMBXVectorLayer {
+  
+  typealias LayerType = SymbolLayer
+
+  override func makeLayer(style: Style) throws -> Layer {
+    let _ : VectorSource = try self.layerWithSourceID(in: style)
+    #if RNMBX_11
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    #else
+    var layer = LayerType(id: self.id!)
+    #endif
+    layer.sourceLayer = self.sourceLayerID
+    layer.source = sourceID
+    return layer
+  }
+
+  override func layerType() -> Layer.Type {
+    return LayerType.self
+  }
+
+  override func apply(style : Style) throws {
+    try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout SymbolLayer) in
+      if var styleLayer = self.styleLayer as? LayerType {
+        layer = styleLayer
+      }
+    }
+  }
+  
+  override func addStyles() {
+    if let style : Style = self.style {
+      let styler =  RNMBXStyle(style: self.style!)
+      styler.bridge = self.bridge
+      
+      if var styleLayer = self.styleLayer as? LayerType,
+         let reactStyle = self.reactStyle {
+        styler.symbolLayer(
+          layer: &styleLayer,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
+          applyUpdater: { (updater) in logged("RNMBXSymbolLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
+          isValid: {
+            return self.isAddedToMap()
+          }
+        )
+        self.styleLayer = styleLayer
+      }
+    }
+  }
+  
+  func isAddedToMap() -> Bool {
+    return true
+  }
+}

package/ios/RNMBX/RNMBXSymbolLayerComponentView.h

@@ -0,0 +1,15 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMBXSymbolLayerComponentView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXSymbolLayerComponentView.mm

@@ -0,0 +1,68 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXSymbolLayerComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface RNMBXSymbolLayerComponentView () <RCTRNMBXSymbolLayerViewProtocol>
+@end
+
+@implementation RNMBXSymbolLayerComponentView {
+    RNMBXSymbolLayer *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXSymbolLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXSymbolLayer alloc] init];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXSymbolLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const RNMBXSymbolLayerProps>(props);
+  RNMBXSetCommonLayerProps(newProps, _view);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXSymbolLayerCls(void)
+{
+  return RNMBXSymbolLayerComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXSymbolLayerViewManager.m

@@ -0,0 +1,12 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXSymbolLayer, RNMBXSymbolLayerViewManager, RCTViewManager)
+
+// symbol layer props
+RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)
+
+// standard layer props
+#include "CommonLayerProperties.H"
+
+@end

package/ios/RNMBX/RNMBXSymbolLayerViewManager.swift

@@ -0,0 +1,13 @@
+@objc(RNMBXSymbolLayerViewManager)
+class RNMBXSymbolLayerViewManager: RCTViewManager {
+    @objc
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+  
+    override func view() -> UIView! {
+      let layer = RNMBXSymbolLayer()
+      layer.bridge = self.bridge
+      return layer
+    }
+}

package/ios/RNMBX/RNMBXTerrain.swift

@@ -0,0 +1,93 @@
+import MapboxMaps
+
+@objc
+class RNMBXTerrain : RNMBXSingletonLayer, RNMBXMapComponent, RNMBXSourceConsumer {
+  var terrain : Terrain? = nil
+  
+  func makeTerrain() -> Terrain {
+    guard let sourceID = sourceID else {
+      Logger.log(level: .error, message: "Terrain should have a sourceID")
+      return Terrain(sourceId: "n/a")
+    }
+
+    return Terrain(sourceId: sourceID)
+  }
+  
+  func addToMap(_ map: RNMBXMapView, style: Style) {
+    self.map = map
+    self.style = style
+    
+    let terrain = self.makeTerrain()
+    self.terrain = terrain
+    addStylesAndUpdate()
+  }
+  
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    self.map = nil
+    
+    guard let mapboxMap = map.mapboxMap else {
+      return true
+    }
+    
+    let style = mapboxMap.style
+    removeFromMap(map, style: style)
+    return true
+  }
+  
+  func waitForStyleLoad() -> Bool {
+    return true
+  }
+  
+  func removeFromMap(_ map: RNMBXMapView, style: Style) {
+    logged("RNMBXTerrain.removeFromMap") {
+      style.removeTerrain()
+    }
+  }
+
+  @objc var sourceID: String? = nil {
+    didSet {
+      guard let sourceID = sourceID else {
+        Logger.log(level: .error, message: "RNMBXTerrain cannot set source to nil")
+        return
+      }
+      
+      terrain?.source = sourceID
+      self.update()
+    }
+  }
+  
+  override func addStylesAndUpdate() {
+    guard terrain != nil else {
+      return
+    }
+
+    super.addStylesAndUpdate()
+  }
+  
+  override func addStyles() {
+    if let style : Style = self.style,
+       let reactStyle = reactStyle {
+      let styler = RNMBXStyle(style: style)
+      styler.bridge = self.bridge
+      
+      if var terrain = terrain {
+        styler.terrainLayer(
+          layer: &terrain,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReactStyle,
+          applyUpdater: { (updater) in fatalError("Terrain: TODO - implement apply updater")},
+          isValid: { fatalError("Terrain: TODO - no isValid") }
+        )
+        self.terrain = terrain
+      } else {
+        fatalError("[xxx] terrain is nil \(optional: self.terrain)")
+      }
+    }
+  }
+  
+  override func apply(style : Style) throws {
+    if let terrain = terrain {
+      try style.setTerrain(terrain)
+    }
+  }
+}

package/ios/RNMBX/RNMBXTerrainManager.m

@@ -0,0 +1,15 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RNMBXTerrain : UIView
+{}
+@property (nonatomic) NSObject* exaggeration;
+@end
+
+@interface RCT_EXTERN_MODULE(RNMBXTerrainManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(sourceID, NSString);
+
+RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
+
+@end

package/ios/RNMBX/RNMBXTerrainManager.swift

@@ -0,0 +1,13 @@
+@objc(RNMBXTerrainManager)
+class RNMBXTerrainManager: RCTViewManager {
+    @objc
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+  
+    override func view() -> UIView! {
+      let terrain = RNMBXTerrain()
+      terrain.bridge = self.bridge
+      return terrain
+    }
+}

package/ios/RNMBX/RNMBXTileSource.swift

@@ -0,0 +1,5 @@
+@objc
+class RNMBXTileSource : RNMBXSource {
+  @objc var url: String? = nil
+  
+}

package/ios/RNMBX/RNMBXUtils.swift

@@ -0,0 +1,69 @@
+import MapboxMaps
+
+class RNMBXUtils {
+  static func fetchImage(_ bridge: RCTBridge, url: String?, scale:Double, callback: @escaping (_ error: Error?, _ image: UIImage?) -> Void) {
+    guard let url = url else {
+      fatalError("FetchImage called with nil as url")
+    }
+    RNMBXImageQueue.sharedInstance.addImage(url, scale: scale, bridge: bridge, handler: callback)
+  }
+  
+  static func fetchImages(_ bridge: RCTBridge, style: Style, objects: [String:Any], forceUpdate: Bool, loaded: @escaping (_ name:String) -> Void, callback: @escaping ()->Void) {
+    guard !objects.isEmpty else {
+      callback()
+      return
+    }
+    
+    let imageNames = objects.keys
+    var imagesToLoad: Int = imageNames.count
+    
+    let imageLoadedBlock = { () in
+      imagesToLoad = imagesToLoad - 1;
+      if imagesToLoad == 0 {
+        callback()
+      }
+    }
+    
+    for imageName in imageNames {
+      let foundImage: UIImage? = forceUpdate ? nil : style.image(withId: imageName)
+      
+      if (forceUpdate || foundImage == nil) {
+        let image = objects[imageName]
+        if let image = image as? [String:Any] {
+          var scale = (image["scale"] as? NSNumber)?.floatValue ?? 1.0
+          let sdf = (image["sdf"] as? NSNumber)?.boolValue ?? false
+          let imageStretchX = image["stretchX"] as? [[NSNumber]]
+          let stretchX: [ImageStretches] = imageStretchX != nil ? RNMBXImages.convert(stretch: imageStretchX!, scale: CGFloat(scale)) : []
+          let imageStretchY = image["stretchY"] as? [[NSNumber]]
+          let stretchY: [ImageStretches] = imageStretchY != nil ? RNMBXImages.convert(stretch: imageStretchY!, scale: CGFloat(scale)) : []
+          let content: ImageContent? = RNMBXImages.convert(content: image["content"] as? [NSNumber], scale: CGFloat(scale))
+          var resolvedImage = image
+          if let actResolvedImage = resolvedImage["resolvedImage"] as? [String:Any] {
+            resolvedImage = actResolvedImage
+            if let scaleInResolvedImage = resolvedImage["scale"] as? NSNumber {
+              scale = scale * scaleInResolvedImage.floatValue
+            }
+          }
+          
+          RNMBXImageQueue.sharedInstance.addImage(resolvedImage, scale: Double(scale), bridge:bridge) {
+            (error,image) in
+            if image == nil {
+              RNMBXLogWarn("Failed to fetch image: \(imageName) error:\(optional: error)")
+            }
+            else {
+              DispatchQueue.main.async {
+                if let image = image {
+                  logged("RNMBXUtils.fetchImage-\(imageName)") {
+                    try style.addImage(image, id: imageName, sdf:sdf, stretchX: stretchX, stretchY: stretchY, content: content)
+                    loaded(imageName)
+                    imageLoadedBlock()
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/ios/RNMBX/RNMBXVectorLayer.m

@@ -0,0 +1,58 @@
+//
+//  RNMBXCircleLayer.m
+//  RNMBX
+//
+//  Created by Nick Italiano on 9/18/17.
+//  Copyright © 2017 Mapbox Inc. All rights reserved.
+//
+
+//#import "RNMBXStyle.h"
+// #import "FilterParser.h"
+#import <React/RCTLog.h>
+
+//@implementation RNMBXVectorLayer
+
+/*
+- (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/RNMBX/RNMBXVectorLayer.swift

@@ -0,0 +1,5 @@
+import MapboxMaps
+
+@objc(RNMBXVectorLayer)
+public class RNMBXVectorLayer: RNMBXLayer {
+}

package/ios/RNMBX/RNMBXVectorSource.swift

@@ -0,0 +1,61 @@
+import MapboxMaps
+
+@objc
+class RNMBXVectorSource : RNMBXTileSource {
+  
+  @objc var attribution: String?
+  @objc var maxZoomLevel: NSNumber?
+  @objc var minZoomLevel: NSNumber?
+  @objc var tileUrlTemplates: [String] = []
+  @objc var tms: Bool = false
+  
+  override func sourceType() -> Source.Type {
+    return VectorSource.self
+  }
+
+  override func makeSource() -> Source
+  {
+    #if RNMBX_11
+    var result = VectorSource(id: self.id)
+    #else
+    var result = VectorSource()
+    #endif
+    if let url = url {
+      result.url = url
+    } else {
+      result.tiles = tileUrlTemplates
+    }
+    if let attribution = attribution {
+      result.attribution = attribution
+    }
+    if let maxZoomLevel = maxZoomLevel {
+      result.maxzoom = maxZoomLevel.doubleValue
+    }
+    if let minZoomLevel = minZoomLevel {
+      result.minzoom = minZoomLevel.doubleValue
+    }
+    if tms {
+      result.scheme = .tms
+    }
+    return result
+  }
+  
+  
+  
+  /*
+  - (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];
+}*/
+
+}

package/ios/RNMBX/RNMBXVectorSourceManager.m

@@ -0,0 +1,22 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_MODULE(RNMBXVectorSourceManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(id, NSString)
+RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)
+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_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
+RCT_REMAP_VIEW_PROPERTY(onMapboxVectorSourcePress, onPress, RCTBubblingEventBlock)
+
+@end

package/ios/RNMBX/RNMBXVectorSourceManager.swift

@@ -0,0 +1,11 @@
+@objc(RNMBXVectorSourceManager)
+class RNMBXVectorSourceManager: RCTViewManager {
+  @objc
+  override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+ 
+  @objc override func view() -> UIView {
+    return RNMBXVectorSource()
+  }
+}

package/ios/RNMBX/rnmapbox_maps-Swift.pre.h

@@ -0,0 +1,13 @@
+// ideally the file extension would be just `.h` but then it gets picked up as a header part of the umbrella header
+
+#import <CoreFoundation/CoreFoundation.h>
+#import <CoreLocation/CoreLocation.h>
+
+@interface MapView : UIView
+@end
+
+#if RNMBX_USE_FRAMEWORKS
+#import <rnmapbox_maps/rnmapbox_maps-Swift.h>
+#else
+#import <rnmapbox_maps-Swift.h>
+#endif

package/ios/RNMBX/rnmapbox_maps.h

@@ -0,0 +1 @@
+// xcode tries to import this header in the auto-generated swift header

package/ios/install.md

@@ -6,12 +6,14 @@ The following assumes, that you're using autolinking and installed
 
 `@rnmapbox/maps` via `npm` or `yarn`.
 
-<br>
-
-The following is required for every following setup
+<br/>
 
 Add the following to your `ios/Podfile`:
 
+```
+$RNMapboxMapsImpl = 'mapbox'
+```
+
 
 ```ruby
   pre_install do |installer|
@@ -27,6 +29,12 @@ Add the following to your `ios/Podfile`:
   end
 ```
 
+<br>
+
+You will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
+
+
+
 Set the `$RNMapboxMapsImpl` to `mapbox` aka v10 implementation [see bellow for detailed instructions](#mapbox-maps-sdk-v10)
 
 Run `pod install` to download the proper mapbox dependency.
@@ -50,11 +58,11 @@ You are good to go!
 
 Read on if you want to edit your Mapbox version or flavor.
 
-<br>
+<br/>
 
 ## Mapbox Maps SDK (v10)
 
-This is the version we recommend, while other implementations should work, we don't plan to support them in next version.
+This is the version we recommend.
 
 Check the current version of the SDK [here](https://docs.mapbox.com/ios/maps/overview/).
 
@@ -63,59 +71,44 @@ Add the following to the beginning of your podfile
 $RNMapboxMapsImpl = 'mapbox'
 ```
 
-You can also override the version to use. *Warning:* if you set a version, then later update, the `rnamapbox/maps` library it's possible that you'll end up using Mapbox older version than supported. Make sure you revise this value with `rnmapbox/maps` updates.
+## Using a custom version of the Mapbox SDK
+
+You can also override the version to use. *Warning:* if you set a version, then later update, the `rnamapbox/maps` library it's possible that you'll end up using Mapbox older version than supported. Make sure you revise this value with `@rnmapbox/maps` updates. Also note that for 11.0 or later versions you'll need to set `$RNMapboxMapsUseV11 = true`, see bellow
 
 ```ruby
 # Warning: only for advanced use cases, only do this if you know what you're doing.
 # $RNMapboxMapsVersion = '~> 10.12.0'
 ```
 
-You will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
-
 <br/>
 
-## Maplibre
+## V11 support
 
-[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL
+We have experimental support for mapbox 11 beta.
 
-Current default MapLibre version is `5.12.0`
-
-This is the default and requires no further setup`ios/Podfile`
-
-If you want to change the version used:
+Add the following to your Podfile:
 
 ```ruby
-$RNMapboxMapsImpl = 'maplibre' # optional as this is the default
-$RNMapboxMapsVersion = 'exactVersion 5.12.1'
+$RNMapboxMapsUseV11 = true # use 11 version
+$RNMapboxMapsVersion = '= 11.0.0-beta.3'
 ```
 
-MapLibre is consumed via Swift Package Manager, use `RNMapboxMapsSwiftPackageManager` to change other details than version
 
-```ruby
-$RNMapboxMapsSwiftPackageManager = {
-    url: "https://github.com/maplibre/maplibre-gl-native-distribution",
-    requirement: {
-      kind: "upToNextMajorVersion",
-      minimumVersion: "5.12.1"
-    },
-    product_name: "Mapbox"
-  }
-```
-
-<br/>
+## Troubleshooting
 
-## Mapbox Maps GL SDK (9.0 or earlier)
+### Pod install fails on upgrade of @rnmapbox/maps with `could not find compatible versions for pod "MapboxMaps"`
 
-This is the old version of mapbox gl (deprecated)
+Example message:
+```log
+[!] CocoaPods could not find compatible versions for pod "MapboxMaps":
+  In snapshot (Podfile.lock):
+    MapboxMaps (= 10.15.0, ~> 10.15.0)
 
-```ruby
-$RNMapboxMapsImpl = 'mapbox-gl'
-$RNMapboxMapsVersion = '~> 5.9.0'
+  In Podfile:
+    rnmapbox-maps (from `../node_modules/@rnmapbox/maps`) was resolved to 10.0.15, which depends on
+      MapboxMaps (~> 10.16.0)
 ```
 
-### Mapbox Maps GL SDK > `v6.0.0`
-
-If you are using version `v6.0.0` of the SDK or later, you will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
+Please use `pod update MapboxMaps` as suggested by cocoapods
 
-<br>