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

package/ios/RCTMGL-v10/RCTMGLShapeSource.swift

@@ -1,389 +0,0 @@
-import MapboxMaps
-import Turf
-
-@objc
-class RCTMGLShapeSource : RCTMGLSource {
-  @objc var url : String? {
-    didSet {
-      parseJSON(url) { [weak self] result in
-        guard let self = self else { return }
-
-        switch result {
-          case .success(let obj):
-            self.doUpdate { (style) in
-              logged("RCTMGLShapeSource.setUrl") {
-                try style.updateGeoJSONSource(withId: self.id, geoJSON: obj)
-              }
-            }
-
-          case .failure(let error):
-            Logger.log(level: .error, message: ":: Error - update url failed \(error) \(error.localizedDescription)")
-        }
-      }
-    }
-  }
-
-  @objc var shape : String? {
-    didSet {
-      logged("RCTMGLShapeSource.updateShape") {
-        let obj : GeoJSONObject = try parse(shape)
-
-        doUpdate { (style) in
-          logged("RCTMGLShapeSource.setShape") {
-            try style.updateGeoJSONSource(withId: id, geoJSON: obj)
-          }
-        }
-      }
-    }
-  }
-
-  @objc var cluster : NSNumber?
-  @objc var clusterRadius : NSNumber?
-  @objc var clusterMaxZoomLevel : NSNumber? {
-    didSet {
-      logged("RCTMGLShapeSource.clusterMaxZoomLevel") {
-        if let number = clusterMaxZoomLevel?.doubleValue {
-          doUpdate { (style) in
-            logged("RCTMGLShapeSource.doUpdate") {
-              try style.setSourceProperty(for: id, property: "clusterMaxZoom", value: number)
-            }
-          }
-        }
-      }
-    }
-  }
-  @objc var clusterProperties : [String: [Any]]?;
-
-  @objc var maxZoomLevel : NSNumber?
-  @objc var buffer : NSNumber?
-  @objc var tolerance : NSNumber?
-  @objc var lineMetrics : NSNumber?
-
-  override func sourceType() -> Source.Type {
-    return GeoJSONSource.self
-  }
-
-  override func makeSource() -> Source
-  {
-    #if RNMBX_11
-    var result =  GeoJSONSource(id: id)
-    #else
-    var result =  GeoJSONSource()
-    #endif
-
-    if let shape = shape {
-      do {
-        result.data = try parse(shape)
-      } catch {
-        Logger.log(level: .error, message: "Unable to read shape: \(shape) \(error) setting it to empty")
-        result.data = emptyShape()
-      }
-    }
-
-    if let url = url {
-      result.data = .url(URL(string: url)!)
-    }
-
-    if let cluster = cluster {
-      result.cluster = cluster.boolValue
-    }
-
-    if let clusterRadius = clusterRadius {
-      result.clusterRadius = clusterRadius.doubleValue
-    }
-
-    if let clusterMaxZoomLevel = clusterMaxZoomLevel {
-      result.clusterMaxZoom = clusterMaxZoomLevel.doubleValue
-    }
-
-    do {
-      if let clusterProperties = clusterProperties {
-        result.clusterProperties = try clusterProperties.mapValues { (params : [Any]) in
-          let data = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-          let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
-
-          return decodedExpression
-        }
-      }
-    } catch {
-      Logger.log(level: .error, message: "RCTMGLShapeSource.parsing clusterProperties failed", error: error)
-    }
-
-    if let maxZoomLevel = maxZoomLevel {
-      result.maxzoom = maxZoomLevel.doubleValue
-    }
-
-    if let buffer = buffer {
-      result.buffer = buffer.doubleValue
-    }
-
-    if let tolerance = tolerance {
-      result.tolerance = tolerance.doubleValue
-    }
-
-    if let lineMetrics = lineMetrics {
-      result.lineMetrics = lineMetrics.boolValue
-    }
-
-    return result
-  }
-
-  func doUpdate(_ update:(Style) -> Void) {
-    guard let map = self.map,
-          let _ = self.source,
-          map.mapboxMap.style.sourceExists(withId: id) else {
-      return
-    }
-
-    let style = map.mapboxMap.style
-    update(style)
-  }
-
-  func updateSource(property: String, value: Any) {
-    doUpdate { style in
-      try! style.setSourceProperty(for: id, property: property, value: value)
-    }
-  }
-}
-
-// MARK: - parseJSON(url)
-
-extension RCTMGLShapeSource
-{
-  func parseJSON(_ url: String?, completion: @escaping (Result<GeoJSONObject, Error>) -> Void) {
-    guard let url = url else { return }
-
-    DispatchQueue.global().async { [url] in
-      let result: Result<GeoJSONObject, Error>
-
-      do {
-        let data = try Data(contentsOf: URL(string: url)!)
-        let obj = try JSONDecoder().decode(GeoJSONObject.self, from: data)
-
-        result = .success(obj)
-      } catch {
-        result = .failure(error)
-      }
-
-      DispatchQueue.main.async {
-        completion(result)
-      }
-    }
-  }
-}
-
-// MARK: - parse(shape)
-
-extension RCTMGLShapeSource
-{
-  func parse(_ shape: String) throws -> GeoJSONSourceData {
-    guard let data = shape.data(using: .utf8) else {
-      throw RCTMGLError.parseError("shape is not utf8")
-    }
-    do {
-      return try JSONDecoder().decode(GeoJSONSourceData.self, from: data)
-    } catch {
-      let origError = error
-      do {
-        // workaround for mapbox issue, GeoJSONSourceData can't decode a single geometry
-        let geometry = try JSONDecoder().decode(Geometry.self, from: data)
-        return .geometry(geometry)
-      } catch {
-        throw origError
-      }
-    }
-  }
-
-  func parse(_ shape: String) throws -> Feature {
-    guard let data = shape.data(using: .utf8) else {
-      throw RCTMGLError.parseError("shape is not utf8")
-    }
-    return try JSONDecoder().decode(Feature.self, from: data)
-  }
-
-  func parse(_ shape: String?) throws -> GeoJSONObject {
-    guard let shape = shape else {
-      return emptyGeoJSONObject()
-    }
-    let data : GeoJSONSourceData = try parse(shape)
-    switch data {
-    case .empty:
-      return emptyGeoJSONObject()
-    case .feature(let feature):
-      return .feature(feature)
-    case .featureCollection(let featureCollection):
-      return .featureCollection(featureCollection)
-    case .geometry(let geometry):
-      return .geometry(geometry)
-    #if RNMBX_11
-    case .string(_):
-      // RNMBX_11_TODO
-      throw RCTMGLError.parseError("url as shape is not supported when updating a ShapeSource")
-    #else
-    case .url(_):
-      throw RCTMGLError.parseError("url as shape is not supported when updating a ShapeSource")
-      #endif
-    }
-  }
-
-  func emptyGeoJSONObject() -> GeoJSONObject {
-    return .featureCollection(emptyFeatureCollection())
-  }
-
-  func emptyShape() -> GeoJSONSourceData {
-    return GeoJSONSourceData.featureCollection(FeatureCollection(features:[]))
-  }
-
-  func emptyFeatureCollection() -> FeatureCollection {
-    return FeatureCollection(features:[])
-  }
-
-  func parseAsJSONObject(shape: String?) -> Any? {
-    guard let shape = shape else {
-      return nil
-    }
-    guard let data = shape.data(using: .utf8) else {
-      Logger.log(level: .error, message: "shapeSource.setShape: Shape is not utf8")
-      return nil
-    }
-    let objs = logged("shapeSource.setShape.parseJSON") {
-      try JSONSerialization.jsonObject(with: data)
-    }
-    return objs
-  }
-}
-
-#if !RNMBX_11
-class DummyCancellable : Cancelable {
-  func cancel() {}
-}
-
-#if false
-extension MapboxMap {
-  @discardableResult
-  public func getGeoJsonClusterExpansionZoom(forSourceId sourceId: String,
-                                             feature: Feature,
-                                             completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
-    self.queryFeatureExtension(for: sourceId,
-                               feature: feature,
-                               extension: "supercluster",
-                               extensionField: "expansion-zoom",
-                               args: nil,
-                               completion: completion)
-    return DummyCancellable()
-  }
-  @discardableResult
-  public func getGeoJsonClusterChildren(forSourceId sourceId: String,
-                                        feature: Feature,
-                                        completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
-    self.queryFeatureExtension(for: sourceId,
-                                   feature: feature,
-                                   extension: "supercluster",
-                                   extensionField: "children",
-                                   args: nil,
-                                   completion: completion)
-    return DummyCancellable()
-  }
-
-  @discardableResult
-  public func getGeoJsonClusterLeaves(forSourceId sourceId: String,
-                                      feature: Feature,
-                                      limit: UInt64 = 10,
-                                      offset: UInt64 = 0,
-                                      completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
-      self.queryFeatureExtension(for: sourceId,
-                                   feature: /*MapboxCommon.Feature(*/feature/*)*/,
-                                   extension: "supercluster",
-                                   extensionField: "leaves",
-                                   args: ["limit": limit, "offset": offset],
-                                   completion: completion)
-    return DummyCancellable()
-  }
-  
-  
-}
-#endif
-#endif
-
-// MARK: - getClusterExpansionZoom/getClusterLeaves
-
-extension RCTMGLShapeSource
-{
-  func getClusterExpansionZoom(
-    _ featureJSON: String,
-    completion: @escaping (Result<Int, Error>) -> Void)
-  {
-    guard let mapView = map?.mapView else {
-      completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: no mapView")))
-      return
-    }
-
-    logged("RCTMGLShapeSource.getClusterExpansionZoom", rejecter: { (_,_,error) in
-      completion(.failure(error!))
-    }) {
-      let cluster : Feature = try parse(featureJSON);
-
-      mapView.mapboxMap.getGeoJsonClusterExpansionZoom(forSourceId: self.id, feature: cluster) { result in
-        switch result {
-        case .success(let features):
-          guard let value = features.value as? NSNumber else {
-            completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: not a number")))
-            return
-          }
-
-          completion(.success(value.intValue))
-        case .failure(let error):
-          completion(.failure(error))
-        }
-      }
-    }
-  }
-
-  func getClusterLeaves(_ featureJSON: String,
-                              number: uint,
-                              offset: uint,
-                              completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void)
-  {
-    guard let mapView = map?.mapView else {
-      completion(.failure(RCTMGLError.failed("getClusterLeaves: no mapView")))
-      return
-    }
-
-    logged("RCTMGLShapeSource.getClusterLeaves", rejecter: { (_,_,error) in
-      completion(.failure(error!))
-    }) {
-      let cluster : Feature = try parse(featureJSON);
-      mapView.mapboxMap.getGeoJsonClusterLeaves(forSourceId: self.id, feature: cluster, limit: UInt64(number), offset: UInt64(offset)) {
-        result in
-        switch result {
-        case .success(let features):
-          completion(.success(features))
-        case .failure(let error):
-          completion(.failure(error))
-        }
-      }
-    }
-  }
-
-  func getClusterChildren(_ featureJSON: String, completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) {
-    guard let mapView = map?.mapView else {
-      completion(.failure(RCTMGLError.failed("getClusterChildren: no mapView")))
-      return
-    }
-
-    logged("RCTMGLShapeSource.getClusterChildren", rejecter: { (_,_,error) in
-      completion(.failure(error!))
-    }) {
-      let cluster : Feature = try parse(featureJSON);
-      mapView.mapboxMap.getGeoJsonClusterChildren(forSourceId: self.id, feature: cluster) {
-        result in
-        switch result {
-        case .success(let features):
-          completion(.success(features))
-        case .failure(let error):
-          completion(.failure(error))
-        }
-      }
-    }
-  }
-}

