@aguacerowx/react-native 0.0.39 → 0.0.42

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

@@ -1,126 +1,126 @@
-package com.aguacerowx.reactnative;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.SimpleViewManager;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import android.util.Log;
-
-import java.util.Map;
-import java.util.HashMap;
-
-public class GridRenderManager extends SimpleViewManager<GridRenderLayerView> {
-
-    private static final String REACT_CLASS = "GridRenderLayer";
-    private static final int COMMAND_UPDATE_DATA_TEXTURE = 1;
-    private static final int COMMAND_UPDATE_COLORMAP_TEXTURE = 2;
-    private static final int COMMAND_UPDATE_GEOMETRY = 3;
-    private static final int COMMAND_UPDATE_DATA_PARAMETERS = 4;
-    private static final int COMMAND_CLEAR = 5;
-    private static final int COMMAND_SET_VARIABLE = 6;
-
-    @NonNull
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @NonNull
-    @Override
-    protected GridRenderLayerView createViewInstance(@NonNull ThemedReactContext reactContext) {
-        return new GridRenderLayerView(reactContext);
-    }
-
-    @ReactProp(name = "opacity", defaultFloat = 1.0f)
-    public void setOpacity(GridRenderLayerView view, float opacity) {
-        view.setOpacity(opacity);
-    }
-
-    @ReactProp(name = "dataRange")
-    public void setDataRange(GridRenderLayerView view, @Nullable ReadableArray dataRange) {
-        if (dataRange != null && dataRange.size() == 2) {
-            float[] range = new float[]{
-                (float) dataRange.getDouble(0),
-                (float) dataRange.getDouble(1)
-            };
-            view.setDataRange(range);
-        }
-    }
-
-    @ReactProp(name = "belowID")
-    public void setBelowID(GridRenderLayerView view, @Nullable String belowID) {
-        view.setBelowID(belowID);
-    }
-
-    @ReactProp(name = "smoothing", defaultBoolean = true)
-    public void setSmoothing(GridRenderLayerView view, boolean enabled) {
-        view.setSmoothing(enabled);
-    }
-
-    @Override
-    public Map<String, Integer> getCommandsMap() {
-        Map<String, Integer> commands = new HashMap<>();
-        commands.put("updateDataTexture", COMMAND_UPDATE_DATA_TEXTURE);
-        commands.put("updateColormapTexture", COMMAND_UPDATE_COLORMAP_TEXTURE);
-        commands.put("updateGeometry", COMMAND_UPDATE_GEOMETRY);
-        commands.put("updateDataParameters", COMMAND_UPDATE_DATA_PARAMETERS);
-        commands.put("clear", COMMAND_CLEAR);
-        commands.put("setVariable", COMMAND_SET_VARIABLE);
-        return commands;
-    }
-
-    @Override
-    public void receiveCommand(@NonNull GridRenderLayerView view, int commandId, @Nullable ReadableArray args) {
-        switch (commandId) {
-            case COMMAND_UPDATE_DATA_TEXTURE:    
-                String data = args.getString(0);
-                int nx = args.getInt(1);
-                int ny = args.getInt(2);
-                float scale = (float) args.getDouble(3);
-                float offset = (float) args.getDouble(4);
-                float missing = (float) args.getDouble(5);
-                String scaleType = args.getString(6);
-
-                view.updateDataTexture(data, nx, ny, scale, offset, missing, scaleType);
-                break;
-
-            case COMMAND_UPDATE_COLORMAP_TEXTURE:
-                if (args != null && args.size() > 0) {
-                    String colormapBase64 = args.getString(0);
-                    view.updateColormapTexture(colormapBase64);
-                }
-                break;
-
-            case COMMAND_UPDATE_GEOMETRY:
-                if (args != null && args.size() >= 2) {
-                    ReadableMap corners = args.getMap(0);
-                    ReadableMap gridDef = args.getMap(1);
-                    view.updateGeometry(corners, gridDef);
-                }
-                break;
-
-            case COMMAND_UPDATE_DATA_PARAMETERS:
-                if (args != null && args.size() >= 3) {
-                    float scaleParam = (float) args.getDouble(0);
-                    float offsetParam = (float) args.getDouble(1);
-                    float missingParam = (float) args.getDouble(2);
-                    view.updateDataParameters(scaleParam, offsetParam, missingParam);
-                }
-                break;
-
-            case COMMAND_CLEAR:
-                view.clearData();
-                break;
-
-            case COMMAND_SET_VARIABLE:
-                if (args != null && args.size() > 0) {
-                    view.setVariable(args.getString(0));
-                }
-                break;
-        }
-    }
+package com.aguacerowx.reactnative;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.SimpleViewManager;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import android.util.Log;
+
+import java.util.Map;
+import java.util.HashMap;
+
+public class GridRenderManager extends SimpleViewManager<GridRenderLayerView> {
+
+    private static final String REACT_CLASS = "GridRenderLayer";
+    private static final int COMMAND_UPDATE_DATA_TEXTURE = 1;
+    private static final int COMMAND_UPDATE_COLORMAP_TEXTURE = 2;
+    private static final int COMMAND_UPDATE_GEOMETRY = 3;
+    private static final int COMMAND_UPDATE_DATA_PARAMETERS = 4;
+    private static final int COMMAND_CLEAR = 5;
+    private static final int COMMAND_SET_VARIABLE = 6;
+
+    @NonNull
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @NonNull
+    @Override
+    protected GridRenderLayerView createViewInstance(@NonNull ThemedReactContext reactContext) {
+        return new GridRenderLayerView(reactContext);
+    }
+
+    @ReactProp(name = "opacity", defaultFloat = 1.0f)
+    public void setOpacity(GridRenderLayerView view, float opacity) {
+        view.setOpacity(opacity);
+    }
+
+    @ReactProp(name = "dataRange")
+    public void setDataRange(GridRenderLayerView view, @Nullable ReadableArray dataRange) {
+        if (dataRange != null && dataRange.size() == 2) {
+            float[] range = new float[]{
+                (float) dataRange.getDouble(0),
+                (float) dataRange.getDouble(1)
+            };
+            view.setDataRange(range);
+        }
+    }
+
+    @ReactProp(name = "belowID")
+    public void setBelowID(GridRenderLayerView view, @Nullable String belowID) {
+        view.setBelowID(belowID);
+    }
+
+    @ReactProp(name = "smoothing", defaultBoolean = true)
+    public void setSmoothing(GridRenderLayerView view, boolean enabled) {
+        view.setSmoothing(enabled);
+    }
+
+    @Override
+    public Map<String, Integer> getCommandsMap() {
+        Map<String, Integer> commands = new HashMap<>();
+        commands.put("updateDataTexture", COMMAND_UPDATE_DATA_TEXTURE);
+        commands.put("updateColormapTexture", COMMAND_UPDATE_COLORMAP_TEXTURE);
+        commands.put("updateGeometry", COMMAND_UPDATE_GEOMETRY);
+        commands.put("updateDataParameters", COMMAND_UPDATE_DATA_PARAMETERS);
+        commands.put("clear", COMMAND_CLEAR);
+        commands.put("setVariable", COMMAND_SET_VARIABLE);
+        return commands;
+    }
+
+    @Override
+    public void receiveCommand(@NonNull GridRenderLayerView view, int commandId, @Nullable ReadableArray args) {
+        switch (commandId) {
+            case COMMAND_UPDATE_DATA_TEXTURE:    
+                String data = args.getString(0);
+                int nx = args.getInt(1);
+                int ny = args.getInt(2);
+                float scale = (float) args.getDouble(3);
+                float offset = (float) args.getDouble(4);
+                float missing = (float) args.getDouble(5);
+                String scaleType = args.getString(6);
+
+                view.updateDataTexture(data, nx, ny, scale, offset, missing, scaleType);
+                break;
+
+            case COMMAND_UPDATE_COLORMAP_TEXTURE:
+                if (args != null && args.size() > 0) {
+                    String colormapBase64 = args.getString(0);
+                    view.updateColormapTexture(colormapBase64);
+                }
+                break;
+
+            case COMMAND_UPDATE_GEOMETRY:
+                if (args != null && args.size() >= 2) {
+                    ReadableMap corners = args.getMap(0);
+                    ReadableMap gridDef = args.getMap(1);
+                    view.updateGeometry(corners, gridDef);
+                }
+                break;
+
+            case COMMAND_UPDATE_DATA_PARAMETERS:
+                if (args != null && args.size() >= 3) {
+                    float scaleParam = (float) args.getDouble(0);
+                    float offsetParam = (float) args.getDouble(1);
+                    float missingParam = (float) args.getDouble(2);
+                    view.updateDataParameters(scaleParam, offsetParam, missingParam);
+                }
+                break;
+
+            case COMMAND_CLEAR:
+                view.clearData();
+                break;
+
+            case COMMAND_SET_VARIABLE:
+                if (args != null && args.size() > 0) {
+                    view.setVariable(args.getString(0));
+                }
+                break;
+        }
+    }
 }

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

@@ -1,72 +1,146 @@
-package com.aguacerowx.reactnative;
-
-import androidx.annotation.NonNull;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-
-public class InspectorModule extends ReactContextBaseJavaModule {
-    
-    public InspectorModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "InspectorModule";
-    }
-
-    @ReactMethod
-    public void getValueAtGridIndex(int i, int j, Promise promise) {
-        try {
-            byte[] data = GridRenderLayerView.getLastDecompressedData();
-            if (data == null) {
-                promise.resolve(null);
-                return;
-            }
-            
-            int nx = GridRenderLayerView.getLastDataNx();
-            int ny = GridRenderLayerView.getLastDataNy();
-            float scale = GridRenderLayerView.getLastDataScale();
-            float offset = GridRenderLayerView.getLastDataOffset();
-            float missing = GridRenderLayerView.getLastDataMissing();
-            String scaleType = GridRenderLayerView.getLastDataScaleType();  // ADD THIS
-            
-            // Calculate index
-            int index = j * nx + i;
-            
-            // Bounds check
-            if (index < 0 || index >= data.length) {
-                promise.resolve(null);
-                return;
-            }
-            
-            // Read byte value
-            int byteValue = data[index] & 0xFF; // Convert to unsigned
-            int signedQuantizedValue = byteValue - 128;
-            int missingQuantized = Math.round(missing);  // CHANGED: removed -128 since missing is already adjusted
-            
-            // Check for missing value
-            if (Math.abs(signedQuantizedValue - missingQuantized) < 0.5) {  // CHANGED: use tolerance
-                promise.resolve(null);
-                return;
-            }
-            
-            // Step 1: Linear dequantization
-            double intermediateValue = signedQuantizedValue * scale + offset;
-            double finalValue = intermediateValue;
-            
-            // Step 2: Apply sqrt inverse transformation if needed (matching the shader)
-            if ("sqrt".equals(scaleType)) {
-                // Square the intermediate value while preserving sign
-                finalValue = intermediateValue * Math.abs(intermediateValue);
-            }
-            
-            promise.resolve(finalValue);
-        } catch (Exception e) {
-            promise.reject("ERROR", e.getMessage());
-        }
-    }
+package com.aguacerowx.reactnative;
+
+import androidx.annotation.NonNull;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.github.luben.zstd.Zstd;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class InspectorModule extends ReactContextBaseJavaModule {
+
+    private static final String TAG = "AguaceroWX_Perf";
+    private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+    // Cache the fully decoded array so we don't re-read disk + decompress on every inspector move
+    private final Object decodedCacheLock = new Object();
+    private byte[] cachedDecodedData = null;
+    private String cachedFilePath = null;
+    private int cachedNx = 0, cachedNy = 0;
+
+    public InspectorModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "InspectorModule";
+    }
+
+    @ReactMethod
+    public void getValueAtGridIndex(int i, int j, Promise promise) {
+        executor.execute(() -> {
+            long t0 = System.nanoTime();
+            try {
+                // Use the static fields already maintained by GridRenderLayerView
+                String filePath = GridRenderLayerView.getLastDataFilePath();
+                int nx = GridRenderLayerView.getLastDataNx();
+                int ny = GridRenderLayerView.getLastDataNy();
+                float scale = GridRenderLayerView.getLastDataScale();
+                float offset = GridRenderLayerView.getLastDataOffset();
+                float missing = GridRenderLayerView.getLastDataMissing();
+                String scaleType = GridRenderLayerView.getLastDataScaleType();
+
+                if (filePath == null) {
+                    promise.resolve(null);
+                    return;
+                }
+
+                int index = j * nx + i;
+                int totalSize = nx * ny;
+
+                if (index < 0 || index >= totalSize) {
+                    promise.resolve(null);
+                    return;
+                }
+
+                // Check if we can use the cached decoded array
+                byte[] decodedData;
+                synchronized (decodedCacheLock) {
+                    if (cachedDecodedData != null
+                            && filePath.equals(cachedFilePath)
+                            && cachedNx == nx
+                            && cachedNy == ny) {
+                        decodedData = cachedDecodedData;
+                        Log.d(TAG, "[Inspector] Cache HIT — skipped disk read + decompress");
+                    } else {
+                        long tDisk0 = System.nanoTime();
+                        File file = new File(filePath);
+                        if (!file.exists()) {
+                            promise.resolve(null);
+                            return;
+                        }
+                        byte[] compressedData = new byte[(int) file.length()];
+                        try (FileInputStream fis = new FileInputStream(file)) {
+                            fis.read(compressedData);
+                        }
+                        long tDisk1 = System.nanoTime();
+                        Log.d(TAG, "[Inspector] Disk read: " + ((tDisk1 - tDisk0) / 1_000_000) + " ms, size=" + compressedData.length + " bytes");
+
+                        long tDecomp0 = System.nanoTime();
+                        byte[] rawData = Zstd.decompress(compressedData, totalSize);
+                        long tDecomp1 = System.nanoTime();
+                        Log.d(TAG, "[Inspector] Zstd decompress: " + ((tDecomp1 - tDecomp0) / 1_000_000) + " ms");
+
+                        // Delta decode the entire array once and cache it
+                        long tDelta0 = System.nanoTime();
+                        byte[] fullDecoded = new byte[totalSize];
+                        fullDecoded[0] = rawData[0];
+                        for (int k = 1; k < totalSize; k++) {
+                            fullDecoded[k] = (byte) (fullDecoded[k - 1] + rawData[k]);
+                        }
+                        long tDelta1 = System.nanoTime();
+                        Log.d(TAG, "[Inspector] Delta decode (" + totalSize + " elements): " + ((tDelta1 - tDelta0) / 1_000_000) + " ms");
+                        Log.d(TAG, "[Inspector] Decoded array memory: " + (totalSize / 1024) + " KB");
+
+                        cachedDecodedData = fullDecoded;
+                        cachedFilePath = filePath;
+                        cachedNx = nx;
+                        cachedNy = ny;
+                        decodedData = fullDecoded;
+                    }
+                }
+
+                // O(1) lookup
+                byte raw = decodedData[index];
+                int unsignedValue = ((int) raw) + 128;
+                int missingQuantized = Math.round(missing);
+
+                if (Math.abs(unsignedValue - missingQuantized) < 1) {
+                    promise.resolve(null);
+                    return;
+                }
+
+                double intermediateValue = (double) raw * scale + offset;
+                double finalValue = "sqrt".equals(scaleType)
+                        ? intermediateValue * Math.abs(intermediateValue)
+                        : intermediateValue;
+
+                long t1 = System.nanoTime();
+                Log.d(TAG, "[Inspector] Total time: " + ((t1 - t0) / 1_000_000) + " ms");
+
+                promise.resolve(finalValue);
+
+            } catch (Exception e) {
+                Log.e(TAG, "[Inspector] Exception: " + e.getMessage(), e);
+                promise.resolve(null);
+            }
+        });
+    }
+
+    /** Invalidate cache when the active dataset changes */
+    public void invalidateCache() {
+        synchronized (decodedCacheLock) {
+            cachedDecodedData = null;
+            cachedFilePath = null;
+            Log.d(TAG, "[Inspector] Cache invalidated");
+        }
+    }
 }