@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/ios/RNMBX/RNMBXFabricPropConvert.mm

@@ -1,136 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import <React/RCTConversions.h>
-#import <React/RCTFabricComponentsPlugins.h>
-#import <React/RCTBridge+Private.h>
-
-#import "rnmapbox_maps-Swift.pre.h"
-#import "RNMBXFabricPropConvert.h"
-
-BOOL RNMBXPropConvert_BOOL(const folly::dynamic &dyn, NSString* propertyName) {
-  switch (dyn.type()) {
-    case folly::dynamic::BOOL:
-      return dyn.getBool();
-    default:
-      std::stringstream ss;
-      ss << dyn;
-      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a boolean but was: $d",
-                          propertyName,
-                          ss.str().c_str()
-                         ]];
-      return NULL;
-  }
-}
-
-NSNumber* RNMBXPropConvert_Optional_BOOL_NSNumber(const folly::dynamic &dyn, NSString* propertyName) {
-  switch (dyn.type()) {
-    case folly::dynamic::NULLT:
-      return NULL;
-    case folly::dynamic::BOOL:
-      return [NSNumber numberWithBool:dyn.getBool()];
-    default:
-      std::stringstream ss;
-      ss << dyn;
-      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a boolean or nil but was: $d",
-                          propertyName,
-                          ss.str().c_str()
-                         ]];
-      return NULL;
-  }
-}
-
-BOOL RNMBXPropConvert_Optional_BOOL(const folly::dynamic &dyn, NSString* propertyName) {
-  switch (dyn.type()) {
-    case folly::dynamic::BOOL:
-      return dyn.getBool();
-    default:
-      std::stringstream ss;
-      ss << dyn;
-      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a boolean or nil but was: $d",
-                          propertyName,
-                          ss.str().c_str()
-                         ]];
-      return NO;
-  }
-}
-
-NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString* propertyName) {
-    switch (dyn.type()) {
-    case folly::dynamic::STRING:
-      return [NSString stringWithCString:dyn.getString().c_str() encoding:NSUTF8StringEncoding];
-    case folly::dynamic::NULLT:
-      return nil;
-    default:
-      std::stringstream ss;
-      ss << dyn;
-      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a string or nil but was: %s",
-                          propertyName,
-                          ss.str().c_str()
-                         ]];
-      return nil;
-  }
-}
-
-
-id RNMBXPropConvert_ID(const folly::dynamic &dyn)
-{
-  switch (dyn.type()) {
-    case folly::dynamic::NULLT:
-      return nil;
-    case folly::dynamic::BOOL:
-      return dyn.getBool() ? @YES : @NO;
-    case folly::dynamic::INT64:
-      return @(dyn.getInt());
-    case folly::dynamic::DOUBLE:
-      return @(dyn.getDouble());
-    case folly::dynamic::STRING:
-      return [NSString stringWithCString:dyn.c_str() encoding:NSUTF8StringEncoding];
-    case folly::dynamic::ARRAY: {
-      NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:dyn.size()];
-      for (const auto &elem : dyn) {
-        id value = RNMBXPropConvert_ID(elem);
-        if (value) {
-          [array addObject:value];
-        }
-      }
-      return array;
-    }
-    case folly::dynamic::OBJECT: {
-      NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity:dyn.size()];
-      for (const auto &elem : dyn.items()) {
-        id key = RNMBXPropConvert_ID(elem.first);
-        id value = RNMBXPropConvert_ID(elem.second);
-        if (key && value) {
-          dict[key] = value;
-        }
-      }
-      return dict;
-    }
-  }
-}
-
-id RNMBXPropConvert_Optional_ExpressionDouble(const folly::dynamic &dyn, NSString* propertyName) {
-  switch (dyn.type()) {
-  case folly::dynamic::ARRAY:
-    return RNMBXPropConvert_ID(dyn);
-  case folly::dynamic::DOUBLE:
-    return [NSNumber numberWithDouble:dyn.getDouble()];
-  case folly::dynamic::INT64:
-    return [NSNumber numberWithInt:dyn.getInt()];
-  default:
-    std::stringstream ss;
-    ss << dyn;
-    [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be an array or a number: %s",
-                        propertyName,
-                        ss.str().c_str()
-                       ]];
-    return nil;
-  }
-}
-
-NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn, NSString* propertyName)
-{
-  return RNMBXPropConvert_ID(dyn);
-}
-
-#endif

package/ios/RNMBX/RNMBXMarkerViewContentComponentView.h

@@ -1,15 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTUIManager.h>
-#import <React/RCTViewComponentView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RNMBXMarkerViewContentComponentView : RCTViewComponentView
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXMarkerViewContentComponentView.mm

@@ -1,55 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import "RNMBXMarkerViewContentComponentView.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 RNMBXMarkerViewContentComponentView () <RCTRNMBXMarkerViewContentViewProtocol>
-@end
-
-@implementation RNMBXMarkerViewContentComponentView {
-  RNMBXMarkerView *_view;
-  CGRect _frame;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNMBXMarkerViewProps>();
-    _props = defaultProps;
-    _frame = frame;
-    [self prepareView];
-  }
-  return self;
-}
-
-- (void)prepareView
-{
-  _view =  [[RNMBXMarkerView alloc] initWithFrame:_frame];
-  self.contentView = _view;
-}
-
-#pragma mark - RCTComponentViewProtocol
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<RNMBXMarkerViewContentComponentDescriptor>();
-}
-
-@end
-
-Class<RCTComponentViewProtocol> RNMBXMarkerViewContentCls(void)
-{
-  return RNMBXMarkerViewContentComponentView.class;
-}
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXMarkerViewContentManager.m

@@ -1,6 +0,0 @@
-#import "React/RCTBridgeModule.h"
-#import <React/RCTViewManager.h>
-#import <Foundation/Foundation.h>
-
-@interface RCT_EXTERN_REMAP_MODULE(RNMBXMarkerViewContent, RNMBXMarkerViewContentManager, RCTViewManager)
-@end

package/ios/RNMBX/RNMBXMarkerViewContentManager.swift

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

package/ios/RNMBX/RNMBXModelLayer.swift

