@aguacerowx/react-native 0.0.24 → 0.0.26

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

@@ -251,10 +251,18 @@ public class GridRenderLayer implements CustomLayerHost {
             floatMatrix[i] = matrix.get(i).floatValue(); 
         }
         
-        floatMatrix[0] *= scale; 
-        floatMatrix[1] *= scale;  
-        floatMatrix[4] *= scale;    
-        floatMatrix[5] *= scale;
+        floatMatrix[0] *= scale   // X scale
+        floatMatrix[1] *= scale   // X rotation
+        floatMatrix[2] *= scale   // X Z-component
+        floatMatrix[3] *= scale   // X translation 
+        floatMatrix[4] *= scale   // Y rotation
+        floatMatrix[5] *= scale   // Y scale
+        floatMatrix[6] *= scale   // Y Z-component
+        floatMatrix[7] *= scale   // Y translation 
+        floatMatrix[8] *= scale   // Z X-component
+        floatMatrix[9] *= scale   // Z Y-component
+        floatMatrix[10] *= scale  // Z scale
+        floatMatrix[11] *= scale  // Z translation 
 
         GLES20.glUniformMatrix4fv(uMatrix, 1, false, floatMatrix, 0);
         GLES20.glUniform1f(uOpacity, opacity);

package/ios/GridRenderLayer.swift

@@ -954,15 +954,23 @@ internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFor
         // Apply zoom scale transformation
         let zoom = parameters.zoom
         let scale = Float(pow(2.0, zoom))
-        
+
         let matrixArray = parameters.projectionMatrix
         var floatArray = matrixArray.map { $0.floatValue }
-        
-        floatArray[0] *= scale  // X scale
-        floatArray[1] *= scale  // X rotation
-        floatArray[4] *= scale  // Y rotation  
-        floatArray[5] *= scale 
-        
+
+        floatArray[0] *= scale   // X scale
+        floatArray[1] *= scale   // X rotation
+        floatArray[2] *= scale   // X Z-component
+        floatArray[3] *= scale   // X translation 
+        floatArray[4] *= scale   // Y rotation
+        floatArray[5] *= scale   // Y scale
+        floatArray[6] *= scale   // Y Z-component
+        floatArray[7] *= scale   // Y translation 
+        floatArray[8] *= scale   // Z X-component
+        floatArray[9] *= scale   // Z Y-component
+        floatArray[10] *= scale  // Z scale
+        floatArray[11] *= scale  // Z translation 
+
         let mvp = matrix_float4x4(
             SIMD4<Float>(floatArray[0], floatArray[1], floatArray[2], floatArray[3]),
             SIMD4<Float>(floatArray[4], floatArray[5], floatArray[6], floatArray[7]),
@@ -993,6 +1001,25 @@ internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFor
         encoder.endEncoding()
     }
 
+    deinit {
+        print("🔴 [GridRenderLayer] deinit called for layer: \(id)")
+        
+        // Clean up all resources
+        frameCache.removeAll()
+        vertexBuffer = nil
+        indexBuffer = nil
+        dataTexture = nil
+        colormapTexture = nil
+        device = nil
+        commandQueue = nil
+        pipelineState = nil
+        dataSamplerState = nil
+        colormapSamplerState = nil
+        
+        // Break the reference cycle
+        hostWrapper = nil
+    }
+
     internal func internalRenderingWillEnd() {
         print("🟢 [GridRenderLayer] renderingWillEnd called")
         vertexBuffer = nil
@@ -1001,3 +1028,16 @@ internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFor
         colormapTexture = nil
     }
 }
+
+extension GridRenderLayer {
+    // Override to prevent KVC crashes during cleanup
+    open override func value(forUndefinedKey key: String) -> Any? {
+        print("⚠️ [GridRenderLayer] Attempted to access undefined key: \(key)")
+        return nil
+    }
+    
+    open override func setValue(_ value: Any?, forUndefinedKey key: String) {
+        print("⚠️ [GridRenderLayer] Attempted to set undefined key: \(key)")
+        // Silently ignore instead of crashing
+    }
+}

