@aguacerowx/react-native 0.0.32 → 0.0.34

package/lib/module/ios/GridRenderLayerBridge.swift

@@ -1,37 +1,37 @@
-import Foundation
-@_spi(Experimental) import MapboxMaps
-
-@objc public class GridRenderLayerBridge: NSObject {
-    
-    @objc public static func addCustomLayer(
-        to mapView: MapView,
-        layerHost: CustomLayerHost,
-        layerId: String,
-        belowLayerId: String?
-    ) -> Bool {
-        let position: LayerPosition? = belowLayerId.map { .below($0) }
-        var customLayer = CustomLayer(id: layerId, renderer: layerHost)
-        
-        do {
-            try mapView.mapboxMap.addLayer(customLayer, layerPosition: position)
-            return true
-        } catch {
-            print("❌ [GridRenderLayerBridge] Failed to add layer: \(error)")
-            return false
-        }
-    }
-    
-    @objc public static func triggerRepaint(on mapView: MapView) {
-        mapView.mapboxMap.triggerRepaint()
-    }
-    
-    // ADD THIS NEW METHOD
-    @objc public static func layerExists(in mapView: MapView, layerId: String) -> Bool {
-        do {
-            _ = try mapView.mapboxMap.layer(withId: layerId)
-            return true
-        } catch {
-            return false
-        }
-    }
+import Foundation
+@_spi(Experimental) import MapboxMaps
+
+@objc public class GridRenderLayerBridge: NSObject {
+    
+    @objc public static func addCustomLayer(
+        to mapView: MapView,
+        layerHost: CustomLayerHost,
+        layerId: String,
+        belowLayerId: String?
+    ) -> Bool {
+        let position: LayerPosition? = belowLayerId.map { .below($0) }
+        var customLayer = CustomLayer(id: layerId, renderer: layerHost)
+        
+        do {
+            try mapView.mapboxMap.addLayer(customLayer, layerPosition: position)
+            return true
+        } catch {
+            print("❌ [GridRenderLayerBridge] Failed to add layer: \(error)")
+            return false
+        }
+    }
+    
+    @objc public static func triggerRepaint(on mapView: MapView) {
+        mapView.mapboxMap.triggerRepaint()
+    }
+    
+    // ADD THIS NEW METHOD
+    @objc public static func layerExists(in mapView: MapView, layerId: String) -> Bool {
+        do {
+            _ = try mapView.mapboxMap.layer(withId: layerId)
+            return true
+        } catch {
+            return false
+        }
+    }
 }

package/lib/module/ios/GridRenderLayerManager.mm

@@ -1,158 +1,158 @@
-#import <React/RCTViewManager.h>
-#import <React/RCTUIManager.h>
-#import <React/RCTLog.h>
-#import "GridRenderLayerView.h"
-
-// Import Swift bridging header here
-#if __has_include("aguacerowx_react_native-Swift.h")
-    #import "aguacerowx_react_native-Swift.h"
-#else
-    #import <aguacerowx_react_native/aguacerowx_react_native-Swift.h>
-#endif
-
-@interface GridRenderLayerManager : RCTViewManager
-@end
-
-@implementation GridRenderLayerManager
-
-RCT_EXPORT_MODULE(GridRenderLayer)
-
-+ (BOOL)requiresMainQueueSetup {
-    return YES;
-}
-
-- (UIView *)view {
-    return [[GridRenderLayerView alloc] init];
-}
-
-// --- Props ---
-RCT_EXPORT_VIEW_PROPERTY(opacity, float)
-RCT_EXPORT_VIEW_PROPERTY(dataRange, NSArray)
-RCT_EXPORT_VIEW_PROPERTY(smoothing, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(belowID, NSString)
-
-// --- Commands ---
-RCT_EXPORT_METHOD(updateGeometry:(nonnull NSNumber *)reactTag
-                  corners:(NSDictionary *)corners
-                  gridDef:(NSDictionary *)gridDef)
-{
-    // OPTIMIZATION: Dispatch heavy geometry calculations to a high-priority background queue.
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-            if ([view isKindOfClass:[GridRenderLayerView class]]) {
-                [view.layerInstance updateGeometryWithCorners:corners gridDef:gridDef];
-            }
-        }];
-    });
-}
-
-
-RCT_EXPORT_METHOD(updateDataTexture:(nonnull NSNumber *)reactTag
-                  data:(NSString *)data
-                  nx:(nonnull NSNumber *)nx
-                  ny:(nonnull NSNumber *)ny
-                  scale:(nonnull NSNumber *)scale
-                  offset:(nonnull NSNumber *)offset
-                  missing:(nonnull NSNumber *)missing
-                  scaleType:(NSString *)scaleType)
-{
-    // OPTIMIZATION: Dispatch to a high-priority background queue immediately.
-    // This unblocks the main thread and starts the heaviest work (data processing) sooner.
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-            if ([view isKindOfClass:[GridRenderLayerView class]]) {
-                [view.layerInstance updateDataTextureWithData:data nx:nx ny:ny scale:scale offset:offset missing:missing scaleType:scaleType];
-            }
-        }];
-    });
-}
-
-RCT_EXPORT_METHOD(updateColormapTexture:(nonnull NSNumber *)reactTag
-                  colormapAsBase64:(NSString *)colormapAsBase64)
-{
-    // Don't block the main thread - dispatch to background first
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-            if ([view isKindOfClass:[GridRenderLayerView class]]) {
-                [view.layerInstance updateColormapTextureWithColormapAsBase64:colormapAsBase64];
-            }
-        }];
-    });
-}
-
-RCT_EXPORT_METHOD(updateDataParameters:(nonnull NSNumber *)reactTag
-                  scale:(nonnull NSNumber *)scale
-                  offset:(nonnull NSNumber *)offset
-                  missing:(nonnull NSNumber *)missing
-                  scaleType:(nonnull NSNumber *)scaleType)  // ADD THIS
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-        if ([view isKindOfClass:[GridRenderLayerView class]]) {
-            [view.layerInstance updateDataParametersWithScale:scale offset:offset missing:missing scaleType:scaleType];  // ADD scaleType here
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(clear:(nonnull NSNumber *)reactTag)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-        if ([view isKindOfClass:[GridRenderLayerView class]]) {
-            [view.layerInstance clear];
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(primeGpuCache:(nonnull NSNumber *)reactTag
-                  frameInfo:(NSDictionary *)frameInfo)
-{
-    // OPTIMIZATION: Dispatch this immediately to a background thread to unblock JS.
-    // The Swift implementation will then handle its own concurrency.
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-            if ([view isKindOfClass:[GridRenderLayerView class]]) {
-                [view.layerInstance primeGpuCacheWithFrameInfo:frameInfo];
-            }
-        }];
-    });
-}
-
-RCT_EXPORT_METHOD(setActiveFrame:(nonnull NSNumber *)reactTag
-                  cacheKey:(NSString *)cacheKey)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-        if ([view isKindOfClass:[GridRenderLayerView class]]) {
-            [view.layerInstance setActiveFrameWithCacheKey:cacheKey];
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(clearGpuCache:(nonnull NSNumber *)reactTag)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-        if ([view isKindOfClass:[GridRenderLayerView class]]) {
-            [view.layerInstance clearGpuCache];
-        }
-    }];
-}
-
-// ADD THIS METHOD
-RCT_EXPORT_METHOD(setVariable:(nonnull NSNumber *)reactTag
-                  variable:(NSString *)variable)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
-        if ([view isKindOfClass:[GridRenderLayerView class]]) {
-            [view setVariable:variable];
-        }
-    }];
-}
-
+#import <React/RCTViewManager.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTLog.h>
+#import "GridRenderLayerView.h"
+
+// Import Swift bridging header here
+#if __has_include("aguacerowx_react_native-Swift.h")
+    #import "aguacerowx_react_native-Swift.h"
+#else
+    #import <aguacerowx_react_native/aguacerowx_react_native-Swift.h>
+#endif
+
+@interface GridRenderLayerManager : RCTViewManager
+@end
+
+@implementation GridRenderLayerManager
+
+RCT_EXPORT_MODULE(GridRenderLayer)
+
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
+- (UIView *)view {
+    return [[GridRenderLayerView alloc] init];
+}
+
+// --- Props ---
+RCT_EXPORT_VIEW_PROPERTY(opacity, float)
+RCT_EXPORT_VIEW_PROPERTY(dataRange, NSArray)
+RCT_EXPORT_VIEW_PROPERTY(smoothing, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(belowID, NSString)
+
+// --- Commands ---
+RCT_EXPORT_METHOD(updateGeometry:(nonnull NSNumber *)reactTag
+                  corners:(NSDictionary *)corners
+                  gridDef:(NSDictionary *)gridDef)
+{
+    // OPTIMIZATION: Dispatch heavy geometry calculations to a high-priority background queue.
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+            if ([view isKindOfClass:[GridRenderLayerView class]]) {
+                [view.layerInstance updateGeometryWithCorners:corners gridDef:gridDef];
+            }
+        }];
+    });
+}
+
+
+RCT_EXPORT_METHOD(updateDataTexture:(nonnull NSNumber *)reactTag
+                  data:(NSString *)data
+                  nx:(nonnull NSNumber *)nx
+                  ny:(nonnull NSNumber *)ny
+                  scale:(nonnull NSNumber *)scale
+                  offset:(nonnull NSNumber *)offset
+                  missing:(nonnull NSNumber *)missing
+                  scaleType:(NSString *)scaleType)
+{
+    // OPTIMIZATION: Dispatch to a high-priority background queue immediately.
+    // This unblocks the main thread and starts the heaviest work (data processing) sooner.
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+            if ([view isKindOfClass:[GridRenderLayerView class]]) {
+                [view.layerInstance updateDataTextureWithData:data nx:nx ny:ny scale:scale offset:offset missing:missing scaleType:scaleType];
+            }
+        }];
+    });
+}
+
+RCT_EXPORT_METHOD(updateColormapTexture:(nonnull NSNumber *)reactTag
+                  colormapAsBase64:(NSString *)colormapAsBase64)
+{
+    // Don't block the main thread - dispatch to background first
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+            if ([view isKindOfClass:[GridRenderLayerView class]]) {
+                [view.layerInstance updateColormapTextureWithColormapAsBase64:colormapAsBase64];
+            }
+        }];
+    });
+}
+
+RCT_EXPORT_METHOD(updateDataParameters:(nonnull NSNumber *)reactTag
+                  scale:(nonnull NSNumber *)scale
+                  offset:(nonnull NSNumber *)offset
+                  missing:(nonnull NSNumber *)missing
+                  scaleType:(nonnull NSNumber *)scaleType)  // ADD THIS
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[GridRenderLayerView class]]) {
+            [view.layerInstance updateDataParametersWithScale:scale offset:offset missing:missing scaleType:scaleType];  // ADD scaleType here
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(clear:(nonnull NSNumber *)reactTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[GridRenderLayerView class]]) {
+            [view.layerInstance clear];
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(primeGpuCache:(nonnull NSNumber *)reactTag
+                  frameInfo:(NSDictionary *)frameInfo)
+{
+    // OPTIMIZATION: Dispatch this immediately to a background thread to unblock JS.
+    // The Swift implementation will then handle its own concurrency.
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+            GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+            if ([view isKindOfClass:[GridRenderLayerView class]]) {
+                [view.layerInstance primeGpuCacheWithFrameInfo:frameInfo];
+            }
+        }];
+    });
+}
+
+RCT_EXPORT_METHOD(setActiveFrame:(nonnull NSNumber *)reactTag
+                  cacheKey:(NSString *)cacheKey)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[GridRenderLayerView class]]) {
+            [view.layerInstance setActiveFrameWithCacheKey:cacheKey];
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(clearGpuCache:(nonnull NSNumber *)reactTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[GridRenderLayerView class]]) {
+            [view.layerInstance clearGpuCache];
+        }
+    }];
+}
+
+// ADD THIS METHOD
+RCT_EXPORT_METHOD(setVariable:(nonnull NSNumber *)reactTag
+                  variable:(NSString *)variable)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        GridRenderLayerView *view = (GridRenderLayerView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[GridRenderLayerView class]]) {
+            [view setVariable:variable];
+        }
+    }];
+}
+
 @end

