@rnmapbox/maps 10.0.0-beta.28

package/ios/RCTMGL-v10/RCTMGLStyleValue.swift

@@ -0,0 +1,446 @@
+import MapboxMaps
+import Foundation
+
+func deg2rad(_ number: Double) -> Double {
+    return number * .pi / 180
+}
+
+class RCTMGLStyleValue {
+  var value: Any
+  var styleType: String? = nil
+  var styleValue: [String:Any]? = nil
+  var styleObject: Any? = nil
+  
+  
+  init(value: Any) {
+    self.value = value
+  
+    if let dict = value as? [String:Any] {
+      guard let styleType = dict["styletype"] as? String else {
+        fatalError("StyleType should be string in \(dict)")
+      }
+      self.styleType = styleType
+      guard let styleValue = dict["stylevalue"] as? [String:Any] else {
+        fatalError("StyleValue should be dict in \(dict)")
+      }
+      self.styleValue = styleValue
+      self.styleObject = parse(rawStyleValue: styleValue)
+    }
+  }
+  
+  static func make(_ reactStyleValue: Any) ->RCTMGLStyleValue {
+    return RCTMGLStyleValue(value: reactStyleValue)
+  }
+  
+  func isVisible() -> Value<Visibility> {
+    return mglStyleValueEnum()
+  }
+  
+  func getTransition() -> StyleTransition {
+    guard let dict = styleObject as? [String:Any] else {
+      Logger.log(level:.error, message: "Invalid transition value: \(optional: styleObject)")
+      return StyleTransition(duration: 0.0, delay: 0.0)
+    }
+    let duration = (dict["duration"] as? NSNumber)
+    let delay = (dict["delay"] as? NSNumber)
+
+    if delay == nil && duration == nil {
+      Logger.log(level:.error, message: "Invalid transition value: \(optional: styleObject) no duration or delay")
+    }
+    let millisecondsToSeconds = 1.0/1000.0;
+    return StyleTransition(duration: millisecondsToSeconds * (duration?.doubleValue ?? 0.0), delay: millisecondsToSeconds * (delay?.doubleValue ?? 0.0))
+  }
+  
+  func getImageScale() -> Double {
+    if let dict = styleObject as? [String:Any] {
+      if let scale = dict["scale"] as? NSNumber {
+        return scale.doubleValue
+      } else {
+        return 1.0
+      }
+    }
+    return 1.0
+  }
+  
+  func parse(rawStyleValue: [String:Any]) -> Any
+  {
+    guard let type = rawStyleValue["type"] as? String else {
+      fatalError("type is not a string in \(rawStyleValue)")
+    }
+    
+    let value = rawStyleValue["value"]
+    if type == "string" {
+      guard let string = value as? String else {
+        fatalError("value is not a string in \(rawStyleValue)")
+      }
+      return string
+    } else if type == "number" {
+      guard let number = value as? NSNumber else {
+        fatalError("value is not a number in \(rawStyleValue)")
+      }
+      return number
+    } else if type == "boolean" {
+      guard let bool = value as? NSNumber else {
+        fatalError("value is not a bool in \(rawStyleValue)")
+      }
+      return bool
+    } else if type == "hashmap" {
+      guard let array = value as? [[[String:Any]]] else {
+        fatalError("value is not a array in \(rawStyleValue)")
+      }
+      var dict : [String:Any] = [:]
+      for kv in array {
+        guard let key = parse(rawStyleValue: kv[0]) as? String else {
+          fatalError("key \(kv[0]) is not string in \(rawStyleValue)")
+        }
+        let value = parse(rawStyleValue: kv[1])
+        dict[key] = value
+      }
+      return dict
+    } else if type == "array" {
+      guard let rawArray = value as? [[String:Any]] else {
+        fatalError("value is not a array in \(rawStyleValue)")
+      }
+      var convertedArray:[Any] = []
+      for i in rawArray {
+        convertedArray.append(parse(rawStyleValue: i))
+      }
+      return convertedArray
+    } else {
+      fatalError("unepxected type: \(type)")
+    }
+  }
+  
+  static func convert(_ from:[String: Any]) -> Any {
+    guard let type = from["type"] as? String else {
+      fatalError("Type should be string but was \(optional: from["type"])")
+    }
+    if type == "array" {
+      guard let values = from["value"] as? [[String:Any]] else {
+        fatalError("Value for array should be array of dicts")
+      }
+
+      return values.map { convert($0) }
+    }
+    else if type == "string" {
+      guard let value = from["value"] as? String else {
+        fatalError("Value for string should be String")
+      }
+      
+      return value
+    }
+    else if type == "hashmap" {
+      guard let values = from["value"] as? [[Any]] else {
+        fatalError("Value for hashmap should be array of array")
+      }
+    
+      let result = values.map { items -> (String,Any) in
+        var key = items[0]
+        let value = items[1]
+        if let keyd = key as? [String:String],
+          keyd["type"] == "string",
+          let value = keyd["value"] {
+          key = value
+        }
+        guard let key = key as? String else {
+          fatalError("First item should be a string key")
+        }
+        guard let value = value as? [String:Any] else {
+          fatalError("Value should be an array of dicts")
+        }
+        return (key,convert(value))
+      }
+      return Dictionary<String, Any>(uniqueKeysWithValues: result)
+    }
+    else if type == "number" {
+      guard let value = from["value"] else {
+        fatalError("Value for number should not be nil")
+      }
+      guard let value = value as? NSNumber else {
+        fatalError("Value for number should be Number")
+      }
+      return value
+    } else if type == "boolean" {
+      guard let value = from["value"] else {
+        fatalError("Value for boolean should not be nil")
+      }
+      guard let value = value as? NSNumber else {
+        fatalError("Value for number should be Number")
+      }
+      return value
+    } else {
+      fatalError("Unexpected type \(type)")
+    }
+  }
+  
+  func mglStyleValueNumber() -> Value<Double> {
+    if let value = value as? Dictionary<String,Any> {
+      let value = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+      
+      if let num = value as? NSNumber {
+        return Value.constant(Double(num.doubleValue))
+      } else if let num = value as? Double {
+        return Value.constant(Double(num))
+      } else if let num = value as? Int {
+        return Value.constant(Double(num))
+      } else {
+        do {
+          let data = try! JSONSerialization.data(withJSONObject: value, options: .prettyPrinted)
+
+          let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+          return Value.expression(decodedExpression)
+        } catch {
+          Logger.log(level:.error, message: "mglStyleValueNumber: Cannot parse \(value) as expression")
+          return Value.constant(0.0)
+        }
+      }
+    } else {
+      return Value.constant(1.0)
+    }
+  }
+
+  func mglStyleValueNumberRaw() -> Double {
+    guard let value = value as? Dictionary<String,Any> else {
+      Logger.log(level: .error, message: "Invalid value for number: \(value) retuning 0.0")
+      return 0.0
+    }
+    
+    let valueObj = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+    
+    if let num = valueObj as? NSNumber {
+      return num.doubleValue
+    } else if let num = valueObj as? Double {
+      return num
+    } else if let num = valueObj as? Int {
+      return Double(num)
+    } else {
+      Logger.log(level: .error, message: "Invalid value for number: \(value) retuning 0.0")
+      return 0.0
+    }
+    return 1.0
+  }
+
+  func uicolor(_ rgbValue: Int) -> UIColor {
+      return UIColor(
+          red: CGFloat((Float((rgbValue & 0xff0000) >> 16)) / 255.0),
+          green: CGFloat((Float((rgbValue & 0x00ff00) >> 8)) / 255.0),
+          blue: CGFloat((Float((rgbValue & 0x0000ff) >> 0)) / 255.0),
+          alpha: 1.0)
+  }
+
+  func mglStyleValueColor() -> Value<StyleColor> {
+    //return Value.constant(ColorRepresentable(color: UIColor.black))
+    if let value = value as? Dictionary<String,Any> {
+      let value = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+      
+      if let num = value as? Int {
+        let uicolor = uicolor(num)
+        return Value.constant(StyleColor(uicolor))
+      }
+      
+      let data = try! JSONSerialization.data(withJSONObject: value, options: .prettyPrinted)
+
+      let decodedExpression = try! JSONDecoder().decode(Expression.self, from: data)
+      return Value.expression(decodedExpression)
+    } else {
+      return Value.constant(StyleColor(UIColor.red))
+    }
+  }
+  
+  func asExpression(json: [Any]) -> Expression {
+    let data = try! JSONSerialization.data(withJSONObject: json, options: .prettyPrinted)
+    let decodedExpression = try! JSONDecoder().decode(Expression.self, from: data)
+    return decodedExpression
+  }
+
+  func mglStyleValueColorRaw() -> StyleColor {
+    guard let value = value as? Dictionary<String,Any> else {
+      Logger.log(level: .error, message: "Invalid value for color: \(value) retuning red")
+      return StyleColor(UIColor.red)
+    }
+    let valueObj = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+
+    if let num = value as? Int {
+      let uicolor = uicolor(num)
+      return StyleColor(uicolor)
+    } else {
+      Logger.log(level: .error, message: "Unexpeted value for color: \(valueObj), retuning red")
+      return StyleColor(UIColor.red)
+    }
+  }
+  
+  func mglStyleValueBoolean() -> Value<Bool> {
+    guard let value = value as? Dictionary<String,Any> else {
+      Logger.log(level: .error, message: "Invalid value for boolean: \(value)")
+      return Value.constant(true)
+    }
+    
+    let valueObj = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+    
+    if let valueObj = valueObj as? NSNumber {
+      return .constant(valueObj.boolValue)
+    } else {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: valueObj, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        return .expression(decodedExpression)
+      } catch {
+        Logger.log(level: .error, message: "Invalid value for array number: \(value) error: \(error) setting dummy value")
+        return .constant(true)
+      }
+    }
+  }
+  
+  func mglStyleValueArrayNumber() -> Value<[Double]> {
+    guard let value = value as? Dictionary<String,Any> else {
+      Logger.log(level: .error, message: "Invalid value for array number: \(value)")
+      return Value.constant([1.0,1.0])
+    }
+  
+    let valueObj = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+      
+    if let valueObj = valueObj as? [NSNumber] {
+      return .constant(valueObj.map { $0.doubleValue })
+    } else {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: valueObj, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        return .expression(decodedExpression)
+      } catch {
+        Logger.log(level: .error, message: "Invalid value for array number: \(value) error: \(error) setting dummy value")
+        return .constant([1.0,1.0])
+      }
+    }
+  }
+  
+  func mglStyleValueArrayString() -> Value<[String]> {
+    guard let value = value as? Dictionary<String,Any> else {
+      Logger.log(level: .error, message: "Invalid value for array of strings: \(value)")
+      return Value.constant([""])
+    }
+
+    let valueObj = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+      
+    if let valueObj = valueObj as? [String] {
+      return .constant(valueObj)
+    } else {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: valueObj, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        return .expression(decodedExpression)
+      } catch {
+        Logger.log(level: .error, message: "Invalid value for array number: \(value) error: \(error) setting dummy value")
+        return .constant([""])
+      }
+    }
+  }
+  
+  func mglStyleValueResolvedImage() -> Value<ResolvedImage> {
+    if let exprJSON = styleObject as? [Any] {
+      return Value.expression(asExpression(json: exprJSON))
+    } else if let dict = styleObject as? [String:Any],
+              let uri = dict["uri"] as? String {
+      return Value.constant(.name(uri))
+    } else if let value = styleObject as? String {
+      return Value.constant(.name(value))
+    } else {
+      fatalError("Resolved image is nor expression nor string: \(optional: styleObject)!")
+    }
+  }
+
+  func mglStyleValueFillTranslateAnchor() -> Value<FillTranslateAnchor> {
+    return mglStyleValueEnum()
+  }
+
+  func mglStyleValueLineCap() -> Value<LineCap> {
+    return mglStyleValueEnum()
+  }
+  
+  func mglStyleValueEnum<Enum : RawRepresentable>() -> Value<Enum> where Enum.RawValue == String {
+    if let value = value as? Dictionary<String,Any> {
+      let value = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+      return Value.constant(Enum(rawValue: value as! String)!)
+    } else {
+      Logger.log(level: .error, message:"Invalid value for enum: \(value) returning something")
+      return Value.constant(Enum(rawValue: value as! String)!)
+    }
+  }
+
+  func mglStyleEnum<Enum : RawRepresentable>() -> Enum where Enum.RawValue == String {
+    if let value = value as? Dictionary<String,Any> {
+      let value = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+      return Enum(rawValue: value as! String)!
+    } else {
+      Logger.log(level: .error, message:"Invalid value for enum: \(value) returning something")
+      return Enum(rawValue: value as! String)!
+    }
+  }
+  
+  func mglStyleValueArrayTextWritingMode() -> Value<[TextWritingMode]> {
+    return Value.constant([])
+  }
+  
+  func mglStyleValueAnchorRaw() -> Anchor {
+    return mglStyleEnum()
+  }
+
+  func shouldAddImage() -> Bool {
+    if let uri = getImageURI() {
+      return uri.contains("://")
+    }
+    return false
+  }
+  
+  func getImageURI() -> String? {
+    if let dict = styleObject as? [String:Any] {
+      if let uri = dict["uri"] as? String {
+        return uri
+      } else {
+        return nil
+      }
+    } else if let uri = styleObject as? String {
+      return uri
+    }
+    return nil
+  }
+  
+  func mglStyleValueArrayTextVariableAnchor() -> Value<[TextAnchor]> {
+    return Value.constant([.left])
+  }
+  
+  func getSphericalPosition() -> [Double] {
+    if let array = styleObject as? [NSNumber] {
+      var result = array.map { $0.doubleValue }
+      result[0] = deg2rad(result[0])
+      print("REturning: \(result)")
+      return result
+    }
+    Logger.log(level: .error, message: "Expected array of numbers as position received: \(optional: styleObject)")
+    return []
+  }
+  
+  func mglStyleValueFormatted() -> Value<String> {
+    if let value = value as? Dictionary<String,Any> {
+      let value = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
+      
+      if let string = value as? String {
+        return Value.constant(string)
+      }
+      
+      let data = try! JSONSerialization.data(withJSONObject: value, options: .prettyPrinted)
+
+      let decodedExpression = try! JSONDecoder().decode(Expression.self, from: data)
+      return Value.expression(decodedExpression)
+    } else {
+      fatalError("mglStyleValueFormatted - Unpexected value: \(value)")
+    }
+  }
+  
+  func mglStyleValueLineJoin() -> Value<LineJoin> {
+    return mglStyleValueEnum()
+  }
+  
+  func mglStyleValueLineTranslateAnchor() -> Value<LineTranslateAnchor> {
+    return mglStyleValueEnum()
+  }
+}

