@aguacerowx/react-native 0.0.22 → 0.0.24

package/ios/GridRenderLayerView.m

@@ -1,205 +1,242 @@
-#import "GridRenderLayerView.h"
-#import <React/RCTLog.h>
-#import <objc/runtime.h> 
-
-// Import Swift bridging header
-#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
-
-// Import MapboxMaps to get MapView definition
-@import MapboxMaps;
-
-@interface GridRenderLayerView ()
-@property (nonatomic, assign) BOOL isLayerAdded;
-@end
-
-@implementation GridRenderLayerView
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        _layerId = [NSString stringWithFormat:@"weather-layer-%@", [[NSUUID UUID] UUIDString]];
-        _layerInstance = [[GridRenderLayer alloc] initWithId:_layerId];
-        _isLayerAdded = NO;
-        RCTLogInfo(@"🟢 [GridRenderLayerView] Initialized with layer ID: %@", _layerId);
-    }
-    return self;
-}
-
-+ (void)load {
-    RCTLogInfo(@"🔵 GridRenderLayerView IS LOADED INTO RUNTIME 🔵");
-    NSLog(@"🔵 GridRenderLayerView IS LOADED INTO RUNTIME 🔵");
-}
-
-#pragma mark - Property Setters
-
-- (void)setOpacity:(float)opacity {
-    [self.layerInstance setOpacityWithValue:opacity];
-    RCTLogInfo(@"🟢 [GridRenderLayerView] Set opacity: %f", opacity);
-}
-
-- (void)setDataRange:(NSArray *)dataRange {
-    if (dataRange && dataRange.count == 2) {
-        [self.layerInstance setDataRangeWithValue:dataRange];
-        RCTLogInfo(@"🟢 [GridRenderLayerView] Set data range: %@", dataRange);
-    } else {
-        RCTLogError(@"❌ [GridRenderLayerView] Invalid dataRange: %@", dataRange);
-    }
-}
-
-- (void)setSmoothing:(BOOL)smoothing {
-    [self.layerInstance setSmoothingWithValue:smoothing];
-    RCTLogInfo(@"🟢 [GridRenderLayerView] Set smoothing: %d", smoothing);
-}
-
-- (void)setBelowID:(NSString *)belowID {
-    _belowID = belowID;
-    RCTLogInfo(@"🟢 [GridRenderLayerView] Set belowID: %@", belowID);
-}
-
-// ADD THIS METHOD
-- (void)setVariable:(NSString *)variable {
-    [self.layerInstance setVariableWithVariable:variable];
-    RCTLogInfo(@"🟢 [GridRenderLayerView] Set variable: %@", variable);
-}
-
-#pragma mark - View Lifecycle
-
-- (void)didMoveToWindow {
-    [super didMoveToWindow];
-    if (self.window && !self.isLayerAdded) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self findMapViewAndAddLayerInView:self.window]; // Start from window, not superview
-        });
-    }
-}
-
-- (void)findMapViewAndAddLayerInView:(UIView *)view {
-    if (!view || self.isLayerAdded) {
-        return;
-    }
-    
-    NSString *className = NSStringFromClass([view class]);
-    
-    // Check if this is RNMBXMapView - the wrapper
-    if ([className isEqualToString:@"RNMBXMapView"]) {
-        RCTLogInfo(@"✅ [GridRenderLayerView] Found RNMBXMapView!");
-        
-        // The first subview should be MapboxMaps.MapView
-        if (view.subviews.count > 0) {
-            UIView *firstSubview = view.subviews[0];
-            NSString *subviewClass = NSStringFromClass([firstSubview class]);
-            RCTLogInfo(@"   🔎 First subview is: %@", subviewClass);
-            
-            if ([subviewClass containsString:@"MapboxMaps.MapView"] || [subviewClass isEqualToString:@"MapView"]) {
-                RCTLogInfo(@"✅ [GridRenderLayerView] Found actual MapboxMaps.MapView!");
-                self.mapView = (MapView *)firstSubview;
-                [self addLayerToMap];
-                return;
-            }
-        }
-        
-        RCTLogError(@"❌ [GridRenderLayerView] RNMBXMapView found but MapboxMaps.MapView not in expected location");
-        return;
-    }
-    
-    // Recursively search all subviews
-    for (UIView *subview in view.subviews) {
-        [self findMapViewAndAddLayerInView:subview];
-        if (self.isLayerAdded) {
-            return;
-        }
-    }
-}
-
-- (void)logViewHierarchy:(UIView *)view depth:(int)depth {
-    NSString *indent = [@"" stringByPaddingToLength:depth * 2 withString:@" " startingAtIndex:0];
-    NSString *className = NSStringFromClass([view class]);
-    RCTLogInfo(@"%@└─ %@", indent, className);
-    
-    for (UIView *subview in view.subviews) {
-        [self logViewHierarchy:subview depth:depth + 1];
-    }
-}
-
-- (void)addLayerToMap {
-    if (!self.mapView || self.isLayerAdded) {
-        return;
-    }
-    
-    RCTLogInfo(@"🟡 [GridRenderLayerView] Attempting to add layer via Swift bridge");
-    
-    id customLayer = [self.layerInstance getHostWrapper];
-    
-    if (!customLayer) {
-        RCTLogError(@"❌ [GridRenderLayerView] Failed to get hostWrapper");
-        return;
-    }
-    
-    // Get the mapboxMap property using runtime
-    Ivar mapboxMapIvar = class_getInstanceVariable([self.mapView class], "mapboxMap");
-    if (!mapboxMapIvar) {
-        RCTLogError(@"❌ [GridRenderLayerView] Could not find mapboxMap ivar");
-        return;
-    }
-    
-    id mapboxMap = object_getIvar(self.mapView, mapboxMapIvar);
-    if (!mapboxMap) {
-        RCTLogError(@"❌ [GridRenderLayerView] mapboxMap is nil");
-        return;
-    }
-    
-    // Use the Swift bridge to add the layer
-    BOOL success = [GridRenderLayerBridge addCustomLayerTo:self.mapView
-                                                 layerHost:customLayer
-                                                   layerId:self.layerId
-                                              belowLayerId:self.belowID];
-    
-    if (success) {
-        self.isLayerAdded = YES;
-        RCTLogInfo(@"🎉 [GridRenderLayerView] Successfully added layer via Swift bridge!");
-
-        [[NSNotificationCenter defaultCenter] addObserverForName:@"TriggerMapRepaint"
-                                                        object:nil
-                                                            queue:[NSOperationQueue mainQueue]
-                                                    usingBlock:^(NSNotification *note) {
-            RCTLogInfo(@"🔄 [GridRenderLayerView] Received repaint notification");
-            if (self.mapView) {
-                RCTLogInfo(@"   ✅ Calling Swift bridge triggerRepaint");
-                [GridRenderLayerBridge triggerRepaintOn:self.mapView];
-                RCTLogInfo(@"   ✅ Called triggerRepaint via Swift bridge");
-            }
-        }];
-    } else {
-        RCTLogError(@"❌ [GridRenderLayerView] Failed to add layer via Swift bridge");
-    }
-}
-
-- (void)removeFromSuperview {
-    if (self.mapView && self.isLayerAdded) {
-        id mapboxMap = [self.mapView valueForKey:@"mapboxMap"];
-        id style = [mapboxMap valueForKey:@"style"];
-        
-        SEL removeLayerSelector = NSSelectorFromString(@"removeStyleLayerWithIdentifier:completion:");
-        if ([style respondsToSelector:removeLayerSelector]) {
-            NSMethodSignature *signature = [style methodSignatureForSelector:removeLayerSelector];
-            NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-            [invocation setTarget:style];
-            [invocation setSelector:removeLayerSelector];
-            
-            NSString *layerId = self.layerId;
-            [invocation setArgument:&layerId atIndex:2];
-            
-            id nilCompletion = nil;
-            [invocation setArgument:&nilCompletion atIndex:3];
-            [invocation invoke];
-            
-            RCTLogInfo(@"🟢 [GridRenderLayerView] Removed custom layer: %@", self.layerId);
-        }
-    }
-    [super removeFromSuperview];
-}
-
+#import "GridRenderLayerView.h"
+#import <React/RCTLog.h>
+#import <objc/runtime.h> 
+
+// Import Swift bridging header
+#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
+
+// Import MapboxMaps to get MapView definition
+@import MapboxMaps;
+
+@interface GridRenderLayerView ()
+@property (nonatomic, assign) BOOL isLayerAdded;
+@end
+
+@implementation GridRenderLayerView
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        _layerId = [NSString stringWithFormat:@"weather-layer-%@", [[NSUUID UUID] UUIDString]];
+        _layerInstance = [[GridRenderLayer alloc] initWithId:_layerId];
+        _isLayerAdded = NO;
+        RCTLogInfo(@"🟢 [GridRenderLayerView] Initialized with layer ID: %@", _layerId);
+    }
+    return self;
+}
+
++ (void)load {
+    RCTLogInfo(@"🔵 GridRenderLayerView IS LOADED INTO RUNTIME 🔵");
+    NSLog(@"🔵 GridRenderLayerView IS LOADED INTO RUNTIME 🔵");
+}
+
+#pragma mark - Property Setters
+
+- (void)setOpacity:(float)opacity {
+    [self.layerInstance setOpacityWithValue:opacity];
+    RCTLogInfo(@"🟢 [GridRenderLayerView] Set opacity: %f", opacity);
+}
+
+- (void)setDataRange:(NSArray *)dataRange {
+    if (dataRange && dataRange.count == 2) {
+        [self.layerInstance setDataRangeWithValue:dataRange];
+        RCTLogInfo(@"🟢 [GridRenderLayerView] Set data range: %@", dataRange);
+    } else {
+        RCTLogError(@"❌ [GridRenderLayerView] Invalid dataRange: %@", dataRange);
+    }
+}
+
+- (void)setSmoothing:(BOOL)smoothing {
+    [self.layerInstance setSmoothingWithValue:smoothing];
+    RCTLogInfo(@"🟢 [GridRenderLayerView] Set smoothing: %d", smoothing);
+}
+
+- (void)setBelowID:(NSString *)belowID {
+    _belowID = belowID;
+    RCTLogInfo(@"🟢 [GridRenderLayerView] Set belowID: %@", belowID);
+}
+
+// ADD THIS METHOD
+- (void)setVariable:(NSString *)variable {
+    [self.layerInstance setVariableWithVariable:variable];
+    RCTLogInfo(@"🟢 [GridRenderLayerView] Set variable: %@", variable);
+}
+
+#pragma mark - View Lifecycle
+
+- (void)didMoveToWindow {
+    [super didMoveToWindow];
+    RCTLogInfo(@"🔵 [GridRenderLayerView] didMoveToWindow called, window=%@, isLayerAdded=%d", self.window ? @"YES" : @"NO", self.isLayerAdded);
+    if (self.window && !self.isLayerAdded) {
+        [self findMapViewAndAddLayerInView:self.window];
+    }
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        RCTLogInfo(@"🔵 [GridRenderLayerView] layoutSubviews called (first time)");
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            if (!self.isLayerAdded) {
+                RCTLogInfo(@"🔍 [GridRenderLayerView] Attempting to find map from layoutSubviews");
+                UIView *searchRoot = self.window ? self.window : self.superview;
+                if (searchRoot) {
+                    [self findMapViewAndAddLayerInView:searchRoot];
+                }
+            }
+        });
+    });
+}
+
+- (void)findMapViewAndAddLayerInView:(UIView *)view {
+    if (!view || self.isLayerAdded) {
+        return;
+    }
+    
+    RCTLogInfo(@"🔍 [GridRenderLayerView] Searching for MapView from: %@", NSStringFromClass([view class]));
+    
+    NSString *className = NSStringFromClass([view class]);
+    
+    if ([className isEqualToString:@"RNMBXMapView"]) {
+        RCTLogInfo(@"✅ [GridRenderLayerView] Found RNMBXMapView!");
+        
+        if (view.subviews.count > 0) {
+            UIView *firstSubview = view.subviews[0];
+            NSString *subviewClass = NSStringFromClass([firstSubview class]);
+            RCTLogInfo(@"   🔎 First subview is: %@", subviewClass);
+            
+            if ([subviewClass containsString:@"MapboxMaps.MapView"] || [subviewClass isEqualToString:@"MapView"]) {
+                RCTLogInfo(@"✅ [GridRenderLayerView] Found actual MapboxMaps.MapView!");
+                self.mapView = (MapView *)firstSubview;
+                [self waitForStyleLoadAndAddLayer];
+                return;
+            }
+        }
+        
+        RCTLogError(@"❌ [GridRenderLayerView] RNMBXMapView found but MapboxMaps.MapView not in expected location");
+        return;
+    }
+    
+    for (UIView *subview in view.subviews) {
+        [self findMapViewAndAddLayerInView:subview];
+        if (self.isLayerAdded) {
+            return;
+        }
+    }
+}
+
+- (void)waitForStyleLoadAndAddLayer {
+    if (!self.mapView) {
+        return;
+    }
+    
+    NSString *targetLayer = self.belowID ?: @"AML_-_terrain";
+    
+    // Check if the target layer already exists
+    if ([GridRenderLayerBridge layerExistsIn:self.mapView layerId:targetLayer]) {
+        RCTLogInfo(@"✅ [GridRenderLayerView] Target layer '%@' already exists, adding immediately", targetLayer);
+        [self addLayerToMap];
+        return;
+    }
+    
+    // If not, start polling
+    RCTLogInfo(@"⏳ [GridRenderLayerView] Waiting for layer '%@' to exist...", targetLayer);
+    [self pollForLayerExistence];
+}
+
+- (void)pollForLayerExistence {
+    if (self.isLayerAdded || !self.mapView) {
+        return;
+    }
+    
+    NSString *targetLayer = self.belowID ?: @"AML_-_terrain";
+    
+    if ([GridRenderLayerBridge layerExistsIn:self.mapView layerId:targetLayer]) {
+        RCTLogInfo(@"✅ [GridRenderLayerView] Target layer '%@' now exists!", targetLayer);
+        [self addLayerToMap];
+        return;
+    }
+    
+    // Try again in 100ms
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self pollForLayerExistence];
+    });
+}
+
+- (void)addLayerToMap {
+    if (!self.mapView || self.isLayerAdded) {
+        return;
+    }
+    
+    RCTLogInfo(@"🟡 [GridRenderLayerView] Attempting to add layer via Swift bridge");
+    
+    id customLayer = [self.layerInstance getHostWrapper];
+    
+    if (!customLayer) {
+        RCTLogError(@"❌ [GridRenderLayerView] Failed to get hostWrapper");
+        return;
+    }
+    
+    BOOL success = [GridRenderLayerBridge addCustomLayerTo:self.mapView
+                                                 layerHost:customLayer
+                                                   layerId:self.layerId
+                                              belowLayerId:self.belowID];
+    
+    if (success) {
+        self.isLayerAdded = YES;
+        RCTLogInfo(@"🎉 [GridRenderLayerView] Successfully added layer via Swift bridge!");
+
+        [[NSNotificationCenter defaultCenter] addObserverForName:@"TriggerMapRepaint"
+                                                        object:nil
+                                                            queue:[NSOperationQueue mainQueue]
+                                                    usingBlock:^(NSNotification *note) {
+            RCTLogInfo(@"🔄 [GridRenderLayerView] Received repaint notification");
+            if (self.mapView) {
+                [GridRenderLayerBridge triggerRepaintOn:self.mapView];
+            }
+        }];
+    } else {
+        RCTLogError(@"❌ [GridRenderLayerView] Failed to add layer via Swift bridge");
+    }
+}
+
+- (void)logViewHierarchy:(UIView *)view depth:(int)depth {
+    NSString *indent = [@"" stringByPaddingToLength:depth * 2 withString:@" " startingAtIndex:0];
+    NSString *className = NSStringFromClass([view class]);
+    RCTLogInfo(@"%@└─ %@", indent, className);
+    
+    for (UIView *subview in view.subviews) {
+        [self logViewHierarchy:subview depth:depth + 1];
+    }
+}
+- (void)removeFromSuperview {
+    if (self.mapView && self.isLayerAdded) {
+        id mapboxMap = [self.mapView valueForKey:@"mapboxMap"];
+        id style = [mapboxMap valueForKey:@"style"];
+        
+        SEL removeLayerSelector = NSSelectorFromString(@"removeStyleLayerWithIdentifier:completion:");
+        if ([style respondsToSelector:removeLayerSelector]) {
+            NSMethodSignature *signature = [style methodSignatureForSelector:removeLayerSelector];
+            NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+            [invocation setTarget:style];
+            [invocation setSelector:removeLayerSelector];
+            
+            NSString *layerId = self.layerId;
+            [invocation setArgument:&layerId atIndex:2];
+            
+            id nilCompletion = nil;
+            [invocation setArgument:&nilCompletion atIndex:3];
+            [invocation invoke];
+            
+            RCTLogInfo(@"🟢 [GridRenderLayerView] Removed custom layer: %@", self.layerId);
+        }
+    }
+    [super removeFromSuperview];
+}
+
 @end

