@aguacerowx/react-native 0.0.21 → 0.0.23

package/ios/GridRenderLayerBridge.swift

@@ -10,8 +10,6 @@ import Foundation
         belowLayerId: String?
     ) -> Bool {
         let position: LayerPosition? = belowLayerId.map { .below($0) }
-        
-        // Create a CustomLayer object
         var customLayer = CustomLayer(id: layerId, renderer: layerHost)
         
         do {
@@ -23,8 +21,18 @@ import Foundation
             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/ios/GridRenderLayerView.h

@@ -1,17 +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 THIS LINE
+- (void)setVariable:(NSString *)variable;
+
+// ADD THESE METHOD DECLARATIONS
+- (void)waitForStyleLoadAndAddLayer;
+- (void)pollForLayerExistence;
+- (void)findMapViewAndAddLayerInView:(UIView *)view;
+- (void)addLayerToMap;
+
 @end
+
 NS_ASSUME_NONNULL_END

package/ios/GridRenderLayerView.m

@@ -69,11 +69,28 @@
 
 - (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(), ^{
-            [self findMapViewAndAddLayerInView:self.window]; // Start from window, not superview
+            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 {
@@ -81,13 +98,13 @@
         return;
     }
     
+    RCTLogInfo(@"🔍 [GridRenderLayerView] Searching for MapView from: %@", NSStringFromClass([view class]));
+    
     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]);
@@ -96,7 +113,7 @@
             if ([subviewClass containsString:@"MapboxMaps.MapView"] || [subviewClass isEqualToString:@"MapView"]) {
                 RCTLogInfo(@"✅ [GridRenderLayerView] Found actual MapboxMaps.MapView!");
                 self.mapView = (MapView *)firstSubview;
-                [self addLayerToMap];
+                [self waitForStyleLoadAndAddLayer];
                 return;
             }
         }
@@ -105,7 +122,6 @@
         return;
     }
     
-    // Recursively search all subviews
     for (UIView *subview in view.subviews) {
         [self findMapViewAndAddLayerInView:subview];
         if (self.isLayerAdded) {
@@ -114,14 +130,42 @@
     }
 }
 
