@rnmapbox/maps 10.0.15 → 10.1.0-beta.10

package/ios/RCTMGL-v10/RCTMGLPointAnnotation.swift

@@ -1,262 +0,0 @@
-import MapboxMaps
-
-
-final class WeakRef<T: AnyObject> {
-  weak var object: T?
-  
-  init(_ object: T) {
-    self.object = object
-  }
-}
-
-class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
-  static let key = "RCTMGLPointAnnotation"
-  static var gid = 0;
-  
-  lazy var annotation : PointAnnotation = {
-    var result = PointAnnotation(coordinate: CLLocationCoordinate2D())
-    result.isDraggable = false // we implement our own drag logic
-    result.userInfo = [RCTMGLPointAnnotation.key:WeakRef(self)]
-    return result
-  }()
-  var added = false
-
-  weak var callout: RCTMGLCallout? = nil
-  var calloutId : String?
-  var image : UIImage? = nil
-  var reactSubviews : [UIView] = []
-
-  @objc var onDeselected: RCTBubblingEventBlock? = nil
-  @objc var onDrag: RCTBubblingEventBlock? = nil
-  @objc var onDragEnd: RCTBubblingEventBlock? = nil
-  @objc var onSelected: RCTBubblingEventBlock? = nil
-  
-  @objc var coordinate : String? {
-    didSet {
-      _updateCoordinate()
-    }
-  }
-  
-  @objc var anchor: [String:NSNumber] = [:] {
-    didSet {
-      update { annotation in
-        _updateAnchor(&annotation)
-      }
-    }
-  }
-  
-  func _updateAnchor(_ annotation: inout PointAnnotation) {
-    if !anchor.isEmpty {
-      if let image = annotation.image {
-        let size = image.image.size
-        annotation.iconAnchor = .topLeft
-        annotation.iconOffset = [size.width * (anchor["x"]?.CGFloat ?? 0.0) * -1.0, size.height * (anchor["y"]?.CGFloat ?? 0.0) * -1.0]
-      }
-    }
-  }
-
-  func _updateCoordinate() {
-    guard let point = point() else {
-      return
-    }
-    update { annotation in
-      annotation.point = point
-    }
-  }
-   
-  func point() -> Point? {
-    guard let coordinate = coordinate else {
-      return nil
-    }
-     
-    guard let data = coordinate.data(using: .utf8) else {
-      return nil
-    }
-     
-    guard let feature = try? JSONDecoder().decode(Feature.self, from: data) else {
-      return nil
-    }
-     
-    guard let geometry : Geometry = feature.geometry else {
-      return nil
-    }
-
-    guard case .point(let point) = geometry else {
-      return nil
-    }
-
-    return point
-  }
-   
-  func changeImage(_ image: UIImage, initial: Bool = false) {
-    self.image = image
-
-    update { annotation in
-      let name =  "rnview-\(gid())-\(annotation.id)"
-      annotation.image = PointAnnotation.Image(image: image , name: name)
-      _updateAnchor(&annotation)
-    }
-  }
-   
-  func setAnnotationImage(inital: Bool = false) {
-    if let image = _createViewSnapshot() {
-      changeImage(image, initial: inital)
-    }
-  }
-   
-  func gid() -> Int {
-    RCTMGLPointAnnotation.gid = RCTMGLPointAnnotation.gid + 1
-    return RCTMGLPointAnnotation.gid
-  }
-   
-  @objc
-  func refresh() {
-    if let image = _createViewSnapshot() {
-      changeImage(image)
-    }
-  }
-   
-  func _createViewSnapshot() -> UIImage? {
-    let useDummyImage = false
-    if useDummyImage {
-      let size = CGSize(width: 32, height: 32)
-      let renderer = UIGraphicsImageRenderer(size: size)
-      let image = renderer.image { context in
-        UIColor.darkGray.setStroke()
-          context.stroke(CGRect(x: 0, y:0, width: 32, height: 32))
-          UIColor(red: 158/255, green: 215/255, blue: 245/255, alpha: 1).setFill()
-          context.fill(CGRect(x: 2, y: 2, width: 30, height: 30))
-      }
-      return image
-    }
-    guard reactSubviews.count > 0 else {
-      return nil
-    }
-    return _createViewSnapshot(view: reactSubviews[0])
-  }
-   
-  func _createViewSnapshot(view: UIView) -> UIImage? {
-    guard view.bounds.size.width > 0 && view.bounds.size.height > 0 else {
-      return nil
-    }
-    
-    let roundUp = 4
-    
-    let adjustedSize = CGSize(
-      width: ((Int(view.bounds.size.width)+roundUp-1)/roundUp)*roundUp,
-      height: ((Int(view.bounds.size.height)+roundUp-1)/roundUp)*roundUp
-    )
-    
-    let renderer = UIGraphicsImageRenderer(size: adjustedSize)
-    let image = renderer.image { context in
-      view.layer.render(in: context.cgContext)
-    }
-    return image
-  }
-  
-  func onSelect() {
-    if let callout = callout,
-       let calloutImage = _createViewSnapshot(view: callout),
-       let point = point() {
-      
-      var calloutPtAnnotation = PointAnnotation(point: point)
-      calloutId = calloutPtAnnotation.id
-      let name =  "rnviewcallout-\(gid())-\(calloutPtAnnotation.id)"
-      calloutPtAnnotation.image = PointAnnotation.Image(image: calloutImage, name: name)
-      if let size = image?.size {
-        calloutPtAnnotation.iconOffset = [0, -size.height]
-      }
-      self.map?.calloutAnnotationManager.annotations.append(calloutPtAnnotation)
-    }
-  }
-  
-  func onDeselect() {
-    self.map?.calloutAnnotationManager.annotations.removeAll {
-      $0.id == calloutId
-    }
-  }
-  
-  @objc
-  override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    if let callout = subview as? RCTMGLCallout {
-      self.callout = callout
-    } else {
-      reactSubviews.insert(subview, at: atIndex)
-      if reactSubviews.count > 1 {
-        Logger.log(level: .error, message: "PointAnnotation supports max 1 subview other than a callout")
-      }
-      if annotation.image == nil {
-        DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10)) {
-          self.setAnnotationImage()
-        }
-      }
-    }
-  }
-
-  @objc
-  override func removeReactSubview(_ subview: UIView!) {
-    if let callout = subview as? RCTMGLCallout {
-      if self.callout == callout {
-        self.callout = nil
-      }
-    } else {
-      reactSubviews.removeAll(where: { $0 == subview })
-    }
-  }
-  
-  // MARK: - RCTMGLMapComponent
-  
-  override func addToMap(_ map: RCTMGLMapView, style: Style) {
-    super.addToMap(map, style: style)
-    self.map = map
-    addIfPossible()
-  }
-
-  override func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
-    removeIfAdded()
-    self.map = nil
-    return true
-  }
-  
-  // MARK: - RCTMGLInteractiveElement
-  
-  override func getLayerIDs() -> [String] {
-    return []
-  }
-}
-
-// MARK: - add/remove/update of point annotation
-
-extension RCTMGLPointAnnotation {
-  func removeIfAdded() {
-    if added, let pointAnnotationManager = map?.pointAnnotationManager {
-      pointAnnotationManager.remove(annotation)
-      added = false
-    }
-  }
-  
-  @discardableResult
-  func addIfPossible() -> Bool {
-    if !added
-        && annotation.point.coordinates.isValid()
-        && (logged("PointAnnotation: missing id attribute") { return id }) != nil,
-        let pointAnnotationManager = map?.pointAnnotationManager {
-      pointAnnotationManager.add(annotation)
-      added = true
-      return true
-    }
-    return false
-  }
-  
-  func update(callback: (_ annotation: inout PointAnnotation) -> Void) {
-    callback(&annotation)
-    if let pointAnnotationManager = map?.pointAnnotationManager {
-      if added {
-        pointAnnotationManager.update(annotation)
-      } else if !added {
-        addIfPossible()
-      }
-    }
-  }
-}
-