package/ios/GridRenderLayerView.m

@@ -239,4 +239,19 @@
     [super removeFromSuperview];
 }
 
+- (void)dealloc {
+    RCTLogInfo(@"🔴 [GridRenderLayerView] dealloc called");
+    
+    // Remove notification observer
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    // Clear the layer instance
+    if (_layerInstance) {
+        [_layerInstance clear];
+        _layerInstance = nil;
+    }
+    
+    _mapView = nil;
+}
+
 @end

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

@@ -251,10 +251,18 @@ public class GridRenderLayer implements CustomLayerHost {
             floatMatrix[i] = matrix.get(i).floatValue(); 
         }
         
-        floatMatrix[0] *= scale; 
-        floatMatrix[1] *= scale;  
-        floatMatrix[4] *= scale;    
-        floatMatrix[5] *= scale;
+        floatMatrix[0] *= scale   // X scale
+        floatMatrix[1] *= scale   // X rotation
+        floatMatrix[2] *= scale   // X Z-component
+        floatMatrix[3] *= scale   // X translation 
+        floatMatrix[4] *= scale   // Y rotation
+        floatMatrix[5] *= scale   // Y scale
+        floatMatrix[6] *= scale   // Y Z-component
+        floatMatrix[7] *= scale   // Y translation 
+        floatMatrix[8] *= scale   // Z X-component
+        floatMatrix[9] *= scale   // Z Y-component
+        floatMatrix[10] *= scale  // Z scale
+        floatMatrix[11] *= scale  // Z translation 
 
         GLES20.glUniformMatrix4fv(uMatrix, 1, false, floatMatrix, 0);
         GLES20.glUniform1f(uOpacity, opacity);

package/lib/commonjs/ios/GridRenderLayer.swift

@@ -954,15 +954,23 @@ internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFor
         // Apply zoom scale transformation
         let zoom = parameters.zoom
         let scale = Float(pow(2.0, zoom))
-        
+
         let matrixArray = parameters.projectionMatrix
         var floatArray = matrixArray.map { $0.floatValue }
-        
-        floatArray[0] *= scale  // X scale
-        floatArray[1] *= scale  // X rotation
-        floatArray[4] *= scale  // Y rotation  
-        floatArray[5] *= scale 
-        
+
+        floatArray[0] *= scale   // X scale
+        floatArray[1] *= scale   // X rotation
+        floatArray[2] *= scale   // X Z-component
+        floatArray[3] *= scale   // X translation 
+        floatArray[4] *= scale   // Y rotation
+        floatArray[5] *= scale   // Y scale
+        floatArray[6] *= scale   // Y Z-component
+        floatArray[7] *= scale   // Y translation 
+        floatArray[8] *= scale   // Z X-component
+        floatArray[9] *= scale   // Z Y-component
+        floatArray[10] *= scale  // Z scale
+        floatArray[11] *= scale  // Z translation 
+
         let mvp = matrix_float4x4(
             SIMD4<Float>(floatArray[0], floatArray[1], floatArray[2], floatArray[3]),
             SIMD4<Float>(floatArray[4], floatArray[5], floatArray[6], floatArray[7]),
@@ -993,6 +1001,25 @@ internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFor
         encoder.endEncoding()
     }
 
+    deinit {
+        print("🔴 [GridRenderLayer] deinit called for layer: \(id)")
+        
+        // Clean up all resources
+        frameCache.removeAll()
+        vertexBuffer = nil
+        indexBuffer = nil
+        dataTexture = nil
+        colormapTexture = nil
+        device = nil
+        commandQueue = nil
+        pipelineState = nil
+        dataSamplerState = nil
+        colormapSamplerState = nil
+        
+        // Break the reference cycle
+        hostWrapper = nil
+    }
+
     internal func internalRenderingWillEnd() {
         print("🟢 [GridRenderLayer] renderingWillEnd called")
         vertexBuffer = nil
@@ -1001,3 +1028,16 @@ internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFor
         colormapTexture = nil
     }
 }
