@aguacerowx/react-native 0.0.41 → 0.0.42

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

@@ -1,305 +1,233 @@
-package com.aguacerowx.reactnative;
-
-import android.app.Activity;
-import android.util.Base64;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.mapbox.maps.LayerPosition;
-import com.mapbox.maps.MapView;
-import com.mapbox.maps.MapboxMap;
-import com.mapbox.maps.Style;
-
-// ADD THIS IMPORT
-import com.github.luben.zstd.Zstd;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.nio.ByteBuffer;
-
-public class GridRenderLayerView extends FrameLayout {
-
-    private final GridRenderLayer gridLayerImplementation;
-    private final String LAYER_ID = "weather-layer-" + getId();
-    private static final String TAG = "AguaceroWX";
-    private MapView mapView;
-    private boolean isLayerAdded = false;
-    private String belowLayerID = null;
-    private static byte[] lastDecompressedData = null;
-    private static int lastDataNx = 0;
-    private static int lastDataNy = 0;
-    private static float lastDataScale = 1.0f;
-    private static float lastDataOffset = 0.0f;
-    private static float lastDataMissing = 127.0f;
-    private static String lastDataScaleType = "linear";
-
-    public GridRenderLayerView(@NonNull ThemedReactContext context) {
-        super(context);
-        this.gridLayerImplementation = new GridRenderLayer(context);
-    }
-
-    public static String getLastDataScaleType() {
-        return lastDataScaleType;
-    }
-    
-    public void updateDataTexture(String dataFilePathOrBase64, int nx, int ny, float scale, float offset, float missing, String scaleType) {
-        if (dataFilePathOrBase64 == null) {
-            Log.e(TAG, "❌ [View] Data from manager is null!");
-            return;
-        }
-
-        if (!isLayerAdded) {
-            findMapViewAndAddLayer();
-        }
-
-        try {
-            byte[] compressedData;
-            if (dataFilePathOrBase64.startsWith("/")) {
-                File file = new File(dataFilePathOrBase64);
-                try (FileInputStream fis = new FileInputStream(file)) {
-                    compressedData = new byte[(int) file.length()];
-                    fis.read(compressedData);
-                }
-            } else {
-                compressedData = Base64.decode(dataFilePathOrBase64, Base64.DEFAULT);
-            }
-
-            int expectedLength = nx * ny;
-            byte[] decompressedDeltas = Zstd.decompress(compressedData, expectedLength);
-            byte[] reconstructedData = reconstructData(decompressedDeltas, expectedLength);
-            byte[] finalTextureBytes = transformData(reconstructedData);
-
-            // CACHE the decompressed, transformed data for the inspector
-            lastDecompressedData = finalTextureBytes;
-            lastDataNx = nx;
-            lastDataNy = ny;
-            lastDataScale = scale;
-            lastDataOffset = offset;
-            lastDataMissing = missing;
-            lastDataScaleType = scaleType; // FIX: Update the cached scaleType
-
-            gridLayerImplementation.updateDataTexture(finalTextureBytes, nx, ny, scale, offset, missing, scaleType);
-            triggerRepaint();
-
-        } catch (Exception e) {
-            Log.e(TAG, "❌❌❌ [View] CRITICAL ERROR during data processing: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-    
-    // Add a method to get the cached data
-    public static byte[] getLastDecompressedData() {
-        return lastDecompressedData;
-    }
-    
-    public static int getLastDataNx() {
-        return lastDataNx;
-    }
-    
-    public static int getLastDataNy() {
-        return lastDataNy;
-    }
-    
-    public static float getLastDataScale() {
-        return lastDataScale;
-    }
-    
-    public static float getLastDataOffset() {
-        return lastDataOffset;
-    }
-    
-    public static float getLastDataMissing() {
-        return lastDataMissing;
-    }
-
-    public void setBelowID(String belowID) {
-        this.belowLayerID = belowID;
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-        // It's often more reliable to trigger map search here
-        findMapViewAndAddLayer();
-    }
-
-    @Override
-    public void onViewAdded(View child) {
-        super.onViewAdded(child);
-    }
-
-    private void findMapViewAndAddLayer() {
-        if (isLayerAdded) {
-            return;
-        }
-
-        Activity activity = ((ThemedReactContext) getContext()).getCurrentActivity();
-        if (activity == null) {
-            Log.e(TAG, "❌ [View] Could not find current Activity to search for MapView.");
-            return;
-        }
-
-        View rootView = activity.findViewById(android.R.id.content);
-        if (rootView == null) {
-            Log.e(TAG, "❌ [View] Could not find root view of the Activity.");
-            return;
-        }
-
-        MapView foundMap = findMapViewRecursive(rootView);
-
-        if (foundMap != null) {
-            this.mapView = foundMap;
-            final MapboxMap mapboxMap = mapView.getMapboxMap();
-
-            Style.OnStyleLoaded styleLoadedCallback = style -> {
-                if (!isLayerAdded && !style.styleLayerExists(LAYER_ID)) {
-                    LayerPosition position = null;
-                    if (this.belowLayerID != null && !this.belowLayerID.isEmpty()) {
-                        if (style.styleLayerExists(this.belowLayerID)) {
-                            position = new LayerPosition(null, this.belowLayerID, null);
-                        } else {
-                            Log.w(TAG, "⚠️ [View] Target layer '" + this.belowLayerID + "' NOT FOUND. Adding layer on top as a fallback.");
-                        }
-                    }
-                    style.addStyleCustomLayer(LAYER_ID, gridLayerImplementation, position);
-                    isLayerAdded = true;
-                    triggerRepaint();
-                }
-            };
-
-            Style currentStyle = mapboxMap.getStyle();
-            if (currentStyle != null && currentStyle.isStyleLoaded()) {
-                styleLoadedCallback.onStyleLoaded(currentStyle);
-            } else {
-                mapboxMap.getStyle(styleLoadedCallback);
-            }
-
-        } else {
-            Log.e(TAG, "❌❌❌ [View] FAILED to find MapView after searching from the root view! ❌❌❌");
-        }
-    }
-
-    private MapView findMapViewRecursive(View view) {
-        if (view instanceof MapView) {
-            return (MapView) view;
-        }
-        if (view instanceof ViewGroup) {
-            ViewGroup viewGroup = (ViewGroup) view;
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                MapView found = findMapViewRecursive(viewGroup.getChildAt(i));
-                if (found != null) {
-                    return found;
-                }
-            }
-        }
-        return null;
-    }
-
-    private void triggerRepaint() {
-        if (mapView != null) {
-            mapView.post(mapView.getMapboxMap()::triggerRepaint);
-        }
-    }
-
-    public void setOpacity(float opacity) {
-        gridLayerImplementation.setOpacity(opacity);
-        triggerRepaint();
-    }
-
-    public void setSmoothing(boolean enabled) {
-        gridLayerImplementation.setSmoothing(enabled);
-        triggerRepaint();
-    }
-
-    public void setDataRange(float[] range) {
-        gridLayerImplementation.setDataRange(range);
-        triggerRepaint();
-    }
-
-    public void setConversionType(int conversionType) {
-        gridLayerImplementation.setConversionType(conversionType);
-        triggerRepaint();
-    }
-
-    public void updateColormapTexture(String colormapAsBase64) {
-        if (colormapAsBase64 == null) {
-            return;
-        }
-        if (!isLayerAdded) {
-            findMapViewAndAddLayer();
-        }
-
-        byte[] bytes = Base64.decode(colormapAsBase64, Base64.DEFAULT);
-        ByteBuffer colormapBuffer = ByteBuffer.allocateDirect(bytes.length);
-        colormapBuffer.put(bytes);
-        colormapBuffer.position(0);
-        gridLayerImplementation.updateColormapTexture(colormapBuffer);
-    }
-
-    public void updateGeometry(ReadableMap corners, ReadableMap gridDef) {
-        if (!isLayerAdded) {
-            findMapViewAndAddLayer();
-        }
-        gridLayerImplementation.updateGeometry(corners, gridDef);
-        triggerRepaint();
-    }
-
-    /**
-     * Reconstructs the full data array from the delta-encoded values.
-     * @param decompressedDeltas The array of deltas.
-     * @param expectedLength The total size of the final grid.
-     * @return The fully reconstructed data array.
-     */
-    private byte[] reconstructData(byte[] decompressedDeltas, int expectedLength) {
-        byte[] reconstructedData = new byte[expectedLength];
-        if (decompressedDeltas.length > 0 && expectedLength > 0) {
-            reconstructedData[0] = decompressedDeltas[0];
-            for (int i = 1; i < expectedLength; i++) {
-                reconstructedData[i] = (byte) (reconstructedData[i - 1] + decompressedDeltas[i]);
-            }
-        }
-        return reconstructedData;
-    }
-
-    /**
-     * Transforms the signed byte data (-128 to 127) to unsigned byte data (0 to 255)
-     * suitable for an ALPHA texture.
-     * @param finalData The reconstructed data array.
-     * @return The transformed data array ready for the GPU.
-     */
-    private byte[] transformData(byte[] finalData) {
-        byte[] transformedData = new byte[finalData.length];
-        for (int i = 0; i < finalData.length; i++) {
-            transformedData[i] = (byte) (finalData[i] + 128);
-        }
-        return transformedData;
-    }
-
-    // Add this method to GridRenderLayerView.java
-    public void updateDataParameters(float scale, float offset, float missing) {
-        // Update the cached values for the inspector
-        lastDataScale = scale;
-        lastDataOffset = offset;
-        lastDataMissing = missing;
-        
-        // CRITICAL FIX: Also update the GridRenderLayer implementation
-        gridLayerImplementation.updateDataParameters(scale, offset, missing);
-    }
-
-    public void clearData() {
-        gridLayerImplementation.clearData();
-        triggerRepaint();
-    }
-
-    public void setVariable(String variable) {
-        gridLayerImplementation.setVariable(variable);
-        triggerRepaint();
-    }
+package com.aguacerowx.reactnative;
+
+import android.app.Activity;
+import android.util.Base64;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.mapbox.maps.LayerPosition;
+import com.mapbox.maps.MapView;
+import com.mapbox.maps.MapboxMap;
+import com.mapbox.maps.Style;
+
+import com.github.luben.zstd.Zstd;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+public class GridRenderLayerView extends FrameLayout {
+
+    private final GridRenderLayer gridLayerImplementation;
+    private final String LAYER_ID = "weather-layer-" + getId();
+    private static final String TAG = "AguaceroWX";
+    private MapView mapView;
+    private boolean isLayerAdded = false;
+    private String belowLayerID = null;
+
+    // We keep track of these for the inspector, but NOT the full byte array
+    private static int lastDataNx = 0;
+    private static int lastDataNy = 0;
+    private static float lastDataScale = 1.0f;
+    private static float lastDataOffset = 0.0f;
+    private static float lastDataMissing = 127.0f;
+    private static String lastDataScaleType = "linear";
+    
+    // Store the last file path if we need to re-read for inspector (IOS Parity approach)
+    private static String lastDataFilePath = null;
+
+    public GridRenderLayerView(@NonNull ThemedReactContext context) {
+        super(context);
+        this.gridLayerImplementation = new GridRenderLayer(context);
+    }
+
+    public void updateDataTexture(String dataFilePathOrBase64, int nx, int ny, float scale, float offset, float missing, String scaleType) {
+        if (dataFilePathOrBase64 == null) {
+            return;
+        }
+
+        if (!isLayerAdded) {
+            findMapViewAndAddLayer();
+        }
+
+        try {
+            byte[] compressedData;
+            boolean isFile = dataFilePathOrBase64.startsWith("/");
+
+            if (isFile) {
+                lastDataFilePath = dataFilePathOrBase64; // Store path for inspector if needed later
+                File file = new File(dataFilePathOrBase64);
+                try (FileInputStream fis = new FileInputStream(file)) {
+                    compressedData = new byte[(int) file.length()];
+                    fis.read(compressedData);
+                }
+            } else {
+                lastDataFilePath = null;
+                compressedData = Base64.decode(dataFilePathOrBase64, Base64.DEFAULT);
+            }
+
+            int expectedLength = nx * ny;
+            
+            // 1. Decompress (This is the only necessary intermediate allocation)
+            byte[] decompressedDeltas = Zstd.decompress(compressedData, expectedLength);
+            
+            // 2. Process directly into DirectByteBuffer
+            // This avoids creating 2 extra Java Byte Arrays (saving massive GC churn)
+            ByteBuffer gpuBuffer = processDataDirectly(decompressedDeltas, expectedLength);
+
+            // Update Metadata for Inspector
+            lastDataNx = nx;
+            lastDataNy = ny;
+            lastDataScale = scale;
+            lastDataOffset = offset;
+            lastDataMissing = missing;
+            lastDataScaleType = scaleType;
+
+            // 3. Send to Layer (Pass the buffer directly, do not copy it again in the Layer)
+            gridLayerImplementation.updateDataTexture(gpuBuffer, nx, ny, scale, offset, missing, scaleType);
+            triggerRepaint();
+
+        } catch (Exception e) {
+            Log.e(TAG, "❌ [View] Error processing data: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * OPTIMIZATION: Combines Reconstruction (Delta Decoding) and Transformation (+128)
+     * and writes directly to a Native ByteBuffer.
+     */
+    private ByteBuffer processDataDirectly(byte[] deltas, int length) {
+        // Allocate direct memory immediately for OpenGL (Native Heap, not Java Heap)
+        ByteBuffer buffer = ByteBuffer.allocateDirect(length);
+        buffer.order(ByteOrder.nativeOrder());
+        
+        if (length > 0) {
+            byte previous = 0;
+            // First pixel
+            previous = deltas[0];
+            buffer.put((byte)(previous + 128));
+            
+            // Rest of pixels
+            for (int i = 1; i < length; i++) {
+                previous = (byte) (previous + deltas[i]);
+                buffer.put((byte)(previous + 128));
+            }
+        }
+        
+        buffer.position(0);
+        return buffer;
+    }
+
+    // --- Accessors for Inspector (Meta data only) ---
+    public static int getLastDataNx() { return lastDataNx; }
+    public static int getLastDataNy() { return lastDataNy; }
+    public static float getLastDataScale() { return lastDataScale; }
+    public static float getLastDataOffset() { return lastDataOffset; }
+    public static float getLastDataMissing() { return lastDataMissing; }
+    public static String getLastDataScaleType() { return lastDataScaleType; }
+    public static String getLastDataFilePath() { return lastDataFilePath; }
+
+    // --- Standard View Methods ---
+
+    public void setBelowID(String belowID) { this.belowLayerID = belowID; }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        findMapViewAndAddLayer();
+    }
+
+    private void findMapViewAndAddLayer() {
+        if (isLayerAdded) return;
+        Activity activity = ((ThemedReactContext) getContext()).getCurrentActivity();
+        if (activity == null) return;
+        View rootView = activity.findViewById(android.R.id.content);
+        if (rootView == null) return;
+        MapView foundMap = findMapViewRecursive(rootView);
+
+        if (foundMap != null) {
+            this.mapView = foundMap;
+            final MapboxMap mapboxMap = mapView.getMapboxMap();
+            Style.OnStyleLoaded styleLoadedCallback = style -> {
+                if (!isLayerAdded && !style.styleLayerExists(LAYER_ID)) {
+                    LayerPosition position = null;
+                    if (this.belowLayerID != null && style.styleLayerExists(this.belowLayerID)) {
+                        position = new LayerPosition(null, this.belowLayerID, null);
+                    }
+                    style.addStyleCustomLayer(LAYER_ID, gridLayerImplementation, position);
+                    isLayerAdded = true;
+                    triggerRepaint();
+                }
+            };
+            Style currentStyle = mapboxMap.getStyle();
+            if (currentStyle != null && currentStyle.isStyleLoaded()) {
+                styleLoadedCallback.onStyleLoaded(currentStyle);
+            } else {
+                mapboxMap.getStyle(styleLoadedCallback);
+            }
+        }
+    }
+
+    private MapView findMapViewRecursive(View view) {
+        if (view instanceof MapView) return (MapView) view;
+        if (view instanceof ViewGroup) {
+            ViewGroup viewGroup = (ViewGroup) view;
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                MapView found = findMapViewRecursive(viewGroup.getChildAt(i));
+                if (found != null) return found;
+            }
+        }
+        return null;
+    }
+
+    private void triggerRepaint() {
+        if (mapView != null) mapView.post(mapView.getMapboxMap()::triggerRepaint);
+    }
+
+    public void setOpacity(float opacity) { gridLayerImplementation.setOpacity(opacity); triggerRepaint(); }
+    public void setSmoothing(boolean enabled) { gridLayerImplementation.setSmoothing(enabled); triggerRepaint(); }
+    public void setDataRange(float[] range) { gridLayerImplementation.setDataRange(range); triggerRepaint(); }
+    public void setConversionType(int conversionType) { gridLayerImplementation.setConversionType(conversionType); triggerRepaint(); }
+    
+    public void updateColormapTexture(String colormapAsBase64) {
+        if (colormapAsBase64 == null) return;
+        if (!isLayerAdded) findMapViewAndAddLayer();
+        byte[] bytes = Base64.decode(colormapAsBase64, Base64.DEFAULT);
+        ByteBuffer colormapBuffer = ByteBuffer.allocateDirect(bytes.length);
+        colormapBuffer.put(bytes);
+        colormapBuffer.position(0);
+        gridLayerImplementation.updateColormapTexture(colormapBuffer);
+    }
+
+    public void updateGeometry(ReadableMap corners, ReadableMap gridDef) {
+        if (!isLayerAdded) findMapViewAndAddLayer();
+        gridLayerImplementation.updateGeometry(corners, gridDef);
+        triggerRepaint();
+    }
+
+    public void updateDataParameters(float scale, float offset, float missing) {
+        lastDataScale = scale;
+        lastDataOffset = offset;
+        lastDataMissing = missing;
+        gridLayerImplementation.updateDataParameters(scale, offset, missing);
+    }
+
+    public void clearData() {
+        gridLayerImplementation.clearData();
+        triggerRepaint();
+    }
+
+    public void setVariable(String variable) {
+        gridLayerImplementation.setVariable(variable);
+        triggerRepaint();
+    }
 }