@rnmapbox/maps 10.0.15 → 10.1.0-beta.11

package/ios/RNMBX/RNMBXPointAnnotation.swift

@@ -0,0 +1,262 @@
+import MapboxMaps
+
+
+final class WeakRef<T: AnyObject> {
+  weak var object: T?
+  
+  init(_ object: T) {
+    self.object = object
+  }
+}
+
+class RNMBXPointAnnotation : RNMBXInteractiveElement {
+  static let key = "RNMBXPointAnnotation"
+  static var gid = 0;
+  
+  lazy var annotation : PointAnnotation = {
+    var result = PointAnnotation(coordinate: CLLocationCoordinate2D())
+    result.isDraggable = false // we implement our own drag logic
+    result.userInfo = [RNMBXPointAnnotation.key:WeakRef(self)]
+    return result
+  }()
+  var added = false
+
+  weak var callout: RNMBXCallout? = 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 {
+    RNMBXPointAnnotation.gid = RNMBXPointAnnotation.gid + 1
+    return RNMBXPointAnnotation.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? RNMBXCallout {
+      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? RNMBXCallout {
+      if self.callout == callout {
+        self.callout = nil
+      }
+    } else {
+      reactSubviews.removeAll(where: { $0 == subview })
+    }
+  }
+  
+  // MARK: - RNMBXMapComponent
+  
+  override func addToMap(_ map: RNMBXMapView, style: Style) {
+    super.addToMap(map, style: style)
+    self.map = map
+    addIfPossible()
+  }
+
+  override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    removeIfAdded()
+    self.map = nil
+    return true
+  }
+  
+  // MARK: - RNMBXInteractiveElement
+  
+  override func getLayerIDs() -> [String] {
+    return []
+  }
+}
+
+// MARK: - add/remove/update of point annotation
+
+extension RNMBXPointAnnotation {
+  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/RNMBX/RNMBXPointAnnotationManager.m

@@ -0,0 +1,23 @@
+#import "React/RCTBridgeModule.h"
+#import <React/RCTViewManager.h>
+#import <Foundation/Foundation.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXPointAnnotation, RNMBXPointAnnotationManager, 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/RNMBX/RNMBXPointAnnotationManager.swift

@@ -0,0 +1,34 @@
+import Foundation
+import MapboxMaps
+
+@objc(RNMBXPointAnnotationManager)
+class RNMBXPointAnnotationManager  : RCTViewManager {
+  @objc
+  override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+  
+  override func view() -> UIView! {
+    return RNMBXPointAnnotation()
+  }
+
+  @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? RNMBXPointAnnotation else {
+        Logger.log(level: .error, message: "View \(view) is not RNMBXPointAnnotation")
+        return
+      }
+          
+      view.refresh()
+    }
+  }
+}

package/ios/RNMBX/RNMBXRasterDemSource.swift

@@ -0,0 +1,61 @@
+import MapboxMaps
+
+@objc
+class RNMBXRasterDemSource : RNMBXSource {
+  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
+  {
+    #if RNMBX_11 // RNMBX_11_TODO
+    var result = SourceType(id: "raster-dem-source-id-todo")
+    #else
+    var result = SourceType()
+    #endif
+    if let url = url {
+      result.url = url
+    } else if let tileUrlTemplates = tileUrlTemplates {
+      result.tiles = tileUrlTemplates
+    } else {
+      Logger.log(level: .error, message: "RNMBXRasterDemSource 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/RNMBX/RNMBXRasterDemSourceManager.m

@@ -0,0 +1,21 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_MODULE(RNMBXRasterDemSourceManager, 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/RNMBX/RNMBXRasterDemSourceManager.swift

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

package/ios/RNMBX/RNMBXRasterLayer.swift

@@ -0,0 +1,56 @@
+import MapboxMaps
+
+@objc(RNMBXRasterLayer)
+public class RNMBXRasterLayer: RNMBXLayer {
+  typealias LayerType = RasterLayer
+
+  override func makeLayer(style: Style) throws -> Layer {
+    // let source : ImageSource = try self.sourceWithSourceID(in: style)
+    #if RNMBX_11
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    #else
+    var layer = LayerType(id: self.id!)
+    #endif
+    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 =  RNMBXStyle(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("RNMBXRasterLayer.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/RNMBX/RNMBXRasterLayerComponentView.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 RNMBXRasterLayerComponentView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterLayerComponentView.mm

@@ -0,0 +1,68 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXRasterLayerComponentView.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 RNMBXRasterLayerComponentView () <RCTRNMBXRasterLayerViewProtocol>
+@end
+
+@implementation RNMBXRasterLayerComponentView {
+    RNMBXRasterLayer *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXRasterLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXRasterLayer alloc] init];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXRasterLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const RNMBXRasterLayerProps>(props);
+  RNMBXSetCommonLayerProps(newProps, _view);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRasterLayerCls(void)
+{
+  return RNMBXRasterLayerComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterLayerViewManager.m

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

package/ios/RNMBX/RNMBXRasterLayerViewManager.swift

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

package/ios/RNMBX/RNMBXRasterSource.swift

@@ -0,0 +1,55 @@
+import MapboxMaps
+
+@objc
+class RNMBXRasterSource : RNMBXSource {
+  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
+  {
+    #if RNMBX_11
+    var result = RasterSource(id: self.id)
+    #else
+    var result = RasterSource()
+    #endif
+    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/RNMBX/RNMBXRasterSourceManager.m

@@ -0,0 +1,19 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_MODULE(RNMBXRasterSourceManager, 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/RNMBX/RNMBXRasterSourceManager.swift

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