+
+extension GridRenderLayer {
+    // Override to prevent KVC crashes during cleanup
+    open override func value(forUndefinedKey key: String) -> Any? {
+        print("⚠️ [GridRenderLayer] Attempted to access undefined key: \(key)")
+        return nil
+    }
+    
+    open override func setValue(_ value: Any?, forUndefinedKey key: String) {
+        print("⚠️ [GridRenderLayer] Attempted to set undefined key: \(key)")
+        // Silently ignore instead of crashing
+    }
+}

package/lib/commonjs/ios/GridRenderLayerView.m

@@ -239,4 +239,19 @@
     [super removeFromSuperview];
 }
 
+- (void)dealloc {
+    RCTLogInfo(@"🔴 [GridRenderLayerView] dealloc called");
+    
+    // Remove notification observer
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    // Clear the layer instance
+    if (_layerInstance) {
+        [_layerInstance clear];
+        _layerInstance = nil;
+    }
+    
+    _mapView = nil;
+}
+
 @end

package/lib/commonjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aguacerowx/react-native",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "Native weather rendering for React Native",
   "license": "ISC",
   "author": "Michael Barletta",

package/lib/commonjs/src/WeatherLayerManager.js

@@ -14,12 +14,21 @@ var _MapRegistry = require("./MapRegistry");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // packages/react-native/src/WeatherLayerManager.js
 
-console.log("--- Aguacero Native Module Initial State Check ---");
-console.log("All NativeModules:", Object.keys(_reactNative.NativeModules));
-console.log("WeatherFrameProcessorModule available?:", !!_reactNative.NativeModules.WeatherFrameProcessorModule);
-console.log("InspectorModule available?:", !!_reactNative.NativeModules.InspectorModule);
-console.log("GridRenderLayerManager available?:", !!_reactNative.NativeModules.GridRenderLayerManager);
-console.log("-------------------------------------------------");
+function findLatestModelRun(modelsData, modelName) {
+  const model = modelsData?.[modelName];
+  if (!model) return null;
+  const availableDates = Object.keys(model).sort((a, b) => b.localeCompare(a));
+  for (const date of availableDates) {
+    const runs = model[date];
+    if (!runs) continue;
+    const availableRuns = Object.keys(runs).sort((a, b) => b.localeCompare(a));
+    if (availableRuns.length > 0) return {
+      date: date,
+      run: availableRuns[0]
+    };
+  }
+  return null;
+}
 const {
   WeatherFrameProcessorModule,
   InspectorModule
@@ -71,7 +80,6 @@ _javascriptSdk.AguaceroCore.prototype.setMapCenter = function (center) {
   this.emit('map:move', center);
 };
 const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
-  // EDIT: Destructure the new props
   const {
     inspectorEnabled,
     onInspect,
@@ -79,6 +87,8 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
     customColormaps,
     initialMode,
     initialVariable,
+    autoRefresh,
+    autoRefreshInterval,
     ...restProps
   } = props;
   const context = (0, _react.useContext)(_AguaceroContext.AguaceroContext);
@@ -95,13 +105,11 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
   }), [apiKey]);
   const gridLayerRef = (0, _react.useRef)(null);
   const currentGridDataRef = (0, _react.useRef)(null);
+  const autoRefreshIntervalId = (0, _react.useRef)(null);
 
   // Cache for preloaded grid data - stores the processed data ready for GPU upload
   const preloadedDataCache = (0, _react.useRef)(new Map());
 
-  // Track what we're currently preloading to avoid duplicates
-  const preloadingSet = (0, _react.useRef)(new Set());
-
   // Store geometry and colormap that don't change with forecast hour
   const cachedGeometry = (0, _react.useRef)(null);
   const cachedColormap = (0, _react.useRef)(null);
