@aguacerowx/react-native 0.0.31 → 0.0.33

package/src/WeatherLayerManager.js

@@ -1,7 +1,7 @@
 // packages/react-native/src/WeatherLayerManager.js
 
 import React, { useState, useRef, useContext, useEffect, forwardRef, useImperativeHandle, useMemo } from 'react';
-import { AguaceroCore, getUnitConversionFunction } from '@aguacerowx/javascript-sdk';
+import { AguaceroCore, getUnitConversionFunction, DICTIONARIES } from '@aguacerowx/javascript-sdk';
 import { AguaceroContext } from './AguaceroContext';
 import { GridRenderLayer } from './GridRenderLayer';
 import { fromByteArray } from 'base64-js';
@@ -81,6 +81,7 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
         initialVariable,
         autoRefresh,        
         autoRefreshInterval,  
+        initialModel,
         ...restProps 
     } = props;
     const context = useContext(AguaceroContext);
@@ -92,7 +93,8 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
         // ADD: Pass layerOptions to the core's constructor
         layerOptions: {
             mode: initialMode,
-            variable: initialVariable
+            variable: initialVariable,
+            model: initialModel
         }
     }), [apiKey]);
     
@@ -246,7 +248,6 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
         // Double-check currentFrame is valid
         if (currentFrame == null) {
             hasPreloadedRef.current = false;
-            return;
         }
 
         // Reverse the frame order to load from last to first
@@ -282,13 +283,38 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
                 }
                 
                 const { baseUnit } = core._getColormapForVariable(variable);
-                const toUnit = core._getTargetUnit(baseUnit, units);
                 
+                const toUnit = core._getTargetUnit(baseUnit, units);
+
+                const fieldInfo = DICTIONARIES?.fld?.[variable] || {};
+                const serverDataUnit = fieldInfo.defaultUnit || baseUnit;
+
                 let dataScale = result.scale;
                 let dataOffset = result.offset;
-                
+
                 let convertedScale = dataScale;
                 let convertedOffset = dataOffset;
+
+                if (serverDataUnit !== baseUnit) {
+                    const conversionFunc = getUnitConversionFunction(serverDataUnit, baseUnit);
+                    if (conversionFunc) {
+                        if (result.scaleType === 'sqrt') {
+                            const physicalAtOffset = dataOffset * dataOffset;
+                            const physicalAtOffsetPlusScale = (dataOffset + dataScale) * (dataOffset + dataScale);
+                            const convertedPhysicalAtOffset = conversionFunc(physicalAtOffset);
+                            const convertedPhysicalAtOffsetPlusScale = conversionFunc(physicalAtOffsetPlusScale);
+                            convertedOffset = Math.sqrt(Math.abs(convertedPhysicalAtOffset)) * Math.sign(convertedPhysicalAtOffset);
+                            const newOffsetPlusScale = Math.sqrt(Math.abs(convertedPhysicalAtOffsetPlusScale)) * Math.sign(convertedPhysicalAtOffsetPlusScale);
+                            convertedScale = newOffsetPlusScale - convertedOffset;
+                        } else {
+                            convertedOffset = conversionFunc(dataOffset);
+                            const convertedOffsetPlusScale = conversionFunc(dataOffset + dataScale);
+                            convertedScale = convertedOffsetPlusScale - convertedOffset;
+                        }
+                        dataScale = convertedScale;
+                        dataOffset = convertedOffset;
+                    }
+                }
                 
                 if (baseUnit !== toUnit) {
                     const conversionFunc = getUnitConversionFunction(baseUnit, toUnit);
@@ -307,7 +333,7 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
                             convertedScale = convertedOffsetPlusScale - convertedOffset;
                         }
                     }
-                }
+                } 
                 
                 const frameData = {
                     filePath: result.filePath,
@@ -346,7 +372,6 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
             } catch (error) {
                 console.warn(`⚠️ [preloadAllFramesToDisk] Failed frame ${currentFrame}:`, error);
                 hasPreloadedRef.current = false;
-                return;
             }
         }
 
@@ -378,8 +403,11 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
                         return;
                     }
                     
+                    // ADD: Same two-step conversion as the current frame
                     const { baseUnit } = core._getColormapForVariable(variable);
                     const toUnit = core._getTargetUnit(baseUnit, units);