package/ios/RCTMGL-v10/RCTMGLShapeSourceManager.m

@@ -1,45 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface
-RCT_EXTERN_REMAP_MODULE(RCTMGLShapeSource, RCTMGLShapeSourceManager, RCTViewManager)
-
-RCT_EXPORT_VIEW_PROPERTY(id, NSString)
-RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(url, NSString)
-RCT_EXPORT_VIEW_PROPERTY(shape, NSString)
-
-RCT_EXPORT_VIEW_PROPERTY(cluster, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(clusterRadius, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(clusterMaxZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(clusterProperties, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(buffer, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(tolerance, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(lineMetrics, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
-RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
-RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock)
-
-
-
-RCT_EXTERN_METHOD(getClusterExpansionZoom:(nonnull NSNumber*)reactTag
-                                featureJSON:(nonnull NSString*)featureJSON
-                                resolver:(RCTPromiseResolveBlock)resolve
-                                rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getClusterLeaves:(nonnull NSNumber*)reactTag
-                  featureJSON:(nonnull NSString*)featureJSON
-                  number:(NSUInteger) number
-                  offset:(NSUInteger) offset
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getClusterChildren:(nonnull NSNumber*)reactTag
-                  featureJSON:(nonnull NSString*)featureJSON
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-@end

package/ios/RCTMGL-v10/RCTMGLShapeSourceManager.swift

@@ -1,106 +0,0 @@
-@objc(RCTMGLShapeSourceManager)
-class RCTMGLShapeSourceManager: RCTViewManager {
-  @objc
-  override static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-
-  @objc override func view() -> UIView {
-    return RCTMGLShapeSource()
-  }
-}
-
-// MARK: - helpers
-
-extension RCTMGLShapeSourceManager {
-  func withShapeSource(
-      _ reactTag: NSNumber,
-      name: String,
-      rejecter: @escaping RCTPromiseRejectBlock,
-      fn: @escaping (_: RCTMGLShapeSource) -> Void) -> Void
-  {
-    self.bridge.uiManager.addUIBlock { (manager, viewRegistry) in
-      let view = viewRegistry![reactTag]
-
-      guard let shapeSource = view! as? RCTMGLShapeSource else {
-        RCTMGLLogError("Invalid react tag, could not find RCTMGLShapeSource");
-        rejecter(name, "Unknown find reactTag: \(reactTag)", nil)
-        return;
-      }
-
-      fn(shapeSource)
-    }
-  }
-}
-
-// MARK: - react methods
-
-extension RCTMGLShapeSourceManager {
-  @objc func getClusterExpansionZoom(
-    _ reactTag: NSNumber,
-    featureJSON: String,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) -> Void
-  {
-    self.withShapeSource(reactTag, name:"getCluster   ExpansionZoom", rejecter: rejecter) { shapeSource in
-      shapeSource.getClusterExpansionZoom(featureJSON) { result in
-        switch result {
-        case .success(let zoom):
-          resolver([
-            "data": NSNumber(value: zoom)
-          ])
-        case .failure(let error):
-          rejecter(error.localizedDescription, "Error.getClusterExpansionZoom", error)
-        }
-      }
-    }
-  }
-  
-  @objc func getClusterLeaves(
-    _ reactTag: NSNumber,
-    featureJSON: String,
-    number: uint,
-    offset: uint,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) -> Void
-  {
-    self.withShapeSource(reactTag, name:"getClusterLeaves", rejecter: rejecter) { shapeSource in
-      shapeSource.getClusterLeaves(featureJSON, number: number, offset: offset) { result in
-        switch result {
-        case .success(let features):
-          logged("getClusterLeaves", rejecter: rejecter) {
-            let featuresJSON : Any = try features.features.toJSON()
-            resolver([
-              "data": ["type":"FeatureCollection", "features": featuresJSON]
-            ])
-          }
-        case .failure(let error):
-          rejecter(error.localizedDescription, "Error.getClusterLeaves", error)
-        }
-      }
-    }
-  }
-  
-  @objc func getClusterChildren(
-    _ reactTag: NSNumber,
-    featureJSON: String,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      self.withShapeSource(reactTag, name:"getClusterChildren", rejecter: rejecter) { shapeSource in
-      shapeSource.getClusterChildren(featureJSON) { result in
-        switch result {
-        case .success(let features):
-          logged("getClusterChildren", rejecter: rejecter) {
-            let featuresJSON : Any = try features.features.toJSON()
-            resolver([
-              "data": ["type":"FeatureCollection", "features": featuresJSON]
-            ])
-          }
-        case .failure(let error):
-          rejecter(error.localizedDescription, "Error.getClusterChildren", error)
-        }
-      }
-    }
-  }
-}
-

package/ios/RCTMGL-v10/RCTMGLSingletonLayer.swift

@@ -1,51 +0,0 @@
-import MapboxMaps
-
-/// RCTMGLSingletonLayer is absract superclass for Light, Atmosphere, Terrain
-@objc
-class RCTMGLSingletonLayer : UIView {
-  weak var bridge : RCTBridge? = nil
-  weak var map : RCTMGLMapView? = nil
-  var style: Style? = nil
-  
-  var oldReactStyle: [String:Any]?
-  @objc var reactStyle : Dictionary<String, Any>? = nil {
-    willSet {
-      oldReactStyle = reactStyle
-    }
-    didSet {
-      DispatchQueue.main.async {
-        self.addStylesAndUpdate()
-      }
-    }
-  }
-
-  /// apply style updates to our copy and copy the changes to the map style
-  func addStylesAndUpdate() {
-    addStyles()
-    update()
-  }
-  
-  /// apply the changes made to our copy to the map style
-  func update() {
-    if let style = style,
-      let map = map {
-      self.update(map, style)
-    }
-  }
-  
-  func update(_ map: RCTMGLMapView, _ style: Style) {
-    logged("LayerLike \(self)") {
-      try apply(style: style)
-    }
-  }
-  
-  /// add reactStyle to the layer like component
-  func addStyles() {
-    fatalError("Subclasses should overrride")
-  }
-  
-  /// apply changes in layer like component to the map
-  func apply(style: Style) throws {
-    fatalError("Subclasses should overrride")
-  }
-}

package/ios/RCTMGL-v10/RCTMGLSkyLayer.swift

@@ -1,55 +0,0 @@
-import MapboxMaps
-
-@objc(RCTMGLSkyLayer)
-class RCTMGLSkyLayer: RCTMGLLayer {
-  typealias LayerType = SkyLayer
-
-  override func makeLayer(style: Style) throws -> Layer {
-    let layer = LayerType(id: self.id!)
-    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 LayerType) in
-      if let styleLayer = self.styleLayer as? LayerType {
-        layer = styleLayer
-      }
-    }
-  }
-  
-  override func addStyles() {
-    if let style : Style = self.style {
-      let styler =  RCTMGLStyle(style: self.style!)
-      styler.bridge = self.bridge
-      
-      if var styleLayer = self.styleLayer as? LayerType,
-         let reactStyle = self.reactStyle {
-        
-        styler.skyLayer(
-          layer: &styleLayer,
-          reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
-          applyUpdater: { (updater) in logged("RCTMGLSkyLayer.addStyles") {
-            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
-  }
-
-  internal override func hasSource() -> Bool {
-    return false
-  }
-}

package/ios/RCTMGL-v10/RCTMGLSkyLayerManager.m

@@ -1,9 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface RCT_EXTERN_MODULE(RCTMGLSkyLayerManager, RCTViewManager)
-
-// standard layer props
-#include "CommonLayerProperties.H"
-
-@end

package/ios/RCTMGL-v10/RCTMGLSkyLayerManager.swift

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