package/ios/RCTMGL-v10/RCTMGLPointAnnotationManager.m

@@ -1,23 +0,0 @@
-#import "React/RCTBridgeModule.h"
-#import <React/RCTViewManager.h>
-#import <Foundation/Foundation.h>
-
-@interface RCT_EXTERN_REMAP_MODULE(RCTMGLPointAnnotation, RCTMGLPointAnnotationManager, RCTViewManager)
-
-RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString)
-RCT_EXPORT_VIEW_PROPERTY(draggable, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(id, NSString)
-RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)
-
-RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDeselected, onDeselected, RCTBubblingEventBlock)
-RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDrag, onDrag, RCTBubblingEventBlock)
-RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragEnd, onDragEnd, RCTBubblingEventBlock)
-RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragStart, onDragStart, RCTBubblingEventBlock)
-RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationSelected, onSelected, RCTBubblingEventBlock)
-
-RCT_EXTERN_METHOD(refresh:(nonnull NSNumber*)reactTag
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-@end
-

package/ios/RCTMGL-v10/RCTMGLPointAnnotationManager.swift

@@ -1,34 +0,0 @@
-import Foundation
-import MapboxMaps
-
-@objc(RCTMGLPointAnnotationManager)
-class RCTMGLPointAnnotationManager  : RCTViewManager {
-  @objc
-  override static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-  
-  override func view() -> UIView! {
-    return RCTMGLPointAnnotation()
-  }
-
-  @objc
-  func refresh(_ reactTag: NSNumber,
-    resolver: RCTPromiseResolveBlock,
-    rejecter: RCTPromiseRejectBlock
-  )
-  {
-    self.bridge.uiManager.addUIBlock { (manager, viewRegistry) in
-      guard let view = viewRegistry?[reactTag] else {
-        Logger.log(level: .error, message: "View with tag: \(reactTag) not found")
-        return
-      }
-      guard let view = view as? RCTMGLPointAnnotation else {
-        Logger.log(level: .error, message: "View \(view) is not RCTMGLPointAnnotation")
-        return
-      }
-          
-      view.refresh()
-    }
-  }
-}

package/ios/RCTMGL-v10/RCTMGLRasterDemSource.swift

@@ -1,57 +0,0 @@
-import MapboxMaps
-
-@objc
-class RCTMGLRasterDemSource : RCTMGLSource {
-  typealias SourceType = RasterDemSource
-  
-  @objc
-  var url: String? = nil
-  
-  @objc
-  var tileUrlTemplates: [String]? = nil
-  
-  @objc
-  var tileSize : NSNumber? = nil
-  
-  @objc
-  var maxZoomLevel : NSNumber? = nil
-  
-  @objc
-  var minZoomLevel : NSNumber? = nil
-
-  @objc
-  static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-  
-  override func sourceType() -> Source.Type {
-    return SourceType.self
-  }
-
-  override func makeSource() -> Source
-  {
-    var result = SourceType()
-    if let url = url {
-      result.url = url
-    } else if let tileUrlTemplates = tileUrlTemplates {
-      result.tiles = tileUrlTemplates
-    } else {
-      Logger.log(level: .error, message: "RCTMGLRasterDemSource should have either url or tileUrlTemplates ")
-      return result
-    }
-    
-    if let tileSize = tileSize {
-      result.tileSize = tileSize.doubleValue
-    }
-    
-    if let maxZoomLevel = maxZoomLevel {
-      result.maxzoom = maxZoomLevel.doubleValue
-    }
-
-    if let minZoomLevel = minZoomLevel {
-      result.minzoom = minZoomLevel.doubleValue
-    } 
-    return result
-  }  
-}
-  

package/ios/RCTMGL-v10/RCTMGLRasterDemSourceManager.m

@@ -1,21 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface RCT_EXTERN_MODULE(RCTMGLRasterDemSourceManager, 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(bounds, NSArray)
-RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(tileSize, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(attribution, NSString)
-RCT_EXPORT_VIEW_PROPERTY(encoding, NSString)
-RCT_EXPORT_VIEW_PROPERTY(volatile, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(prefetchZoomDelta, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(minimumTileUpdateInterval, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(maxOverscaleFactorForParentTiles, NSNumber)
-
-@end

package/ios/RCTMGL-v10/RCTMGLRasterDemSourceManager.swift

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

package/ios/RCTMGL-v10/RCTMGLRasterLayer.swift

@@ -1,52 +0,0 @@
-import MapboxMaps
-
-@objc(RCTMGLRasterLayer)
-class RCTMGLRasterLayer: RCTMGLLayer {
-  typealias LayerType = RasterLayer
-
-  override func makeLayer(style: Style) throws -> Layer {
-    // let source : ImageSource = try self.sourceWithSourceID(in: style)
-    var layer = LayerType(id: self.id!)
-    layer.source = sourceID
-    return layer
-  }
-
-  override func apply(style : Style) throws {
-    try style.updateLayer(withId: id, type: RasterLayer.self) { (layer : inout RasterLayer) in
-      if let styleLayer = self.styleLayer as? RasterLayer {
-        layer = styleLayer
-      }
-    }
-  }
- 
-  override func addStyles() {
-    if let style : Style = self.style,
-       let reactStyle = reactStyle {
-      let styler =  RCTMGLStyle(style: self.style!)
-      styler.bridge = self.bridge
-      
-      if var styleLayer = self.styleLayer as? LayerType {
-        styler.rasterLayer(
-          layer: &styleLayer,
-          reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
-          applyUpdater:{ (updater) in logged("RCTMGLRasterLayer.updateLayer") {
-            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
-          }},
-          isValid: { return self.isAddedToMap() }
-        )
-        self.styleLayer = styleLayer
-      } else {
-        fatalError("[xxx] layer is not raster layer?!!! \(optional: self.styleLayer)")
-      }
-    }
-  }
-   
-  func isAddedToMap() -> Bool {
-    return true
-  }
-
-  override func layerType() -> Layer.Type {
-    return LayerType.self
-  }
-}

package/ios/RCTMGL-v10/RCTMGLRasterLayerManager.m

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

package/ios/RCTMGL-v10/RCTMGLRasterLayerManager.swift

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

package/ios/RCTMGL-v10/RCTMGLRasterSource.swift

@@ -1,51 +0,0 @@
-import MapboxMaps
-
-@objc
-class RCTMGLRasterSource : RCTMGLSource {
-  typealias SourceType = RasterSource
-
-  @objc var url: String? = nil
-  
-  @objc var tileUrlTemplates: [String]? = nil
-  
-  @objc var minZoomLevel: NSNumber?
-  @objc var maxZoomLevel: NSNumber?
-  @objc var tileSize: NSNumber?
-  
-  @objc var tms: Bool = false
-  
-  @objc var attribution: String?
-
-  override func makeSource() -> Source
-  {
-    var result = RasterSource()
-    if let url = url {
-      result.url = url
-    } else {
-      result.tiles = tileUrlTemplates
-    }
-    
-    if let tileSize = tileSize {
-      result.tileSize = tileSize.doubleValue
-    }
-    
-    if let minZoomLevel = minZoomLevel {
-      result.minzoom = minZoomLevel.doubleValue
-    }
-    
-    if let maxZoomLevel = maxZoomLevel {
-      result.maxzoom = maxZoomLevel.doubleValue
-    }
-    
-    if tms {
-      result.scheme = .tms
-    }
-    
-    if let attribution = attribution {
-      result.attribution = attribution
-    }
-    
-    return result
-  }
-
-}

package/ios/RCTMGL-v10/RCTMGLRasterSourceManager.m

@@ -1,19 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface RCT_EXTERN_MODULE(RCTMGLRasterSourceManager, 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(tileSize, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
-
-RCT_EXPORT_VIEW_PROPERTY(tms, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(attribution, NSString)
-
-
-@end

package/ios/RCTMGL-v10/RCTMGLRasterSourceManager.swift

@@ -1,14 +0,0 @@
-import Foundation
-import MapboxMaps
-
-@objc(RCTMGLRasterSourceManager)
-class RCTMGLRasterSourceManager : RCTViewManager {
-  @objc
-  override static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-  
-  override func view() -> UIView! {
-    return RCTMGLRasterSource()
-  }
-}