-- (void)logViewHierarchy:(UIView *)view depth:(int)depth {
-    NSString *indent = [@"" stringByPaddingToLength:depth * 2 withString:@" " startingAtIndex:0];
-    NSString *className = NSStringFromClass([view class]);
-    RCTLogInfo(@"%@└─ %@", indent, className);
+- (void)waitForStyleLoadAndAddLayer {
+    if (!self.mapView) {
+        return;
+    }
     
-    for (UIView *subview in view.subviews) {
-        [self logViewHierarchy:subview depth:depth + 1];
+    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 {
@@ -138,20 +182,6 @@
         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
@@ -167,9 +197,7 @@
                                                     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 {
@@ -177,6 +205,15 @@
     }
 }
 
+- (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"];

package/ios/Shaders.metal

@@ -22,8 +22,9 @@ struct FragmentUniforms {
     float missingQuantized;
     float2 textureSize;
     int smoothing;
-    int scaleType; // 0 for linear, 1 for sqrt
-    int isPtype;   // ADD THIS
+    int scaleType;
+    int isPtype;
+    int isMRMS;
 };
 
 // --- Vertex Shader (Unchanged) ---
@@ -64,15 +65,26 @@ float get_value(texture2d<float, access::sample> dataTexture, sampler dataSample
 }
 
 // Maps a physical value to a precipitation type category
-float get_ptype_from_physical(float val) {
-    if (val < 0.0) return -1.0;   // Missing/Invalid
-    if (val < 100.0) return 0.0; // Rain
-    if (val < 200.0) return 1.0; // Mix
-    if (val < 300.0) return 2.0; // Snow
-    return 3.0;                  // Pellets
+// Maps a physical value to a precipitation type category
+float get_ptype_from_physical(float val, constant FragmentUniforms &uniforms) {  // ADD uniforms parameter
+    if (val < 0.0) return -1.0;
+    
+    if (uniforms.isMRMS == 1) {  // ADD THIS BRANCH
+        // MRMS: 0-100 rain, 100-200 snow, 200-300 freezing rain
+        if (val < 100.0) return 0.0;
+        if (val < 200.0) return 1.0;
+        if (val < 300.0) return 2.0;
+        return -1.0;
+    } else {
+        // Models: 0-100 rain, 100-200 snow, 200-300 freezing rain, 300-400 ice pellets
+        if (val < 100.0) return 0.0;
+        if (val < 200.0) return 1.0;
+        if (val < 300.0) return 2.0;
+        if (val < 400.0) return 3.0;
+        return -1.0;
+    }
 }
 
-
 // --- Main Fragment Shader ---
 fragment float4 fragment_main(RasterizerData in [[stage_in]],
                                 constant FragmentUniforms &uniforms [[buffer(0)]],
@@ -110,10 +122,10 @@ fragment float4 fragment_main(RasterizerData in [[stage_in]],
             float v01 = dequantize_val(get_value(dataTexture, dataSampler, v01_coord, uniforms), uniforms);
             float v11 = dequantize_val(get_value(dataTexture, dataSampler, v11_coord, uniforms), uniforms);
 
-            float p00 = get_ptype_from_physical(v00);
-            float p10 = get_ptype_from_physical(v10);
-            float p01 = get_ptype_from_physical(v01);
-            float p11 = get_ptype_from_physical(v11);
+            float p00 = get_ptype_from_physical(v00, uniforms);
+            float p10 = get_ptype_from_physical(v10, uniforms);
+            float p01 = get_ptype_from_physical(v01, uniforms);
+            float p11 = get_ptype_from_physical(v11, uniforms);
 
             // Determine the dominant precipitation type for this pixel
             float dominant_ptype = -1.0;

package/lib/commonjs/aguacerowx-react-native.podspec

@@ -24,26 +24,11 @@ Pod::Spec.new do |s|
     'DEFINES_MODULE' => 'YES'
   }
   
-  s.resources = ['ios/compiled-shaders/*.metallib', 'ios/*.metal']
-  
-  s.script_phases = [
-    {
-      :name => 'Copy Metal Shaders',
-      :script => 'echo "🔨 Copying Metal shaders..."
-SHADER_DIR="${PODS_TARGET_SRCROOT}/ios/compiled-shaders"
-METAL_SOURCE="${PODS_TARGET_SRCROOT}/ios/Shaders.metal"
-
-if [ -f "$SHADER_DIR/Shaders.metallib" ]; then
-  cp -v "$SHADER_DIR/Shaders.metallib" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/" || true
-  echo "✅ Pre-compiled Metal shader copied"
-elif [ -f "$METAL_SOURCE" ]; then
-  echo "⚠️ No pre-compiled shader found, will compile from source"
-  cp -v "$METAL_SOURCE" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/" || true
-else
-  echo "❌ No Metal shaders found!"
-fi',
-      :execution_position => :before_compile
-    }
+  # Include both pre-compiled shaders AND source as fallback
+  s.resources = [
+    'ios/compiled-shaders/Shaders-simulator.metallib',
+    'ios/compiled-shaders/Shaders-device.metallib',
+    'ios/Shaders.metal'
   ]
   
   s.source_files = "ios/**/*.{h,m,mm,swift}", "ios/generated/**/*.{h,m,mm,cpp}"

package/lib/commonjs/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Nov 17 23:39:32 EST 2025
+#Tue Nov 18 11:28:28 EST 2025
 com.aguacerowx.reactnative.aguacerowx-react-native-main-6\:/raw/fragment_shader.glsl=C\:\\Users\\my41m\\aguacero\\aguacero-sdks\\packages\\react-native\\android\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\fragment_shader.glsl
 com.aguacerowx.reactnative.aguacerowx-react-native-main-6\:/raw/vertex_shader.glsl=C\:\\Users\\my41m\\aguacero\\aguacero-sdks\\packages\\react-native\\android\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\vertex_shader.glsl
 com.aguacerowx.reactnative.aguacerowx-react-native-main-6\:/raw/debug_vertex_shader.glsl=C\:\\Users\\my41m\\aguacero\\aguacero-sdks\\packages\\react-native\\android\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\debug_vertex_shader.glsl

package/lib/commonjs/android/build/intermediates/packaged_res/debug/packageDebugResources/raw/fragment_shader.glsl

@@ -1,5 +1,3 @@
-// packages/react-native/android/src/main/res/raw/fragment_shader.glsl
-
 precision highp float;
 varying vec2 v_texCoord;
 
@@ -19,7 +17,8 @@ uniform vec2 u_data_range;
 // Rendering parameters
 uniform vec2 u_texture_size;
 uniform int u_smoothing;
-uniform int u_is_ptype; // ADDED: Flag for ptype variables
+uniform int u_is_ptype; // Flag for ptype variables
+uniform int u_is_mrms;  // NEW: Flag for MRMS data
 
 // --- HELPER FUNCTIONS ---
 
@@ -49,11 +48,22 @@ float get_value(vec2 coord) {
 
 // Maps a physical value to a precipitation type category
 float get_ptype_from_physical(float val) {
-    if (val < 0.0) return -1.0;   // Missing/Invalid
-    if (val < 100.0) return 0.0; // Rain
-    if (val < 200.0) return 1.0; // Mix
-    if (val < 300.0) return 2.0; // Snow
-    return 3.0;                  // Pellets
+    if (val < 0.0) return -1.0;
+    
+    if (u_is_mrms == 1) {
+        // MRMS: 0-100 rain, 100-200 snow, 200-300 freezing rain
+        if (val < 100.0) return 0.0;
+        if (val < 200.0) return 1.0;
+        if (val < 300.0) return 2.0;
+        return -1.0;
+    } else {
+        // Models: 0-100 rain, 100-200 snow, 200-300 freezing rain, 300-400 ice pellets
+        if (val < 100.0) return 0.0;
+        if (val < 200.0) return 1.0;
+        if (val < 300.0) return 2.0;
+        if (val < 400.0) return 3.0;
+        return -1.0;
+    }
 }
 
 

package/lib/commonjs/android/src/main/java/com/aguacerowx/reactnative/GridRenderLayer.java

@@ -68,7 +68,8 @@ public class GridRenderLayer implements CustomLayerHost {
     private ByteBuffer pendingColormapBuffer = null;
     private FloatBuffer pendingVertexBuffer = null;
     private ShortBuffer pendingIndexBuffer = null;
-
+    private int uIsMRMS;
+    private boolean isMRMS = false;
 
     public GridRenderLayer(Context context) {
         this.context = context;
@@ -123,6 +124,7 @@ public class GridRenderLayer implements CustomLayerHost {
         uSmoothing = GLES20.glGetUniformLocation(program, "u_smoothing"); 
         uScaleType = GLES20.glGetUniformLocation(program, "u_scale_type");
         uIsPtype = GLES20.glGetUniformLocation(program, "u_is_ptype");
+        uIsMRMS = GLES20.glGetUniformLocation(program, "u_is_mrms");
         aPosition = GLES20.glGetAttribLocation(program, "a_position");
         aTexCoord = GLES20.glGetAttribLocation(program, "a_texCoord");
     }
@@ -138,6 +140,10 @@ public class GridRenderLayer implements CustomLayerHost {
         Log.d(TAG, "setVariable called. Variable: '" + this.currentVariable + "', isPtype set to: " + this.isPtype);
     }
 
+    public void setIsMRMS(boolean isMRMS) {
+        this.isMRMS = isMRMS;
+        Log.d(TAG, "setIsMRMS called with: " + isMRMS);
+    }
 
     public void clearData() {
         this.isVisible = false;
@@ -261,6 +267,7 @@ public class GridRenderLayer implements CustomLayerHost {
         GLES20.glUniform1i(uSmoothing, smoothingEnabled ? 1 : 0); 
         GLES20.glUniform1i(uScaleType, this.scaleType);
         GLES20.glUniform1i(uIsPtype, this.isPtype ? 1 : 0); 
+        GLES20.glUniform1i(uIsMRMS, this.isMRMS ? 1 : 0);
 
         GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
         GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, dataTextureId);

package/lib/commonjs/android/src/main/res/raw/fragment_shader.glsl

@@ -1,5 +1,3 @@
-// packages/react-native/android/src/main/res/raw/fragment_shader.glsl
-
 precision highp float;
 varying vec2 v_texCoord;
 
@@ -19,7 +17,8 @@ uniform vec2 u_data_range;
 // Rendering parameters
 uniform vec2 u_texture_size;
 uniform int u_smoothing;
-uniform int u_is_ptype; // ADDED: Flag for ptype variables
+uniform int u_is_ptype; // Flag for ptype variables
+uniform int u_is_mrms;  // NEW: Flag for MRMS data
 
 // --- HELPER FUNCTIONS ---
 
@@ -49,11 +48,22 @@ float get_value(vec2 coord) {
 
 // Maps a physical value to a precipitation type category
 float get_ptype_from_physical(float val) {
-    if (val < 0.0) return -1.0;   // Missing/Invalid
-    if (val < 100.0) return 0.0; // Rain
-    if (val < 200.0) return 1.0; // Mix
-    if (val < 300.0) return 2.0; // Snow
-    return 3.0;                  // Pellets
+    if (val < 0.0) return -1.0;
+    
+    if (u_is_mrms == 1) {
+        // MRMS: 0-100 rain, 100-200 snow, 200-300 freezing rain
+        if (val < 100.0) return 0.0;
+        if (val < 200.0) return 1.0;
+        if (val < 300.0) return 2.0;
+        return -1.0;
+    } else {
+        // Models: 0-100 rain, 100-200 snow, 200-300 freezing rain, 300-400 ice pellets
+        if (val < 100.0) return 0.0;
+        if (val < 200.0) return 1.0;
+        if (val < 300.0) return 2.0;
+        if (val < 400.0) return 3.0;
+        return -1.0;
+    }
 }
 
 

package/lib/commonjs/ios/FragmentUniforms.swift

@@ -12,4 +12,5 @@ struct FragmentUniforms {
     var smoothing: Int32
     var scaleType: Int32
     var isPtype: Int32
+    var isMRMS: Int32
 }