package/lib/module/ios/GridRenderLayerView.h

@@ -1,31 +1,31 @@
-#import <UIKit/UIKit.h>
-#import <React/RCTComponent.h>
-
-@class GridRenderLayer;
-@class MapView;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface GridRenderLayerView : UIView
-
-@property (nonatomic, strong) GridRenderLayer *layerInstance;
-@property (nonatomic, weak) MapView *mapView;
-@property (nonatomic, strong) NSString *layerId;
-@property (nonatomic, strong, nullable) NSString *belowID;
-
-// Property setters for React Native
-- (void)setOpacity:(float)opacity;
-- (void)setDataRange:(NSArray *)dataRange;
-- (void)setSmoothing:(BOOL)smoothing;
-- (void)setBelowID:(NSString *)belowID;
-- (void)setVariable:(NSString *)variable;
-
-// ADD THESE METHOD DECLARATIONS
-- (void)waitForStyleLoadAndAddLayer;
-- (void)pollForLayerExistence;
-- (void)findMapViewAndAddLayerInView:(UIView *)view;
-- (void)addLayerToMap;
-
-@end
-
+#import <UIKit/UIKit.h>
+#import <React/RCTComponent.h>
+
+@class GridRenderLayer;
+@class MapView;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GridRenderLayerView : UIView
+
+@property (nonatomic, strong) GridRenderLayer *layerInstance;
+@property (nonatomic, weak) MapView *mapView;
+@property (nonatomic, strong) NSString *layerId;
+@property (nonatomic, strong, nullable) NSString *belowID;
+
+// Property setters for React Native
+- (void)setOpacity:(float)opacity;
+- (void)setDataRange:(NSArray *)dataRange;
+- (void)setSmoothing:(BOOL)smoothing;
+- (void)setBelowID:(NSString *)belowID;
+- (void)setVariable:(NSString *)variable;
+
+// ADD THESE METHOD DECLARATIONS
+- (void)waitForStyleLoadAndAddLayer;
+- (void)pollForLayerExistence;
+- (void)findMapViewAndAddLayerInView:(UIView *)view;
+- (void)addLayerToMap;
+
+@end
+
 NS_ASSUME_NONNULL_END