@@ -119,6 +127,18 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
     dataRange: [0, 1]
   });
   (0, _react.useImperativeHandle)(ref, () => {
+    const setAutoRefresh = (enabled, intervalSeconds) => {
+      if (autoRefreshIntervalId.current) {
+        clearInterval(autoRefreshIntervalId.current);
+        autoRefreshIntervalId.current = null;
+      }
+      if (enabled) {
+        const effectiveInterval = (intervalSeconds || autoRefreshInterval || 30) * 1000;
+        // Run once immediately, then start the interval
+        _checkForUpdates();
+        autoRefreshIntervalId.current = setInterval(_checkForUpdates, effectiveInterval);
+      }
+    };
     return {
       play: () => {
         core.play();
@@ -147,9 +167,10 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
         if (gridLayerRef.current) {
           gridLayerRef.current.setSmoothing(enabled);
         }
-      }
+      },
+      setAutoRefresh
     };
-  }, [core]);
+  }, [core, autoRefreshInterval, _checkForUpdates]);
   const preloadAllFramesToDisk = state => {
     if (hasPreloadedRef.current) {
       console.log('✅ [Preload] Gating preload; already initiated for this dataset.');
@@ -352,6 +373,22 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
       });
     });
   };
+  (0, _react.useEffect)(() => {
+    // This effect manages the auto-refresh based on props
+    if (autoRefresh) {
+      const interval = (autoRefreshInterval || 30) * 1000;
+      _checkForUpdates(); // Run immediately on enable
+      autoRefreshIntervalId.current = setInterval(_checkForUpdates, interval);
+    }
+
+    // Cleanup function: this runs when the component unmounts or props change
+    return () => {
+      if (autoRefreshIntervalId.current) {
+        clearInterval(autoRefreshIntervalId.current);
+        autoRefreshIntervalId.current = null;
+      }
+    };
+  }, [autoRefresh, autoRefreshInterval, _checkForUpdates]);
   const updateGPUWithCachedData = state => {
     const {
       model,
@@ -554,12 +591,112 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
       return null;
     }
   };
