@rnmapbox/maps 10.2.10 → 10.3.0-beta.0

package/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXRasterParticleLayerComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -17,8 +16,6 @@ using namespace facebook::react;
 @interface RNMBXRasterParticleLayerComponentView () <RCTRNMBXRasterParticleLayerViewProtocol>
 @end
 
-#if RNMBX_11
-
 @implementation RNMBXRasterParticleLayerComponentView {
     RNMBXRasterParticleLayer *_view;
 }
@@ -70,41 +67,8 @@ using namespace facebook::react;
 
 @end
 
-#else // !RNMBX_11
-
-@implementation RNMBXRasterParticleLayerComponentView
-
-+ (void)load
-{
-  [super load];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNMBXRasterParticleLayerProps>();
-    _props = defaultProps;
-  }
-  return self;
-}
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<RNMBXRasterParticleLayerComponentDescriptor>();
-}
-
-- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
-{
-  [super updateProps:props oldProps:oldProps];
-}
-
-@end
-
-#endif // RNMBX_11
-
 Class<RCTComponentViewProtocol> RNMBXRasterParticleLayerCls(void)
 {
   return RNMBXRasterParticleLayerComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterSource.swift

@@ -20,11 +20,7 @@ public class RNMBXRasterSource : RNMBXSource {
 
   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 {

package/ios/RNMBX/RNMBXRasterSourceComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXRasterSourceComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXRasterSourceComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -128,4 +127,3 @@ Class<RCTComponentViewProtocol> RNMBXRasterSourceCls(void)
   return RNMBXRasterSourceComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXShapeSource.swift

@@ -95,11 +95,7 @@ public class RNMBXShapeSource : RNMBXSource {
 
   override func makeSource() -> Source
   {
-    #if RNMBX_11
     var result =  GeoJSONSource(id: id)
-    #else
-    var result =  GeoJSONSource()
-    #endif
 
     if let shapeObject = shapeObject {
       result.data = toGeoJSONSourceData(shapeObject)
@@ -255,14 +251,8 @@ extension RNMBXShapeSource
       return .featureCollection(featureCollection)
     case .geometry(let geometry):
       return .geometry(geometry)
-    #if RNMBX_11
     case .string(_):
-      // RNMBX_11_TODO
       throw RNMBXError.parseError("url as shape is not supported when updating a ShapeSource")
-    #else
-    case .url(_):
-      throw RNMBXError.parseError("url as shape is not supported when updating a ShapeSource")
-      #endif
     }
   }
 
@@ -293,56 +283,6 @@ extension RNMBXShapeSource
   }
 }
 
-#if !RNMBX_11
-class DummyCancellable : Cancelable {
-  func cancel() {}
-}
-
-#if false
-extension MapboxMap {
-  @discardableResult
-  public func getGeoJsonClusterExpansionZoom(forSourceId sourceId: String,
-                                             feature: Feature,
-                                             completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
-    self.queryFeatureExtension(for: sourceId,
-                               feature: feature,
-                               extension: "supercluster",
-                               extensionField: "expansion-zoom",
-                               args: nil,
-                               completion: completion)
-    return DummyCancellable()
-  }
-  @discardableResult
-  public func getGeoJsonClusterChildren(forSourceId sourceId: String,
-                                        feature: Feature,
-                                        completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
-    self.queryFeatureExtension(for: sourceId,
-                                   feature: feature,
-                                   extension: "supercluster",
-                                   extensionField: "children",
-                                   args: nil,
-                                   completion: completion)
-    return DummyCancellable()
-  }
-
-  @discardableResult
-  public func getGeoJsonClusterLeaves(forSourceId sourceId: String,
-                                      feature: Feature,
-                                      limit: UInt64 = 10,
-                                      offset: UInt64 = 0,
-                                      completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
-      self.queryFeatureExtension(for: sourceId,
-                                   feature: /*MapboxCommon.Feature(*/feature/*)*/,
-                                   extension: "supercluster",
-                                   extensionField: "leaves",
-                                   args: ["limit": limit, "offset": offset],
-                                   completion: completion)
-    return DummyCancellable()
-  }
-}
-#endif
-#endif
-
 // MARK: - getClusterExpansionZoom/getClusterLeaves
 
 extension RNMBXShapeSource
@@ -424,6 +364,65 @@ extension RNMBXShapeSource
       }
     }
   }
