@aguacerowx/react-native 0.0.18 → 0.0.20

package/lib/module/lib/commonjs/ios/GridRenderLayer.swift

@@ -783,99 +783,120 @@ public class GridRenderLayer: NSObject {
     
     // MARK: - Internal methods for CustomLayerHost (called by wrapper)
     
-    internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFormat: UInt, depthStencilPixelFormat: UInt) {
-        print("🟢 [GridRenderLayer] renderingWillStart called")
-        self.device = metalDevice
-        self.commandQueue = metalDevice.makeCommandQueue()
-        
-        let bundle = Bundle(for: GridRenderLayer.self)
-        guard let shadersUrl = bundle.url(forResource: "AguaceroMetalShaders", withExtension: "bundle") else {
-            print("❌ [GridRenderLayer] Could not find shader bundle")
-            return
-        }
-        guard let metalBundle = Bundle(url: shadersUrl) else {
-            print("❌ [GridRenderLayer] Could not load shader bundle")
-            return
-        }
-        guard let defaultLibrary = try? metalDevice.makeDefaultLibrary(bundle: metalBundle) else {
-            print("❌ [GridRenderLayer] Could not create Metal library")
-            return
-        }
-        
-        let vertexFunction = defaultLibrary.makeFunction(name: "vertex_main")
-        let fragmentFunction = defaultLibrary.makeFunction(name: "fragment_main")
-
-        // Set up vertex descriptor
-        let vertexDescriptor = MTLVertexDescriptor()
-        vertexDescriptor.attributes[0].format = .float2  // position (x, y)
-        vertexDescriptor.attributes[0].offset = 0
-        vertexDescriptor.attributes[0].bufferIndex = 0
-
-        vertexDescriptor.attributes[1].format = .float2  // texCoord (u, v)
-        vertexDescriptor.attributes[1].offset = MemoryLayout<Float>.size * 2
-        vertexDescriptor.attributes[1].bufferIndex = 0
-
-        vertexDescriptor.layouts[0].stride = MemoryLayout<Float>.size * 4  // 2 floats for pos + 2 for texCoord
-        vertexDescriptor.layouts[0].stepFunction = .perVertex
-
-        let pipelineDescriptor = MTLRenderPipelineDescriptor()
-        pipelineDescriptor.vertexDescriptor = vertexDescriptor  // ADD THIS LINE
-        pipelineDescriptor.vertexFunction = vertexFunction
-        pipelineDescriptor.fragmentFunction = fragmentFunction
-        
-        pipelineDescriptor.colorAttachments[0].pixelFormat = MTLPixelFormat(rawValue: colorPixelFormat) ?? .bgra8Unorm
-        pipelineDescriptor.depthAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
-        pipelineDescriptor.stencilAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
-
-        pipelineDescriptor.colorAttachments[0].isBlendingEnabled = true
-        pipelineDescriptor.colorAttachments[0].rgbBlendOperation = .add
-        pipelineDescriptor.colorAttachments[0].alphaBlendOperation = .add
-        pipelineDescriptor.colorAttachments[0].sourceRGBBlendFactor = .sourceAlpha
-        pipelineDescriptor.colorAttachments[0].sourceAlphaBlendFactor = .sourceAlpha
-        pipelineDescriptor.colorAttachments[0].destinationRGBBlendFactor = .oneMinusSourceAlpha
-        pipelineDescriptor.colorAttachments[0].destinationAlphaBlendFactor = .oneMinusSourceAlpha
-
-        do {
-            self.pipelineState = try metalDevice.makeRenderPipelineState(descriptor: pipelineDescriptor)
-        } catch {
-            print("❌ [GridRenderLayer] Failed to create pipeline state: \(error)")
-            return
-        }
-        
-        let dataSamplerDesc = MTLSamplerDescriptor()
-        dataSamplerDesc.minFilter = .nearest
-        dataSamplerDesc.magFilter = .nearest
-        self.dataSamplerState = metalDevice.makeSamplerState(descriptor: dataSamplerDesc)
-
-        let colormapSamplerDesc = MTLSamplerDescriptor()
-        colormapSamplerDesc.minFilter = .nearest
-        colormapSamplerDesc.magFilter = .nearest
-        colormapSamplerDesc.sAddressMode = .clampToEdge
-        self.colormapSamplerState = metalDevice.makeSamplerState(descriptor: colormapSamplerDesc)
-        
-        print("🟢 [GridRenderLayer] Metal setup complete")
-        
-        // Process any pending updates that came in before Metal was ready
-        if let pendingGeometry = pendingGeometryUpdate {
-            print("🟡 [GridRenderLayer] Processing pending geometry update")
-            updateGeometry(corners: pendingGeometry.corners, gridDef: pendingGeometry.gridDef)
-            pendingGeometryUpdate = nil
-        }
-        
-        if let pendingColormap = pendingColormapUpdate {
-            print("🟡 [GridRenderLayer] Processing pending colormap update")
-            updateColormapTexture(colormapAsBase64: pendingColormap)
-            pendingColormapUpdate = nil
-        }
-        
-        if let pendingData = pendingDataUpdate {
-            print("🟡 [GridRenderLayer] Processing pending data update")
-            updateDataTexture(data: pendingData.data, nx: pendingData.nx, ny: pendingData.ny, 
-                            scale: pendingData.scale, offset: pendingData.offset, 
-                            missing: pendingData.missing, scaleType: pendingData.scaleType)
-            pendingDataUpdate = nil
-        }
+internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFormat: UInt, depthStencilPixelFormat: UInt) {
+    print("🟢 [GridRenderLayer] renderingWillStart called")
+    self.device = metalDevice
+    self.commandQueue = metalDevice.makeCommandQueue()
+    
+    let bundle = Bundle(for: GridRenderLayer.self)
+
+    // Determine if we're running on simulator or device
+    #if targetEnvironment(simulator)
+    let metallibName = "Shaders-simulator"
+    #else
+    let metallibName = "Shaders-device"
+    #endif
+
+    // Try to load pre-compiled metallib for the current platform
+    let defaultLibrary: MTLLibrary?
+    if let metallibUrl = bundle.url(forResource: metallibName, withExtension: "metallib"),
+    let library = try? metalDevice.makeLibrary(URL: metallibUrl) {
+        print("✅ [GridRenderLayer] Loaded pre-compiled metallib (\(metallibName))")
+        defaultLibrary = library
+    }
+    // Fall back to compiling from .metal source (for development with npm link)
+    else if let metalUrl = bundle.url(forResource: "Shaders", withExtension: "metal"),
+            let source = try? String(contentsOf: metalUrl),
+            let library = try? metalDevice.makeLibrary(source: source, options: nil) {
+        print("✅ [GridRenderLayer] Compiled Metal shader from source")
+        defaultLibrary = library
+    }
+    // Neither worked
+    else {
+        print("❌ [GridRenderLayer] Could not find or compile Metal shaders")
+        print("   Bundle path: \(bundle.bundlePath)")
+        return
+    }
+
+    guard let library = defaultLibrary else {
+        print("❌ [GridRenderLayer] Failed to create Metal library")
+        return
+    }
+    
+    let vertexFunction = library.makeFunction(name: "vertex_main")
+    let fragmentFunction = library.makeFunction(name: "fragment_main")
+
+    // Set up vertex descriptor
+    let vertexDescriptor = MTLVertexDescriptor()
+    vertexDescriptor.attributes[0].format = .float2  // position (x, y)
+    vertexDescriptor.attributes[0].offset = 0
+    vertexDescriptor.attributes[0].bufferIndex = 0
+
+    vertexDescriptor.attributes[1].format = .float2  // texCoord (u, v)
+    vertexDescriptor.attributes[1].offset = MemoryLayout<Float>.size * 2
+    vertexDescriptor.attributes[1].bufferIndex = 0
+
+    vertexDescriptor.layouts[0].stride = MemoryLayout<Float>.size * 4  // 2 floats for pos + 2 for texCoord
+    vertexDescriptor.layouts[0].stepFunction = .perVertex
+
+    let pipelineDescriptor = MTLRenderPipelineDescriptor()
+    pipelineDescriptor.vertexDescriptor = vertexDescriptor
+    pipelineDescriptor.vertexFunction = vertexFunction
+    pipelineDescriptor.fragmentFunction = fragmentFunction
+    
+    pipelineDescriptor.colorAttachments[0].pixelFormat = MTLPixelFormat(rawValue: colorPixelFormat) ?? .bgra8Unorm
+    pipelineDescriptor.depthAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
+    pipelineDescriptor.stencilAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
+
+    pipelineDescriptor.colorAttachments[0].isBlendingEnabled = true
+    pipelineDescriptor.colorAttachments[0].rgbBlendOperation = .add
+    pipelineDescriptor.colorAttachments[0].alphaBlendOperation = .add
+    pipelineDescriptor.colorAttachments[0].sourceRGBBlendFactor = .sourceAlpha
+    pipelineDescriptor.colorAttachments[0].sourceAlphaBlendFactor = .sourceAlpha
+    pipelineDescriptor.colorAttachments[0].destinationRGBBlendFactor = .oneMinusSourceAlpha
+    pipelineDescriptor.colorAttachments[0].destinationAlphaBlendFactor = .oneMinusSourceAlpha
+
+    do {
+        self.pipelineState = try metalDevice.makeRenderPipelineState(descriptor: pipelineDescriptor)
+    } catch {
+        print("❌ [GridRenderLayer] Failed to create pipeline state: \(error)")
+        return
     }
+    
+    let dataSamplerDesc = MTLSamplerDescriptor()
+    dataSamplerDesc.minFilter = .nearest
+    dataSamplerDesc.magFilter = .nearest
+    self.dataSamplerState = metalDevice.makeSamplerState(descriptor: dataSamplerDesc)
+
+    let colormapSamplerDesc = MTLSamplerDescriptor()
+    colormapSamplerDesc.minFilter = .nearest
+    colormapSamplerDesc.magFilter = .nearest
+    colormapSamplerDesc.sAddressMode = .clampToEdge
+    self.colormapSamplerState = metalDevice.makeSamplerState(descriptor: colormapSamplerDesc)
+    
+    print("🟢 [GridRenderLayer] Metal setup complete")
+    
+    // Process any pending updates that came in before Metal was ready
+    if let pendingGeometry = pendingGeometryUpdate {
+        print("🟡 [GridRenderLayer] Processing pending geometry update")
+        updateGeometry(corners: pendingGeometry.corners, gridDef: pendingGeometry.gridDef)
+        pendingGeometryUpdate = nil
+    }
+    
+    if let pendingColormap = pendingColormapUpdate {
+        print("🟡 [GridRenderLayer] Processing pending colormap update")
+        updateColormapTexture(colormapAsBase64: pendingColormap)
+        pendingColormapUpdate = nil
+    }
+    
+    if let pendingData = pendingDataUpdate {
+        print("🟡 [GridRenderLayer] Processing pending data update")
+        updateDataTexture(data: pendingData.data, nx: pendingData.nx, ny: pendingData.ny, 
+                        scale: pendingData.scale, offset: pendingData.offset, 
+                        missing: pendingData.missing, scaleType: pendingData.scaleType)
+        pendingDataUpdate = nil
+    }
+}
     internal func internalRender(_ parameters: CustomLayerRenderParameters, mtlCommandBuffer: MTLCommandBuffer, mtlRenderPassDescriptor: MTLRenderPassDescriptor) {
         guard isVisible,
             let pipeline = pipelineState,

package/lib/module/lib/commonjs/node_modules/@aguacerowx/javascript-sdk/dist/AguaceroCore.js

@@ -10,7 +10,6 @@ var _unitConversions = require("./unitConversions.js");
 var _dictionaries = require("./dictionaries.js");
 var _defaultColormaps = require("./default-colormaps.js");
 var _proj = _interopRequireDefault(require("proj4"));
-var _fzstd = require("fzstd");
 var _getBundleId = require("./getBundleId");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
@@ -96,7 +95,7 @@ class AguaceroCore extends _events.EventEmitter {
       run: null,
       forecastHour: 0,
       visible: true,
-      opacity: userLayerOptions.opacity ?? 0.85,
+      opacity: userLayerOptions.opacity ?? 1,
       units: options.initialUnit || 'imperial',
       shaderSmoothingEnabled: options.shaderSmoothingEnabled ?? true
     };
@@ -194,24 +193,60 @@ class AguaceroCore extends _events.EventEmitter {
     this.isPlaying ? this.pause() : this.play();
   }
   step(direction = 1) {
-    var _this$modelStatus3;
-    const {
-      model,
-      date,
-      run,
-      forecastHour
-    } = this.state;
-    const forecastHours = (_this$modelStatus3 = this.modelStatus) === null || _this$modelStatus3 === void 0 || (_this$modelStatus3 = _this$modelStatus3[model]) === null || _this$modelStatus3 === void 0 || (_this$modelStatus3 = _this$modelStatus3[date]) === null || _this$modelStatus3 === void 0 ? void 0 : _this$modelStatus3[run];
-    if (!forecastHours || forecastHours.length === 0) return;
-    const currentIndex = forecastHours.indexOf(forecastHour);
-    if (currentIndex === -1) return;
-    const maxIndex = forecastHours.length - 1;
-    let nextIndex = currentIndex + direction;
-    if (nextIndex > maxIndex) nextIndex = 0;
-    if (nextIndex < 0) nextIndex = maxIndex;
-    this.setState({
-      forecastHour: forecastHours[nextIndex]
-    });
+    // --- THIS IS THE CORRECTED MRMS LOGIC ---
+    if (this.state.isMRMS) {
+      const {
+        variable,
+        mrmsTimestamp
+      } = this.state;
+      if (!this.mrmsStatus || !this.mrmsStatus[variable]) {
+        console.warn('[Core.step] MRMS status or variable not available.');
+        return;
+      }
+
+      // CRITICAL FIX: The UI and state emissions use a REVERSED array (newest first).
+      // The step logic MUST use the same reversed array for indexes to match.
+      const availableTimestamps = [...(this.mrmsStatus[variable] || [])].reverse();
+      if (availableTimestamps.length === 0) return;
+      const currentIndex = availableTimestamps.indexOf(mrmsTimestamp);
+      if (currentIndex === -1) {
+        // If not found, reset to the first (newest) frame
+        this.setState({
+          mrmsTimestamp: availableTimestamps[0]
+        });
+        return;
+      }
+      const maxIndex = availableTimestamps.length - 1;
+      let nextIndex = currentIndex + direction;
+
+      // Loop animation
+      if (nextIndex > maxIndex) nextIndex = 0;
+      if (nextIndex < 0) nextIndex = maxIndex;
+      const newTimestamp = availableTimestamps[nextIndex];
+      this.setState({
+        mrmsTimestamp: newTimestamp
+      });
+    } else {
+      var _this$modelStatus3;
+      const {
+        model,
+        date,
+        run,
+        forecastHour
+      } = this.state;
+      const forecastHours = (_this$modelStatus3 = this.modelStatus) === null || _this$modelStatus3 === void 0 || (_this$modelStatus3 = _this$modelStatus3[model]) === null || _this$modelStatus3 === void 0 || (_this$modelStatus3 = _this$modelStatus3[date]) === null || _this$modelStatus3 === void 0 ? void 0 : _this$modelStatus3[run];
+      if (!forecastHours || forecastHours.length === 0) return;
+      const currentIndex = forecastHours.indexOf(forecastHour);
+      if (currentIndex === -1) return;
+      const maxIndex = forecastHours.length - 1;
+      let nextIndex = currentIndex + direction;
+      if (nextIndex > maxIndex) nextIndex = 0;
+      if (nextIndex < 0) nextIndex = maxIndex;
+      const newHour = forecastHours[nextIndex];
+      this.setState({
+        forecastHour: newHour
+      });
+    }
   }
   setPlaybackSpeed(speed) {
     if (speed > 0) {
@@ -354,6 +389,10 @@ class AguaceroCore extends _events.EventEmitter {
     return new Uint8Array(reconstructedData.buffer);
   }
   async _loadGridData(state) {
+    if (this.isReactNative) {
+      console.warn(`[AguaceroCore] _loadGridData was called in React Native. This is a bypass. Data loading is handled natively.`);
+      return null;
+    }
     const {
       model,
       date,
@@ -408,7 +447,7 @@ class AguaceroCore extends _events.EventEmitter {
         const headers = {
           'x-api-key': this.apiKey
         };
-        if (this.bundleId) {
+        if (this.bundleId && this.isReactNative) {
           headers['x-app-identifier'] = this.bundleId;
         }
         const response = await fetch(urlWithApiKeyParam, {
@@ -508,20 +547,68 @@ class AguaceroCore extends _events.EventEmitter {
       const index1D = j * nx + i;
       const byteValue = gridData.data[index1D];
       const signedQuantizedValue = byteValue - 128;
+
+      // --- START OF FIX ---
+      // You were missing 'scale_type' in this destructuring assignment.
       const {
         scale,
         offset,
-        missing_quantized
+        missing_quantized,
+        scale_type
       } = gridData.encoding;
+      // --- END OF FIX ---
+
       if (signedQuantizedValue === missing_quantized) return null;
-      const nativeValue = signedQuantizedValue * scale + offset;
+      const intermediateValue = signedQuantizedValue * scale + offset;
+
+      // Step 2: Apply non-linear scaling if specified
+      let nativeValue = intermediateValue;
+      if (scale_type === 'sqrt') {
+        // Square the value while preserving its sign
+        nativeValue = intermediateValue < 0 ? -(intermediateValue * intermediateValue) : intermediateValue * intermediateValue;
+      }
       const {
+        colormap,
         baseUnit
       } = this._getColormapForVariable(variable);
+
+      // If the value is outside the colormap's bounds, return null.
+      if (colormap && colormap.length >= 2) {
+        const minBound = colormap[0];
+        const maxBound = colormap[colormap.length - 2];
+        if (nativeValue < minBound || nativeValue > maxBound) {
+          return null;
+        }
+      }
       let dataNativeUnit = baseUnit || (_dictionaries.DICTIONARIES.fld[variable] || {}).defaultUnit || 'none';
       const displayUnit = this._getTargetUnit(dataNativeUnit, units);
       const conversionFunc = (0, _unitConversions.getUnitConversionFunction)(dataNativeUnit, displayUnit);
-      const displayValue = conversionFunc ? conversionFunc(nativeValue) : nativeValue;
+      let displayValue = conversionFunc ? conversionFunc(nativeValue) : nativeValue;
+
+      // --- START: ADDED CODE ---
+
+      // Create a variable to hold the precipitation type, if any.
+      let precipType = null;
+
+      // Check if the current variable is one of the special ptype variables.
+      if (variable === 'ptypeRefl' || variable === 'ptypeRate') {
+        const value = nativeValue; // Use the raw, unconverted value for ptype logic
+
+        if (value >= 100 && value < 200) {
+          displayValue -= 100;
+          precipType = 'Snow';
+        } else if (value >= 200 && value < 300) {
+          displayValue -= 200;
+          precipType = 'Frzg Rain'; // Abbreviated for tooltips
+        } else if (value >= 300 && value < 400) {
+          displayValue -= 300;
+          precipType = 'Ice Pellets';
+        } else {
+          precipType = 'Rain';
+        }
+      }
+
+      // Return the final payload, now including the precipType.
       return {
         lngLat: {
           lng,
@@ -532,7 +619,8 @@ class AguaceroCore extends _events.EventEmitter {
           name: this.getVariableDisplayName(variable)
         },
         value: displayValue,
-        unit: displayUnit
+        unit: displayUnit,
+        precipType: precipType // NEW: Add this to the return object
       };
     } catch (error) {
       return null;
@@ -552,9 +640,6 @@ class AguaceroCore extends _events.EventEmitter {
       colormap: [],
       baseUnit: ''
     };
-
-    // This logic for user-provided custom colormaps is correct.
-    // If a user provides a custom map, it should always take top priority.
     if (this.customColormaps[variable] && this.customColormaps[variable].colormap) {
       return {
         colormap: this.customColormaps[variable].colormap,
@@ -570,45 +655,18 @@ class AguaceroCore extends _events.EventEmitter {
       };
     }
     const defaultColormapData = _defaultColormaps.DEFAULT_COLORMAPS[colormapKey];
-
-    // --- START OF THE BUG FIX ---
-    // This block handles the "default" case when no custom colormap is provided.
     if (defaultColormapData && defaultColormapData.units) {
-      var _DICTIONARIES$fld$var;
-      // 1. EDITED: Explicitly look up the CORRECT default unit from the main dictionary.
-      //    This is the information source we were previously ignoring.
-      const preferredUnit = (_DICTIONARIES$fld$var = _dictionaries.DICTIONARIES.fld[variable]) === null || _DICTIONARIES$fld$var === void 0 ? void 0 : _DICTIONARIES$fld$var.defaultUnit; // e.g., '°C' for '2t_2'
-
-      // 2. EDITED: Check if that preferred unit exists in the colormap definitions.
-      if (preferredUnit && defaultColormapData.units[preferredUnit]) {
-        const unitData = defaultColormapData.units[preferredUnit];
-        if (unitData && unitData.colormap) {
-          // 3. EDITED: If it exists, return ITS data. This is the correct path.
-          console.log(`[AguaceroCore] Using dictionary default unit '${preferredUnit}' for variable '${variable}'.`);
-          return {
-            colormap: unitData.colormap,
-            baseUnit: preferredUnit
-          };
-        }
-      }
-
-      // 4. EDITED: The old, buggy logic now serves as a FALLBACK ONLY.
-      //    This will only run if the specified defaultUnit is missing from the colormap data.
-      console.warn(`[AguaceroCore] Default unit for '${variable}' not found in colormap. Using fallback.`);
-      const availableUnits = Object.keys(defaultColormapData.units);
-      if (availableUnits.length > 0) {
-        const fallbackUnit = availableUnits[0]; // e.g., '°F'
-        const unitData = defaultColormapData.units[fallbackUnit];
-        if (unitData && unitData.colormap) {
-          return {
-            colormap: unitData.colormap,
-            baseUnit: fallbackUnit
-          };
-        }
+      // ✅ Get defaultUnit from the field dictionary
+      const fieldInfo = _dictionaries.DICTIONARIES.fld[variable] || {};
+      const baseUnit = fieldInfo.defaultUnit || Object.keys(defaultColormapData.units)[0];
+      const unitData = defaultColormapData.units[baseUnit];
+      if (unitData && unitData.colormap) {
+        return {
+          colormap: unitData.colormap,
+          baseUnit: baseUnit
+        };
       }
     }
-    // --- END OF THE BUG FIX ---
-
     return {
       colormap: [],
       baseUnit: ''
@@ -717,13 +775,15 @@ class AguaceroCore extends _events.EventEmitter {
   }
   _getTargetUnit(defaultUnit, system) {
     if (system === 'metric') {
-      if (['°F', '°C'].includes(defaultUnit)) return 'celsius';
+      if (['°F', '°C', 'fahrenheit', 'celsius'].includes(defaultUnit)) return '°C';
       if (['kts', 'mph', 'm/s'].includes(defaultUnit)) return 'km/h';
       if (['in', 'mm', 'cm'].includes(defaultUnit)) return 'mm';
     }
-    if (['°F', '°C'].includes(defaultUnit)) return 'fahrenheit';
-    if (['kts', 'mph', 'm/s'].includes(defaultUnit)) return 'mph';
-    if (['in', 'mm', 'cm'].includes(defaultUnit)) return 'in';
+    if (system === 'imperial') {
+      if (['°F', '°C', 'fahrenheit', 'celsius'].includes(defaultUnit)) return '°F';
+      if (['kts', 'mph', 'm/s'].includes(defaultUnit)) return 'mph';
+      if (['in', 'mm', 'cm'].includes(defaultUnit)) return 'in';
+    }
     return defaultUnit;
   }
   _getGridIndexFromLngLat(lng, lat) {