package/ios/RCTMGL-v10/RCTMGLSymbolLayer.swift

@@ -0,0 +1,51 @@
+import MapboxMaps
+
+@objc(RCTMGLSymbolLayer)
+class RCTMGLSymbolLayer: RCTMGLVectorLayer {
+  
+  typealias LayerType = SymbolLayer
+
+  override func makeLayer(style: Style) throws -> Layer {
+    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    var layer = LayerType(id: self.id!)
+    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 =  RCTMGLStyle(style: self.style!)
+      styler.bridge = self.bridge
+      
+      if var styleLayer = self.styleLayer as? LayerType,
+         let reactStyle = self.reactStyle {
+        styler.symbolLayer(
+          layer: &styleLayer,
+          reactStyle: reactStyle,
+          applyUpdater: { (updater) in 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/RCTMGL-v10/RCTMGLSymbolLayerManager.m

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

package/ios/RCTMGL-v10/RCTMGLSymbolLayerManager.swift

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

package/ios/RCTMGL-v10/RCTMGLTerrain.swift

@@ -0,0 +1,97 @@
+import MapboxMaps
+
+@objc
+class RCTMGLTerrain : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
+  weak var map : RCTMGLMapView!
+  var style : Style! = nil
+  
+  var bridge : RCTBridge? = nil
+  var terrain : Terrain? = nil
+  
+  @objc var sourceID: String? = nil
+  
+  @objc var exaggeration : Any? = nil
+  
+  func waitForStyleLoad() -> Bool {
+    return true
+  }
+
+  func makeTerrain() -> Terrain {
+    print("=> sourceID \(sourceID)")
+    guard let sourceID = sourceID else {
+      Logger.log(level: .error, message: "Terrain should have a sourceID")
+      return Terrain(sourceId: "n/a")
+    }
+    var terrain = Terrain(sourceId: sourceID)
+    if let exaggeration = exaggeration {
+      do {
+        terrain.exaggeration = try toValue(exaggeration)
+      } catch {
+        Logger.log(level: .error, message: "Faied to parse exaggeration value: \(exaggeration) \(error)")
+      }
+    }
+    
+    return terrain
+  }
+  
+  func toValue(_ value: Any) throws -> Value<Double>? {
+    if let value = value as? NSNumber {
+      return .constant(value.doubleValue)
+    } else if let value = value as? [Any] {
+      let data = try JSONSerialization.data(withJSONObject: value, options: .prettyPrinted)
+      let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+      return .expression(decodedExpression)
+    } else {
+      throw RCTMGLError.parseError("failed to parse value")
+    }
+  }
+  
+  func addToMap(_ map: RCTMGLMapView, style: Style) {
+    self.map = map
+    self.style = style
+    
+    let terrain = self.makeTerrain()
+    self.terrain = terrain
+    map.onMapStyleLoaded { _ in
+      if let mapboxMap = map.mapboxMap {
+        let style = mapboxMap.style
+        logged("RCTMGLTerrain.addToMap") {
+          try style.setTerrain(terrain)
+        }
+      }
+    }
+  }
+  
+  func addToMap(_ map: RCTMGLMapView) {
+    self.map = map
+  
+    guard let mapboxMap = map.mapboxMap else {
+      return
+    }
+    
+    mapboxMap.onNext(.styleLoaded) {_ in
+      let style = mapboxMap.style
+ 
+      do {
+        try style.setTerrain(self.makeTerrain())
+      } catch {
+        Logger.log(level: .error, message: "setTerrain failed: \(error)")
+      }
+    }
+  }
+  
+  func removeFromMap(_ map: RCTMGLMapView) {
+    self.map = nil
+    
+    guard let mapboxMap = map.mapboxMap else {
+      return
+    }
+    
+    let style = mapboxMap.style
+    removeFromMap(map, style: style)
+  }
+  
+  func removeFromMap(_ map: RCTMGLMapView, style: Style) {
+    style.removeTerrain()
+  }
+}

package/ios/RCTMGL-v10/RCTMGLTerrainManager.m

@@ -0,0 +1,16 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCTMGLTerrain : UIView
+{}
+@property (nonatomic) NSObject* exaggeration;
+@end
+
+@interface RCT_EXTERN_MODULE(RCTMGLTerrainManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(sourceID, NSString);
+
+RCT_CUSTOM_VIEW_PROPERTY(exaggeration, NSObject, RCTMGLTerrain) {
+  view.exaggeration = json;
+}
+@end

package/ios/RCTMGL-v10/RCTMGLTerrainManager.swift

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

package/ios/RCTMGL-v10/RCTMGLTileSource.swift

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