package/ios/InspectorDataCache.swift

@@ -1,66 +1,66 @@
-import Foundation
-
-final class InspectorDataCache {
-    static let shared = InspectorDataCache()
-    
-    private let queue = DispatchQueue(label: "com.aguacerowx.InspectorDataCacheQueue", attributes: .concurrent)
-    
-    private var _lastDecompressedData: Data?
-    private var _nx: Int = 0
-    private var _ny: Int = 0
-    private var _scale: Float = 1.0
-    private var _offset: Float = 0.0
-    private var _missing: Float = 127.0
-    private var _scaleType: Int = 0  // ADD THIS
-    
-    private init() {}
-    
-    var lastDecompressedData: Data? {
-        get { queue.sync { _lastDecompressedData } }
-    }
-    
-    var nx: Int {
-        get { queue.sync { _nx } }
-    }
-    
-    var ny: Int {
-        get { queue.sync { _ny } }
-    }
-    
-    var scale: Float {
-        get { queue.sync { _scale } }
-    }
-    
-    var offset: Float {
-        get { queue.sync { _offset } }
-    }
-    
-    var missing: Float {
-        get { queue.sync { _missing } }
-    }
-    
-    var scaleType: Int {  // ADD THIS
-        get { queue.sync { _scaleType } }
-    }
-    
-    func update(data: Data?, nx: Int, ny: Int, scale: Float, offset: Float, missing: Float, scaleType: Int = 0) {  // ADD scaleType parameter
-        queue.async(flags: .barrier) {
-            self._lastDecompressedData = data
-            self._nx = nx
-            self._ny = ny
-            self._scale = scale
-            self._offset = offset
-            self._missing = missing
-            self._scaleType = scaleType  // ADD THIS
-        }
-    }
-    
-    func clear() {
-        queue.async(flags: .barrier) {
-            self._lastDecompressedData = nil
-            self._nx = 0
-            self._ny = 0
-            self._scaleType = 0  // ADD THIS
-        }
-    }
+import Foundation
+
+final class InspectorDataCache {
+    static let shared = InspectorDataCache()
+    
+    private let queue = DispatchQueue(label: "com.aguacerowx.InspectorDataCacheQueue", attributes: .concurrent)
+    
+    private var _lastDecompressedData: Data?
+    private var _nx: Int = 0
+    private var _ny: Int = 0
+    private var _scale: Float = 1.0
+    private var _offset: Float = 0.0
+    private var _missing: Float = 127.0
+    private var _scaleType: Int = 0  // ADD THIS
+    
+    private init() {}
+    
+    var lastDecompressedData: Data? {
+        get { queue.sync { _lastDecompressedData } }
+    }
+    
+    var nx: Int {
+        get { queue.sync { _nx } }
+    }
+    
+    var ny: Int {
+        get { queue.sync { _ny } }
+    }
+    
+    var scale: Float {
+        get { queue.sync { _scale } }
+    }
+    
+    var offset: Float {
+        get { queue.sync { _offset } }
+    }
+    
+    var missing: Float {
+        get { queue.sync { _missing } }
+    }
+    
+    var scaleType: Int {  // ADD THIS
+        get { queue.sync { _scaleType } }
+    }
+    
+    func update(data: Data?, nx: Int, ny: Int, scale: Float, offset: Float, missing: Float, scaleType: Int = 0) {  // ADD scaleType parameter
+        queue.async(flags: .barrier) {
+            self._lastDecompressedData = data
+            self._nx = nx
+            self._ny = ny
+            self._scale = scale
+            self._offset = offset
+            self._missing = missing
+            self._scaleType = scaleType  // ADD THIS
+        }
+    }
+    
+    func clear() {
+        queue.async(flags: .barrier) {
+            self._lastDecompressedData = nil
+            self._nx = 0
+            self._ny = 0
+            self._scaleType = 0  // ADD THIS
+        }
+    }
 }

package/ios/InspectorModule.m

@@ -1,10 +1,10 @@
-#import <React/RCTBridgeModule.h>
-
-@interface RCT_EXTERN_MODULE(InspectorModule, NSObject)
-
-RCT_EXTERN_METHOD(getValueAtGridIndex:(nonnull NSNumber *)i
-                  j:(nonnull NSNumber *)j
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(InspectorModule, NSObject)
+
+RCT_EXTERN_METHOD(getValueAtGridIndex:(nonnull NSNumber *)i
+                  j:(nonnull NSNumber *)j
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
 @end