+
+  @objc public func getClusterChildren(
+    featureJSON: String,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    getClusterChildren(featureJSON) { result in
+      switch result {
+      case .success(let features):
+        logged("getClusterChildren", rejecter: rejecter) {
+          let featuresJSON: Any = try features.features.toJSON()
+          resolver([
+            "data": ["type": "FeatureCollection", "features": featuresJSON]
+          ])
+        }
+      case .failure(let error):
+        rejecter(error.localizedDescription, "Error.getClusterChildren", error)
+      }
+    }
+  }
+
+  @objc public func getClusterLeaves(
+    featureJSON: String,
+    number: uint,
+    offset: uint,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    getClusterLeaves(featureJSON, number: number, offset: offset) { result in
+      switch result {
+      case .success(let features):
+        logged("getClusterLeaves", rejecter: rejecter) {
+          let featuresJSON: Any = try features.features.toJSON()
+          resolver([
+            "data": ["type": "FeatureCollection", "features": featuresJSON]
+          ])
+        }
+      case .failure(let error):
+        rejecter(error.localizedDescription, "Error.getClusterLeaves", error)
+      }
+    }
+  }
+
+  @objc public func getClusterExpansionZoom(
+    featureJSON: String,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    getClusterExpansionZoom(featureJSON) { result in
+      switch result {
+      case .success(let zoom):
+        resolver([
+          "data": NSNumber(value: zoom)
+        ])
+      case .failure(let error):
+        rejecter(error.localizedDescription, "Error.getClusterExpansionZoom", error)
+      }
+    }
+  }
 }
 
 // MARK: shape animation

package/ios/RNMBX/RNMBXShapeSourceComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXShapeSourceComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXShapeSourceComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -119,4 +118,3 @@ Class<RCTComponentViewProtocol> RNMBXShapeSourceCls(void)
   return RNMBXShapeSourceComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXShapeSourceModule.h

@@ -2,18 +2,15 @@
 #import <UIKit/UIKit.h>
 #import "RNMBXViewResolver.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 #import "rnmapbox_maps_specs.h"
-#else
-#import <React/RCTBridge.h>
-#endif
 
-@interface RNMBXShapeSourceModule : NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXShapeSourceModuleSpec, RNMBXViewResolverDelegate>
+@interface RNMBXShapeSourceModule : NSObject <NativeRNMBXShapeSourceModuleSpec, RNMBXViewResolverDelegate>
+@end
+
 #else
-<RCTBridgeModule, RNMBXViewResolverDelegate>
-#endif
 
+@interface RNMBXShapeSourceModule : NSObject
 @end
 
+#endif

package/ios/RNMBX/RNMBXShapeSourceModule.mm

@@ -3,9 +3,7 @@
 #import <React/RCTUIManagerUtils.h>
 
 #import "RNMBXShapeSourceModule.h"
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXShapeSourceComponentView.h"
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import "rnmapbox_maps-Swift.pre.h"
 
@@ -13,9 +11,7 @@
 
 RCT_EXPORT_MODULE();
 
-#ifdef RCT_NEW_ARCH_ENABLED
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
-#endif // RCT_NEW_ARCH_ENABLED
 @synthesize bridge = _bridge;
 
 - (dispatch_queue_t)methodQueue
@@ -41,31 +37,28 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(getClusterChildren:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) {
-        [RNMBXShapeSourceViewManager getClusterChildrenWithShapeSource:view featureJSON:featureJSON resolver:resolve rejecter:reject];
+        [view getClusterChildrenWithFeatureJSON:featureJSON resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getClusterChildren"];
 }
-  
+
 RCT_EXPORT_METHOD(getClusterLeaves:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON number:(NSInteger)number offset:(NSInteger)offset resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
  [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) {
-     [RNMBXShapeSourceViewManager getClusterLeavesWithShapeSource:view featureJSON:featureJSON number:number offset:offset resolver:resolve rejecter:reject];
+     [view getClusterLeavesWithFeatureJSON:featureJSON number:number offset:offset resolver:resolve rejecter:reject];
  } reject:reject methodName:@"getClusterLeaves"];
 }
-     
+
 RCT_EXPORT_METHOD(getClusterExpansionZoom:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
  [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) {
-     [RNMBXShapeSourceViewManager getClusterExpansionZoomWithShapeSource:view featureJSON:featureJSON resolver:resolve rejecter:reject];
+     [view getClusterExpansionZoomWithFeatureJSON:featureJSON resolver:resolve rejecter:reject];
  } reject:reject methodName:@"getClusterExpansionZoom"];
 }
 
-// Thanks to this guard, we won't compile this code when we build for the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
     return std::make_shared<facebook::react::NativeRNMBXShapeSourceModuleSpecJSI>(params);
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 @end

package/ios/RNMBX/RNMBXSkyLayerComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXSkyLayerComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXSkyLayerComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -73,4 +72,3 @@ Class<RCTComponentViewProtocol> RNMBXSkyLayerCls(void)
   return RNMBXSkyLayerComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXSnapshotModule.m

@@ -1,5 +1,4 @@
 #import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
 
 
 @interface RCT_EXTERN_MODULE(RNMBXSnapshotModule, NSObject<RCTBridgeModule>)

package/ios/RNMBX/RNMBXSnapshotModule.swift

@@ -93,20 +93,11 @@ class RNMBXSnapshotModule : NSObject {
           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

@@ -108,11 +108,7 @@ public class RNMBXSource : RNMBXInteractiveElement {
       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
       }
     }