+  const _checkForUpdates = (0, _react.useMemo)(() => async () => {
+    if (!core) return;
+    const {
+      isMRMS,
+      model: currentModel,
+      variable: currentVariable,
+      date,
+      run
+    } = core.state;
+    if (isMRMS) {
+      // --- MRMS LOGIC WITH PRE-LOADING ---
+      const oldTimestamps = new Set(core.mrmsStatus?.[currentVariable] || []);
+      const mrmsStatus = await core.fetchMRMSStatus(true);
+      const newTimestamps = mrmsStatus?.[currentVariable] || [];
+      if (newTimestamps.length === 0) return;
+      const newTimestampsToPreload = newTimestamps.filter(ts => !oldTimestamps.has(ts));
+      if (newTimestampsToPreload.length > 0) {
+        core.mrmsStatus = mrmsStatus;
+        core._emitStateChange(); // Update UI slider without changing selection
+
+        console.log(`[Auto-Refresh] Preloading ${newTimestampsToPreload.length} new MRMS frames.`);
+        const {
+          corners,
+          gridDef
+        } = core._getGridCornersAndDef('mrms');
+        const {
+          nx,
+          ny
+        } = gridDef.grid_params;
+        newTimestampsToPreload.forEach(frame => {
+          const cacheKey = `mrms-${frame}-${currentVariable}`;
+          if (preloadedDataCache.current.has(cacheKey)) return;
+          const frameDate = new Date(frame * 1000);
+          const y = frameDate.getUTCFullYear(),
+            m = (frameDate.getUTCMonth() + 1).toString().padStart(2, '0'),
+            d = frameDate.getUTCDate().toString().padStart(2, '0');
+
+          // --- THIS IS THE FIX ---
+          // Changed 'variable' to 'currentVariable'
+          const resourcePath = `/grids/mrms/${y}${m}${d}/${frame}/0/${currentVariable}/0`;
+          // --- END FIX ---
+
+          const url = `${core.baseGridUrl}${resourcePath}?apiKey=${core.apiKey}`;
+          WeatherFrameProcessorModule.processFrame({
+            url,
+            apiKey: core.apiKey,
+            bundleId: core.bundleId
+          }).then(result => {
+            if (!result || !result.filePath) return;
+            const frameData = {
+              filePath: result.filePath,
+              nx,
+              ny,
+              scale: result.scale,
+              offset: result.offset,
+              missing: result.missing,
+              corners,
+              gridDef,
+              scaleType: result.scaleType,
+              originalScale: result.scale,
+              originalOffset: result.offset
+            };
+            preloadedDataCache.current.set(cacheKey, frameData);
+            if (_reactNative.Platform.OS === 'ios' && gridLayerRef.current?.primeGpuCache) {
+              gridLayerRef.current.primeGpuCache({
+                [cacheKey]: frameData
+              });
+            }
+          }).catch(error => console.warn(`[Auto-Refresh] Failed to preload frame ${frame}:`, error));
+        });
+        const newTimestampsSet = new Set(newTimestamps);
+        oldTimestamps.forEach(oldTs => {
+          if (!newTimestampsSet.has(oldTs)) {
+            const cacheKey = `mrms-${oldTs}-${currentVariable}`;
+            preloadedDataCache.current.delete(cacheKey);
+          }
+        });
+      }
+    } else {
+      // --- MODEL LOGIC ---
+      const modelStatus = await core.fetchModelStatus(true);
+      const latestRun = findLatestModelRun(modelStatus, currentModel);
+      if (!latestRun) return;
+      const currentRunKey = `${date}:${run}`;
+      const latestRunKey = `${latestRun.date}:${latestRun.run}`;
+      if (latestRunKey > currentRunKey) {
+        // This preserves the current forecastHour while changing the run
+        await core.setState({
+          date: latestRun.date,
+          run: latestRun.run
+        });
+      }
+    }
+  }, [core]);
   (0, _react.useEffect)(() => {
     if (!core) {
       console.warn('⚠️ [useEffect] Core is not available yet');
       return;
     }
+
+    // --- REPLACE THIS ENTIRE FUNCTION ---
     const handleStateChange = async newState => {
+      // --- FIX 1: Notify the parent component IMMEDIATELY ---
+      // This ensures the parent UI (like sliders) always gets the latest state,
+      // including updated lists of available hours or timestamps.
+      props.onStateChange?.(newState);
       if (!previousStateRef.current) {
         previousStateRef.current = core.state;
       }
@@ -569,18 +706,19 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
       }
       const stateKey = `${newState.model}-${newState.variable}-${newState.date}-${newState.run}-${newState.forecastHour}-${newState.units}-${newState.mrmsTimestamp}`;
       const isOpacityOnlyChange = hasInitialLoad.current && newState.opacity !== renderProps.opacity && newState.variable === previousStateRef.current?.variable && newState.forecastHour === previousStateRef.current?.forecastHour && newState.mrmsTimestamp === previousStateRef.current?.mrmsTimestamp && newState.model === previousStateRef.current?.model && newState.units === previousStateRef.current?.units;
-
-      // ADD: Check for play state only change
       const isPlayStateOnlyChange = hasInitialLoad.current && newState.isPlaying !== previousStateRef.current?.isPlaying && newState.variable === previousStateRef.current?.variable && newState.forecastHour === previousStateRef.current?.forecastHour && newState.mrmsTimestamp === previousStateRef.current?.mrmsTimestamp && newState.model === previousStateRef.current?.model && newState.units === previousStateRef.current?.units && newState.opacity === previousStateRef.current?.opacity;
+
+      // This gate now correctly prevents only redundant *internal* processing.
+      // The parent has already been notified.
       if (!isOpacityOnlyChange && !isPlayStateOnlyChange && lastProcessedState.current === stateKey) {
+        // --- FIX 2: Update the previous state ref before returning ---
+        // This is critical to prevent stale comparisons on the next state change event.
+        previousStateRef.current = newState;
         return;
       }
       if (!isOpacityOnlyChange && !isPlayStateOnlyChange) {
         lastProcessedState.current = stateKey;
       }
-
-      // MOVE THIS TO THE TOP - Always notify the parent component of state changes
-      props.onStateChange?.(newState);
       if (isOpacityOnlyChange) {
         setRenderProps(prev => ({
           ...prev,
@@ -589,14 +727,10 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
         previousStateRef.current = newState;
         return;
       }
-
-      // ADD: Handle play state only change
       if (isPlayStateOnlyChange) {
         previousStateRef.current = newState;
         return;
       }
-
-      // Check if only units changed
       const isUnitsOnlyChange = hasInitialLoad.current && newState.model === previousStateRef.current.model && newState.isMRMS === previousStateRef.current.isMRMS && newState.variable === previousStateRef.current.variable && newState.date === previousStateRef.current.date && newState.run === previousStateRef.current.run && newState.forecastHour === previousStateRef.current.forecastHour && newState.mrmsTimestamp === previousStateRef.current.mrmsTimestamp && newState.units !== previousStateRef.current.units;
       if (isUnitsOnlyChange) {
         const {
@@ -620,18 +754,12 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
           let dataOffset = cachedData.originalOffset;
           if (baseUnit !== toUnit) {
             const conversionFunc = (0, _javascriptSdk.getUnitConversionFunction)(baseUnit, toUnit);
-            console.log('🔧 [Unit Conversion] Conversion function exists:', !!conversionFunc);
             if (conversionFunc) {
               if (cachedData.scaleType === 'sqrt') {
-                // Calculate what the physical values would be at offset and offset+scale
                 const physicalAtOffset = dataOffset * dataOffset;
                 const physicalAtOffsetPlusScale = (dataOffset + dataScale) * (dataOffset + dataScale);
-
-                // Convert these physical values to the new unit
                 const convertedPhysicalAtOffset = conversionFunc(physicalAtOffset);
                 const convertedPhysicalAtOffsetPlusScale = conversionFunc(physicalAtOffsetPlusScale);
-
-                // Take sqrt to get back to intermediate values
                 const newOffset = Math.sqrt(Math.abs(convertedPhysicalAtOffset)) * Math.sign(convertedPhysicalAtOffset);
                 const newOffsetPlusScale = Math.sqrt(Math.abs(convertedPhysicalAtOffsetPlusScale)) * Math.sign(convertedPhysicalAtOffsetPlusScale);
                 dataScale = newOffsetPlusScale - newOffset;
@@ -644,22 +772,11 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
               }
             }
           }
-
-          // Update the colormap AND data range
           const {
             colormap
           } = core._getColormapForVariable(variable);
           const finalColormap = core._convertColormapUnits(colormap, baseUnit, toUnit);
-          let dataRange;
-          if (variable === 'ptypeRefl' || variable === 'ptypeRate') {
-            if (isMRMS) {
-              dataRange = [5, 380];
-            } else {
-              dataRange = [5, 380];
-            }
-          } else {
-            dataRange = [finalColormap[0], finalColormap[finalColormap.length - 2]];
-          }
+          let dataRange = variable === 'ptypeRefl' || variable === 'ptypeRate' ? [5, 380] : [finalColormap[0], finalColormap[finalColormap.length - 2]];
           const colormapBytes = _generateColormapBytes(finalColormap);
           const colormapAsBase64 = (0, _base64Js.fromByteArray)(colormapBytes);
           gridLayerRef.current.updateColormapTexture(colormapAsBase64);
@@ -673,15 +790,8 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
             opacity: newState.opacity
           }));
           if (gridLayerRef.current && gridLayerRef.current.updateDataParameters) {
-            const scaleTypeValue = cachedData.scaleType === 'sqrt' ? 1 : 0; // Convert to number
-
-            console.log('🔄 [Unit Conversion] Calling updateDataParameters with:', {
-              scale: dataScale,
-              offset: dataOffset,
-              missing: cachedData.missing,
-              scaleType: scaleTypeValue
-            });
-            gridLayerRef.current.updateDataParameters(dataScale, dataOffset, cachedData.missing, scaleTypeValue); // Pass scaleType
+            const scaleTypeValue = cachedData.scaleType === 'sqrt' ? 1 : 0;
+            gridLayerRef.current.updateDataParameters(dataScale, dataOffset, cachedData.missing, scaleTypeValue);
           }
           const newCacheKey = isMRMS ? `mrms-${mrmsTimestamp}-${variable}` : `${model}-${date}-${run}-${forecastHour}-${variable}`;
           preloadedDataCache.current.set(newCacheKey, {
@@ -689,8 +799,6 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
             scale: dataScale,
             offset: dataOffset
           });
-        } else {
-          console.warn('⚠️ [Unit Conversion] No cached data found for key:', oldCacheKey);
         }
         previousStateRef.current = newState;
         return;
@@ -700,7 +808,6 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
         if (gridLayerRef.current) {
           gridLayerRef.current.setVariable(newState.variable);
           gridLayerRef.current.clear();
-          // --- OPTIMIZATION: Clear the native GPU cache on iOS ---
           if (_reactNative.Platform.OS === 'ios' && gridLayerRef.current.clearGpuCache) {
             gridLayerRef.current.clearGpuCache();
           }
@@ -709,8 +816,6 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
         preloadedDataCache.current.clear();
         cachedGeometry.current = null;
         cachedColormap.current = null;
-
-        // ADD THIS: Clear the inspector cache too
         currentGridDataRef.current = null;
         WeatherFrameProcessorModule.cancelAllFrames();
         if (!newState.variable) {
@@ -720,24 +825,17 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
         preloadAllFramesToDisk(newState);
       } else if (newState.forecastHour !== previousStateRef.current.forecastHour || newState.isMRMS && newState.mrmsTimestamp !== previousStateRef.current.mrmsTimestamp) {
         const success = updateGPUWithCachedData(newState);
-        if (!success) {
-          // CHANGED: Don't error, just log and wait for preload
-          const timeKey = newState.isMRMS ? `timestamp ${newState.mrmsTimestamp}` : `hour +${newState.forecastHour}`;
-          console.log(`⏳ [handleStateChange] Frame ${timeKey} not ready yet, waiting for preload...`);
-          // Don't clear the layer - keep showing the previous frame until new one is ready
-          // The preload will eventually complete and trigger a re-render
-        } else {
-          // Only update inspector cache when we successfully loaded new data
-          if (newState.opacity !== renderProps.opacity) {
-            setRenderProps(prev => ({
-              ...prev,
-              opacity: newState.opacity
-            }));
-          }
+        if (success && newState.opacity !== renderProps.opacity) {
+          setRenderProps(prev => ({
+            ...prev,
+            opacity: newState.opacity
+          }));
         }
       }
       previousStateRef.current = newState;
     };
+    // --- END REPLACEMENT ---
+
     handleStateChangeRef.current = handleStateChange;
     const stableHandler = newState => {
       const isOpacityOnlyChange = previousStateRef.current && newState.opacity !== previousStateRef.current.opacity && newState.variable === previousStateRef.current.variable && newState.forecastHour === previousStateRef.current.forecastHour && newState.mrmsTimestamp === previousStateRef.current.mrmsTimestamp && newState.model === previousStateRef.current.model && newState.units === previousStateRef.current.units && newState.date === previousStateRef.current.date && newState.run === previousStateRef.current.run;