@rnmapbox/maps 10.0.15 → 10.1.0-beta.10

package/ios/RNMBX/RNMBXSkyLayerComponentView.mm

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

package/ios/RNMBX/RNMBXSkyLayerViewManager.m

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

package/ios/RNMBX/RNMBXSkyLayerViewManager.swift

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

package/ios/RNMBX/RNMBXSnapshotModule.m

@@ -0,0 +1,11 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+
+@interface RCT_EXTERN_MODULE(RNMBXSnapshotModule, NSObject<RCTBridgeModule>)
+
+RCT_EXTERN_METHOD(takeSnap:(NSDictionary *)jsOptions
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+@end

package/ios/RNMBX/RNMBXSnapshotModule.swift

@@ -0,0 +1,112 @@
+import MapboxMaps
+
+@objc(RNMBXSnapshotModule)
+class RNMBXSnapshotModule : NSObject {
+  @objc
+  static func requiresMainQueueSetup() -> Bool {
+      return true
+  }
+  
+  @objc
+  func takeSnap(_ jsOptions: [String: Any],
+                resolver:@escaping RCTPromiseResolveBlock,
+                rejecter:@escaping RCTPromiseRejectBlock
+  ) {
+    DispatchQueue.main.async {
+      logged("takeSnap", rejecter:rejecter) {
+        let snapshotterOptions = try self._getSnapshotterOptions(jsOptions)
+        let snapshotter = Snapshotter(options: snapshotterOptions)
+        let cameraOptions = try self._getCameraOptions(jsOptions, snapshotter)
+        
+        snapshotter.setCamera(to: cameraOptions)
+        if let styleURL = jsOptions["styleURL"] as? String {
+          snapshotter.style.uri = StyleURI(rawValue:styleURL)
+        }
+        var snapshotterReference : Snapshotter? = snapshotter
+        snapshotter.start(overlayHandler: nil, completion: { result in
+          do {
+            switch (result) {
+            case .success(let image):
+              guard let writeToDisk = jsOptions["writeToDisk"] as? NSNumber else {
+                throw RNMBXError.paramError("writeToDisk: is not a number")
+              }
+              
+              let value = writeToDisk.boolValue ? RNMBImageUtils.createTempFile(image) : RNMBImageUtils.createBase64(image)
+              _ = snapshotterReference
+              snapshotterReference = nil
+              resolver(value.absoluteString)
+            case .failure(let error):
+              _ = snapshotterReference
+              snapshotterReference = nil
+              Logger.log(level: .error, message: ":: Error - snapshot failed \(error) \(error.localizedDescription)")
+              rejecter("RNMBXSnapshotModule.start", error.localizedDescription, error)
+            }
+          } catch let error {
+            rejecter("RNMBXSnapshotModule.start", error.localizedDescription, error)
+          }
+        })
+      }
+    }
+  }
+
+  func _getCameraOptions(_ jsOptions: [String:Any], _ snaphotter: Snapshotter) throws -> CameraOptions {
+    guard let pitch = jsOptions["pitch"] as? NSNumber else {
+      throw RNMBXError.paramError("pitch: is not a number")
+    }
+    
+    guard let zoomLevel = jsOptions["zoomLevel"] as? NSNumber else {
+      throw RNMBXError.paramError("zoomLevel: is not a number")
+    }
+
+    guard let heading = jsOptions["heading"] as? NSNumber else {
+      throw RNMBXError.paramError("heading: is not a number")
+    }
+    
+    if let centerCoordinateString = jsOptions["centerCoordinate"] as? String {
+      guard let centerCoordinateData = centerCoordinateString.data(using: .utf8),
+            let centerCoordinateGeometry = try JSONDecoder().decode(Feature.self, from: centerCoordinateData).geometry,
+            case .point(let centerCoordinatePoint) = centerCoordinateGeometry else {
+        throw RNMBXError.paramError("centerCoordinate: bad format")
+      }
+      
+      return CameraOptions(center: centerCoordinatePoint.coordinates, padding: nil, anchor: nil, zoom: zoomLevel.doubleValue, bearing: heading.doubleValue, pitch: pitch.doubleValue)
+    }
+    else if let bounds = jsOptions["bounds"] as? String {
+      guard let boundsData = bounds.data(using: .utf8) else {
+        throw RNMBXError.paramError("bounds: bad format")
+      }
+      let boundsFeatures = try JSONDecoder().decode(FeatureCollection.self, from: boundsData).features
+      let coords : [CLLocationCoordinate2D] = try boundsFeatures.map {
+        guard case .point(let centerCoordinatePoint) = $0.geometry else {
+          throw RNMBXError.paramError("Invalid bounds geometry")
+        }
+        return centerCoordinatePoint.coordinates
+      }
+      return snaphotter.camera(for: coords, padding: .zero, bearing: heading.doubleValue, pitch: pitch.doubleValue)
+    } else {
+      throw RNMBXError.paramError("neither centerCoordinate nor bounds provided")
+    }
+  }
+  
+  func _getSnapshotterOptions(_ jsOptions: [String:Any]) throws -> MapSnapshotOptions {
+    guard let width = jsOptions["width"] as? NSNumber,
+          let height = jsOptions["height"] as? NSNumber else {
+      throw RNMBXError.paramError("width, height: is not a number")
+    }
+    #if RNMBX_11
+    let mapSnapshotOptions = MapSnapshotOptions(
+      size: CGSize(width: width.doubleValue, height: height.doubleValue),
+      pixelRatio: 1.0
+    )
+    #else
+    let resourceOptions = ResourceOptions(accessToken: RNMBXModule.accessToken!)
+    let mapSnapshotOptions = MapSnapshotOptions(
+      size: CGSize(width: width.doubleValue, height: height.doubleValue),
+      pixelRatio: 1.0,
+      resourceOptions: resourceOptions
+    )
+    #endif
+    
+    return mapSnapshotOptions
+  }
+}

package/ios/RNMBX/RNMBXSource.swift

@@ -0,0 +1,118 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc
+class RNMBXSource : RNMBXInteractiveElement {
+  var layers: [RNMBXSourceConsumer] = []
+  var components: [RNMBXMapComponent] = []
+
+  var source : Source? = nil
+
+  var ownsSource : Bool = false
+
+  @objc var existing: Bool = false
+  
+  override func getLayerIDs() -> [String] {
+    layers.compactMap {
+      if let layer = $0 as? RNMBXLayer {
+        return layer.id
+      } else {
+        return nil
+      }
+    }
+  }
+
+  func makeSource() -> Source {
+    fatalError("Subclasses should override makeSource")
+  }
+  
+  func sourceType() -> Source.Type {
+    fatalError("Subclasses should override makeSource")
+  }
+  
+  // MARK: - UIView+React
+
+  @objc override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
+    if let layer = subview as? RNMBXSourceConsumer {
+      if let map = map {
+        layer.addToMap(map, style: map.mapboxMap.style)
+      }
+      layers.append(layer)
+    } else if let component = subview as? RNMBXMapComponent {
+      if let map = map {
+        component.addToMap(map, style: map.mapboxMap.style)
+      }
+      components.append(component)
+    }
+    super.insertReactSubview(subview, at: atIndex)
+  }
+  
+  @objc override func removeReactSubview(_ subview: UIView!) {
+    if let layer : RNMBXSourceConsumer = subview as? RNMBXSourceConsumer {
+      if let map = map {
+        layer.removeFromMap(map, style: map.mapboxMap.style)
+      }
+      layers.removeAll { $0 as AnyObject === layer }
+    } else if let component = subview as? RNMBXMapComponent {
+      if let map = map {
+        component.removeFromMap(map, reason: .ViewRemoval)
+      }
+      layers.removeAll { $0 as AnyObject === component }
+    }
+    super.removeReactSubview(subview)
+  }
+  
+  @objc override func didUpdateReactSubviews() {
+    // do nothing to prevent inserting layers to UIView hierarchy
+  }
+  
+  // MARK: - RNMBXInteractiveElement
+  
+  override func addToMap(_ map: RNMBXMapView, style: Style) {
+    self.map = map
+
+    if style.sourceExists(withId: self.id) {
+      if (!existing) {
+        Logger.log(level: .warn, message: "Warning source with id:\(optional: id) referred to existing source but `existing` attibute was missing. https://github.com/rnmapbox/maps/wiki/Deprecated-ExistingSourceLayer")
+      }
+      self.source = try! style.source(withId: self.id)
+    } else {
+      if (existing) {
+        Logger.log(level: .warn, message: "Warning source with id:\(optional: id) marked as existing, but could not find in style, source identifiers: \(style.allSourceIdentifiers.map { [$0.id, $0.type.rawValue] })")
+      }
+      let source = self.makeSource()
+      self.ownsSource = true
+      self.source = source
+      logged("SyleSource.addToMap", info: {"id: \(optional: self.id)"}) {
+        #if RNMBX_11
+        try style.addSource(source)
+        #else
+        try style.addSource(source, id: self.id)
+        #endif
+      }
+    }
+
+    for layer in self.layers {
+      layer.addToMap(map, style: map.mapboxMap.style)
+    }
+    for component in self.components {
+      component.addToMap(map, style: map.mapboxMap.style)
+    }
+  }
+
+  override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    self.map = nil
+
+    for layer in self.layers {
+      layer.removeFromMap(map, style: map.mapboxMap.style)
+    }
+
+    if self.ownsSource {
+      let style = map.mapboxMap.style
+      logged("StyleSource.removeFromMap", info: { "id: \(optional: self.id)"}) {
+        try style.removeSource(withId: id)
+      }
+      self.ownsSource = false
+    }
+    return true
+  }
+}