@@ -1,59 +0,0 @@
-@_spi(Experimental) import MapboxMaps
-
-@objc(RNMBXModelLayer)
-public class RNMBXModelLayer: RNMBXVectorLayer {
-  typealias LayerType = ModelLayer
-
-  override func makeLayer(style: Style) throws -> Layer {
-    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
-    #if RNMBX_11
-    var layer = LayerType(id: self.id!, source: sourceID!)
-    #else
-    var layer = LayerType(id: self.id!)
-    #endif
-    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 ModelLayer) in
-      if self.styleLayer != nil {
-        self.setOptions(&self.styleLayer!)
-      }
-      if let styleLayer = self.styleLayer as? ModelLayer {
-        layer = styleLayer
-      }
-    }
-  }
-  
-  override func addStyles() {
-    if let style : Style = self.style {
-      let styler =  RNMBXStyle(style: self.style!)
-      styler.bridge = self.bridge
-      
-      if var styleLayer = self.styleLayer as? LayerType,
-         let reactStyle = reactStyle {
-        styler.modelLayer(
-          layer: &styleLayer,
-          reactStyle: reactStyle,
-          oldReactStyle: oldReatStyle,
-          applyUpdater: { (updater) in logged("RNMBXModelLayer.updateLayer") {
-            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/RNMBX/RNMBXModelLayerComponentView.h

@@ -1,15 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTUIManager.h>
-#import <React/RCTViewComponentView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RNMBXModelLayerComponentView : RCTViewComponentView
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelLayerComponentView.mm

@@ -1,70 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import "RNMBXModelLayerComponentView.h"
-#import "RNMBXFabricHelpers.h"
-
-#import <React/RCTConversions.h>
-#import <React/RCTFabricComponentsPlugins.h>
-#import <React/RCTBridge+Private.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 RNMBXModelLayerComponentView () <RCTRNMBXModelLayerViewProtocol>
-@end
-
-@implementation RNMBXModelLayerComponentView {
-    RNMBXModelLayer *_view;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNMBXModelLayerProps>();
-    _props = defaultProps;
-      [self prepareView];
-  }
-
-  return self;
-}
-
-- (void)prepareView
-{
-  _view =  [[RNMBXModelLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
-  self.contentView = _view;
-}
-
-#pragma mark - RCTComponentViewProtocol
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<RNMBXModelLayerComponentDescriptor>();
-}
-
-- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
-{
-  const auto &newProps = static_cast<const RNMBXModelLayerProps &>(*props);
-  RNMBXSetCommonLayerProps(newProps, _view);
-
-  [super updateProps:props oldProps:oldProps];
-}
-
-- (void)prepareForRecycle
-{
-    [super prepareForRecycle];
-    [self prepareView];
-}
-
-@end
-
-Class<RCTComponentViewProtocol> RNMBXModelLayerCls(void)
-{
-  return RNMBXModelLayerComponentView.class;
-}
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelLayerViewManager.m

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

package/ios/RNMBX/RNMBXModelLayerViewManager.swift

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

package/ios/RNMBX/RNMBXModels.swift

@@ -1,63 +0,0 @@
-@_spi(Experimental) import MapboxMaps
-
-@objc(RNMBXModels)
-open class RNMBXModels : UIView, RNMBXMapComponent {
-  var modelIdToUrl: [String: String] = [:]
-  
-  @objc(models)
-  public var models: NSDictionary {
-    set {
-      var newModels: [String: String] = [:]
-      newValue.forEach { (key, value) in
-        if let value = value as? NSDictionary, let key = key as? String {
-          if let uri = value["uri"] as? String {
-            newModels[key] = uri
-          } else if let url = value["url"] as? String {
-            newModels[key] = url
-          } else {
-            Logger.log(level: .error, message: "Unexpected value for model key: \(key) \(value) - no uri or url found")
-          }
-        }
-      }
-      self.modelIdToUrl = newModels
-    }
-    get {
-      Logger.error("RNMBXModels.models.getter not implemented")
-      return NSDictionary()
-    }
-  }
-  
-  func setModels(_ models: NSDictionary) {
-
-  }
-  
-  func addToMap(_ map: RNMBXMapView, style: Style) {
-    modelIdToUrl.forEach { (id, uri) in
-      logged("Models.addStyleModel") {
-        if let link = URL(string: uri), let scheme = link.scheme, let host = link.host,
-            let port = link.port {
-
-          // https://github.com/mapbox/mapbox-maps-ios/issues/2067
-          let uriWithoutQuery = "\(scheme)://\(host):\(port)\(link.path)"
-
-          try style.addStyleModel(modelId: id, modelUri: uriWithoutQuery)
-        } else {
-          try style.addStyleModel(modelId: id, modelUri: uri)
-        }
-      }
-    }
-  }
-  
-  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    modelIdToUrl.forEach { (id, _) in
-      #if RNMBX_11
-      try? map._mapView?.mapboxMap.removeStyleModel(modelId: id)
-      #endif
-    }
-    return true
-  }
-  
-  func waitForStyleLoad() -> Bool {
-    true
-  }
-}

package/ios/RNMBX/RNMBXModelsComponentView.h

@@ -1,17 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTUIManager.h>
-#import <React/RCTViewComponentView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface RNMBXModelsComponentView : RCTViewComponentView
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelsComponentView.mm

@@ -1,67 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import "RNMBXModelsComponentView.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>
-
-#import "rnmapbox_maps-Swift.pre.h"
-
-#import "RCTFollyConvert.h"
-#import "RNMBXFabricPropConvert.h"
-
-
-// TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support
-using namespace facebook::react;
-
-@implementation RNMBXModelsComponentView {
-    RNMBXModels *_view;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNMBXModelsProps>();
-    _props = defaultProps;
-    _view = [[RNMBXModels alloc] init];
-    [self prepareView];
-    
-    self.contentView = _view;
-  }
-  
-  return self;
-}
-
-- (void)prepareView
-{
-}
-
-
-#pragma mark - RCTComponentViewProtocol
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<RNMBXModelsComponentDescriptor>();
-}
-
-- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
-{
-  const auto &oldViewProps = static_cast<const RNMBXModelsProps &>(*oldProps);
-  const auto &newViewProps = static_cast<const RNMBXModelsProps &>(*props);
-
-  RNMBX_OPTIONAL_PROP_NSDictionary(models);
-  [super updateProps:props oldProps:oldProps];
-}
-@end
-
-Class<RCTComponentViewProtocol> RNMBXModelsCls(void)
-{
-  return RNMBXModelsComponentView.class;
-}
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelsManager.mm

@@ -1,9 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface RCT_EXTERN_REMAP_MODULE(RNMBXModels, RNMBXModelsManager, RCTViewManager)
-
-RCT_EXPORT_VIEW_PROPERTY(models, NSDictionary)
-
-@end
-

package/ios/RNMBX/RNMBXModelsManager.swift

@@ -1,13 +0,0 @@
-@objc(RNMBXModelsManager)
-public class RNMBXModelsManager : RCTViewManager {
-  @objc
-  public override static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-
-  public override func view() -> UIView! {
-    let layer = RNMBXModels()
-    return layer
-  }
-}
-

package/ios/RNMBX/RNMBXOfflineModuleLegacy.m

@@ -1,33 +0,0 @@
-#import "React/RCTBridgeModule.h"
-#import <React/RCTEventEmitter.h>
-
-@interface RCT_EXTERN_MODULE(RNMBXOfflineModuleLegacy, RCTEventEmitter<RCTBridgeModule>)
-
-RCT_EXTERN_METHOD(getPacks:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(createPack:(NSDictionary *) options resolver: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(resumePackDownload:(NSString *)name
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(pausePackDownload:(NSString *)name
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getPackStatus:(NSString *)name
-                 resolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(deletePack:(NSString *)name
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(invalidatePack:(NSString *)name
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(migrateOfflineCache:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(resetDatabase:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-
-@end