+                    const fieldInfo = DICTIONARIES?.fld?.[variable] || {};
+                    const serverDataUnit = fieldInfo.defaultUnit || baseUnit;
                     
                     let dataScale = result.scale;
                     let dataOffset = result.offset;
@@ -387,6 +415,29 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
                     let convertedScale = dataScale;
                     let convertedOffset = dataOffset;
                     
+                    // Step 1: Convert from server unit to colormap base unit
+                    if (serverDataUnit !== baseUnit) {
+                        const conversionFunc = getUnitConversionFunction(serverDataUnit, baseUnit);
+                        if (conversionFunc) {
+                            if (result.scaleType === 'sqrt') {
+                                const physicalAtOffset = dataOffset * dataOffset;
+                                const physicalAtOffsetPlusScale = (dataOffset + dataScale) * (dataOffset + dataScale);
+                                const convertedPhysicalAtOffset = conversionFunc(physicalAtOffset);
+                                const convertedPhysicalAtOffsetPlusScale = conversionFunc(physicalAtOffsetPlusScale);
+                                convertedOffset = Math.sqrt(Math.abs(convertedPhysicalAtOffset)) * Math.sign(convertedPhysicalAtOffset);
+                                const newOffsetPlusScale = Math.sqrt(Math.abs(convertedPhysicalAtOffsetPlusScale)) * Math.sign(convertedPhysicalAtOffsetPlusScale);
+                                convertedScale = newOffsetPlusScale - convertedOffset;
+                            } else {
+                                convertedOffset = conversionFunc(dataOffset);
+                                const convertedOffsetPlusScale = conversionFunc(dataOffset + dataScale);
+                                convertedScale = convertedOffsetPlusScale - convertedOffset;
+                            }
+                            dataScale = convertedScale;
+                            dataOffset = convertedOffset;
+                        }
+                    }
+                    
+                    // Step 2: Convert from colormap base unit to target display unit
                     if (baseUnit !== toUnit) {
                         const conversionFunc = getUnitConversionFunction(baseUnit, toUnit);
                         if (conversionFunc) {
@@ -815,9 +866,33 @@ export const WeatherLayerManager = forwardRef((props, ref) => {
                 if (cachedData && cachedData.originalScale !== undefined && cachedData.originalOffset !== undefined) {
                     const { baseUnit } = core._getColormapForVariable(variable);
                     const toUnit = core._getTargetUnit(baseUnit, units);
+                    const fieldInfo = DICTIONARIES?.fld?.[variable] || {};
+                    const serverDataUnit = fieldInfo.defaultUnit || baseUnit;
+                    
                     let dataScale = cachedData.originalScale;
                     let dataOffset = cachedData.originalOffset;
                     
+                    if (serverDataUnit !== baseUnit) {
+                        const conversionFunc = getUnitConversionFunction(serverDataUnit, baseUnit);
+                        if (conversionFunc) {
+                            if (cachedData.scaleType === 'sqrt') {
+                                const physicalAtOffset = dataOffset * dataOffset;
+                                const physicalAtOffsetPlusScale = (dataOffset + dataScale) * (dataOffset + dataScale);
+                                const convertedPhysicalAtOffset = conversionFunc(physicalAtOffset);
+                                const convertedPhysicalAtOffsetPlusScale = conversionFunc(physicalAtOffsetPlusScale);
+                                const newOffset = Math.sqrt(Math.abs(convertedPhysicalAtOffset)) * Math.sign(convertedPhysicalAtOffset);
+                                const newOffsetPlusScale = Math.sqrt(Math.abs(convertedPhysicalAtOffsetPlusScale)) * Math.sign(convertedPhysicalAtOffsetPlusScale);
+                                dataScale = newOffsetPlusScale - newOffset;
+                                dataOffset = newOffset;
+                            } else {
+                                const convertedOffset = conversionFunc(dataOffset);
+                                const convertedOffsetPlusScale = conversionFunc(dataOffset + dataScale);
+                                dataScale = convertedOffsetPlusScale - convertedOffset;
+                                dataOffset = convertedOffset;
+                            }
+                        }
+                    }
+                    
                     if (baseUnit !== toUnit) {
                         const conversionFunc = getUnitConversionFunction(baseUnit, toUnit);
                         if (conversionFunc) {