@aguacerowx/react-native 0.0.20 → 0.0.21

package/lib/module/android/src/main/java/com/aguacerowx/reactnative/WeatherFrameProcessorModule.java

@@ -1,152 +1,152 @@
-package com.aguacerowx.reactnative;
-
-import androidx.annotation.NonNull;
-import android.util.Base64;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Promise;  // CHANGED: Import Promise instead of Callback
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.network.OkHttpClientProvider; 
-import android.util.Log;
-
-import org.json.JSONObject;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-
-public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
-
-    private final ExecutorService executorService;
-    private volatile int currentRunToken = 0;
-    private final ReactApplicationContext reactContext;
-
-    WeatherFrameProcessorModule(ReactApplicationContext context) {
-        super(context);
-        this.reactContext = context;
-        
-        int coreCount = Runtime.getRuntime().availableProcessors();
-        int optimalWorkerCount = Math.max(4, Math.min(coreCount - 1, 8));
-
-        this.executorService = Executors.newFixedThreadPool(optimalWorkerCount);
-        android.util.Log.d("AguaceroWX", "Initialized with " + optimalWorkerCount + " workers (" + coreCount + " cores available)");
-    }
-
-    @ReactMethod
-    public void cancelAllFrames() {
-        currentRunToken++;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "WeatherFrameProcessorModule";
-    }
-
-    @ReactMethod
-    public void processFrame(ReadableMap options, Promise promise) {  // CHANGED: Use Promise instead of Callback
-        final int taskToken = this.currentRunToken;
-        executorService.execute(() -> {
-            FileOutputStream fos = null;
-            try {
-                if (taskToken != this.currentRunToken) {
-                    return; // Task was cancelled
-                }
-
-                OkHttpClient client = OkHttpClientProvider.getOkHttpClient();
-
-                String urlString = options.getString("url");
-                String apiKey = options.getString("apiKey");
-                String bundleId = options.getString("bundleId");
-
-                Request.Builder requestBuilder = new Request.Builder()
-                        .url(urlString)
-                        .header("x-api-key", apiKey);
-
-                if (bundleId != null) {
-                    requestBuilder.header("x-app-identifier", bundleId);
-                }
-                
-                Request request = requestBuilder.build();
-
-                String responseString;
-                try (Response response = client.newCall(request).execute()) {
-                    if (!response.isSuccessful()) {
-                        throw new IOException("HTTP Error: " + response.code());
-                    }
-                    
-                    ResponseBody body = response.body();
-                    if (body == null) {
-                        throw new IOException("Response body was null");
-                    }
-                    responseString = body.string();
-                }
-
-                JSONObject jsonResponse = new JSONObject(responseString);
-                if (!jsonResponse.has("data") || !jsonResponse.has("encoding")) {
-                    throw new IOException("Invalid API response. 'data' or 'encoding' key is missing. Response: " + responseString);
-                }
-
-                String b64CompressedData = jsonResponse.getString("data");
-                JSONObject encoding = jsonResponse.getJSONObject("encoding");
-
-                if (!encoding.has("scale") || !encoding.has("offset") || !encoding.has("missing_quantized")) {
-                    throw new IOException("Invalid 'encoding' object in API response. Required keys are missing. Response: " + responseString);
-                }
-
-                byte[] compressedData = Base64.decode(b64CompressedData, Base64.DEFAULT);
-
-                File cacheDir = reactContext.getCacheDir();
-                String fileName = "frame_" + urlString.hashCode() + ".zst";
-                File dataFile = new File(cacheDir, fileName);
-                
-                fos = new FileOutputStream(dataFile);
-                fos.write(compressedData);
-                fos.flush();
-                fos.close();
-                fos = null;
-
-                WritableMap responseMap = Arguments.createMap();
-                responseMap.putString("filePath", dataFile.getAbsolutePath());
-                responseMap.putDouble("scale", encoding.getDouble("scale"));
-                responseMap.putDouble("offset", encoding.getDouble("offset"));
-                responseMap.putDouble("missing", encoding.getDouble("missing_quantized"));
-                if (encoding.has("scale_type")) {
-                    responseMap.putString("scaleType", encoding.getString("scale_type"));
-                }
-                responseMap.putString("dataAsBase64", b64CompressedData);
-
-                promise.resolve(responseMap);  // CHANGED: Use promise.resolve() instead of callback
-
-            } catch (Exception e) {
-                if (taskToken == this.currentRunToken) {
-                    android.util.Log.e("AguaceroWX", "Error processing frame", e);
-                    promise.reject("PROCESSING_ERROR", e.getMessage(), e);  // CHANGED: Use promise.reject() instead of callback
-                }
-            } finally {
-                if (fos != null) {
-                    try {
-                        fos.close();
-                    } catch (IOException e) {
-                        android.util.Log.e("AguaceroWX", "Error closing file stream", e);
-                    }
-                }
-            }
-        });
-    }
+package com.aguacerowx.reactnative;
+
+import androidx.annotation.NonNull;
+import android.util.Base64;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;  // CHANGED: Import Promise instead of Callback
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.network.OkHttpClientProvider; 
+import android.util.Log;
+
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+
+public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
+
+    private final ExecutorService executorService;
+    private volatile int currentRunToken = 0;
+    private final ReactApplicationContext reactContext;
+
+    WeatherFrameProcessorModule(ReactApplicationContext context) {
+        super(context);
+        this.reactContext = context;
+        
+        int coreCount = Runtime.getRuntime().availableProcessors();
+        int optimalWorkerCount = Math.max(4, Math.min(coreCount - 1, 8));
+
+        this.executorService = Executors.newFixedThreadPool(optimalWorkerCount);
+        android.util.Log.d("AguaceroWX", "Initialized with " + optimalWorkerCount + " workers (" + coreCount + " cores available)");
+    }
+
+    @ReactMethod
+    public void cancelAllFrames() {
+        currentRunToken++;
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "WeatherFrameProcessorModule";
+    }
+
+    @ReactMethod
+    public void processFrame(ReadableMap options, Promise promise) {  // CHANGED: Use Promise instead of Callback
+        final int taskToken = this.currentRunToken;
+        executorService.execute(() -> {
+            FileOutputStream fos = null;
+            try {
+                if (taskToken != this.currentRunToken) {
+                    return; // Task was cancelled
+                }
+
+                OkHttpClient client = OkHttpClientProvider.getOkHttpClient();
+
+                String urlString = options.getString("url");
+                String apiKey = options.getString("apiKey");
+                String bundleId = options.getString("bundleId");
+
+                Request.Builder requestBuilder = new Request.Builder()
+                        .url(urlString)
+                        .header("x-api-key", apiKey);
+
+                if (bundleId != null) {
+                    requestBuilder.header("x-app-identifier", bundleId);
+                }
+                
+                Request request = requestBuilder.build();
+
+                String responseString;
+                try (Response response = client.newCall(request).execute()) {
+                    if (!response.isSuccessful()) {
+                        throw new IOException("HTTP Error: " + response.code());
+                    }
+                    
+                    ResponseBody body = response.body();
+                    if (body == null) {
+                        throw new IOException("Response body was null");
+                    }
+                    responseString = body.string();
+                }
+
+                JSONObject jsonResponse = new JSONObject(responseString);
+                if (!jsonResponse.has("data") || !jsonResponse.has("encoding")) {
+                    throw new IOException("Invalid API response. 'data' or 'encoding' key is missing. Response: " + responseString);
+                }
+
+                String b64CompressedData = jsonResponse.getString("data");
+                JSONObject encoding = jsonResponse.getJSONObject("encoding");
+
+                if (!encoding.has("scale") || !encoding.has("offset") || !encoding.has("missing_quantized")) {
+                    throw new IOException("Invalid 'encoding' object in API response. Required keys are missing. Response: " + responseString);
+                }
+
+                byte[] compressedData = Base64.decode(b64CompressedData, Base64.DEFAULT);
+
+                File cacheDir = reactContext.getCacheDir();
+                String fileName = "frame_" + urlString.hashCode() + ".zst";
+                File dataFile = new File(cacheDir, fileName);
+                
+                fos = new FileOutputStream(dataFile);
+                fos.write(compressedData);
+                fos.flush();
+                fos.close();
+                fos = null;
+
+                WritableMap responseMap = Arguments.createMap();
+                responseMap.putString("filePath", dataFile.getAbsolutePath());
+                responseMap.putDouble("scale", encoding.getDouble("scale"));
+                responseMap.putDouble("offset", encoding.getDouble("offset"));
+                responseMap.putDouble("missing", encoding.getDouble("missing_quantized"));
+                if (encoding.has("scale_type")) {
+                    responseMap.putString("scaleType", encoding.getString("scale_type"));
+                }
+                responseMap.putString("dataAsBase64", b64CompressedData);
+
+                promise.resolve(responseMap);  // CHANGED: Use promise.resolve() instead of callback
+
+            } catch (Exception e) {
+                if (taskToken == this.currentRunToken) {
+                    android.util.Log.e("AguaceroWX", "Error processing frame", e);
+                    promise.reject("PROCESSING_ERROR", e.getMessage(), e);  // CHANGED: Use promise.reject() instead of callback
+                }
+            } finally {
+                if (fos != null) {
+                    try {
+                        fos.close();
+                    } catch (IOException e) {
+                        android.util.Log.e("AguaceroWX", "Error closing file stream", e);
+                    }
+                }
+            }
+        });
+    }
 }

package/lib/module/android/src/main/res/raw/debug_fragment_shader.glsl

@@ -1,13 +1,13 @@
-precision highp float;
-
-varying vec2 v_texCoord;
-uniform sampler2D u_data_texture;
-
-void main() {
-  // Read the raw normalized value [0.0, 1.0] from the texture's alpha channel.
-  float raw_normalized_value = texture2D(u_data_texture, v_texCoord).a;
-
-  // Output this value directly as a grayscale color.
-  // If the data is valid, this will produce a black and white weather map.
-  gl_FragColor = vec4(raw_normalized_value, raw_normalized_value, raw_normalized_value, 1.0);
+precision highp float;
+
+varying vec2 v_texCoord;
+uniform sampler2D u_data_texture;
+
+void main() {
+  // Read the raw normalized value [0.0, 1.0] from the texture's alpha channel.
+  float raw_normalized_value = texture2D(u_data_texture, v_texCoord).a;
+
+  // Output this value directly as a grayscale color.
+  // If the data is valid, this will produce a black and white weather map.
+  gl_FragColor = vec4(raw_normalized_value, raw_normalized_value, raw_normalized_value, 1.0);
 }

package/lib/module/android/src/main/res/raw/debug_vertex_shader.glsl

@@ -1,13 +1,13 @@
-attribute vec2 a_position; // Vertex position in Mercator coordinates (0.0 to 1.0)
-attribute vec2 a_texCoord;
-
-varying vec2 v_texCoord;
-
-void main() {
-  // This is a "passthrough" shader. It IGNORES the u_matrix from the map camera.
-  // It converts the input position (0..1) directly to OpenGL clip space (-1..1).
-  // This should paint a giant square over the entire screen, regardless of map pan/zoom.
-  gl_Position = vec4(a_position.x * 2.0 - 1.0, (1.0 - a_position.y) * 2.0 - 1.0, 0.0, 1.0);
-  
-  v_texCoord = a_texCoord;
+attribute vec2 a_position; // Vertex position in Mercator coordinates (0.0 to 1.0)
+attribute vec2 a_texCoord;
+
+varying vec2 v_texCoord;
+
+void main() {
+  // This is a "passthrough" shader. It IGNORES the u_matrix from the map camera.
+  // It converts the input position (0..1) directly to OpenGL clip space (-1..1).
+  // This should paint a giant square over the entire screen, regardless of map pan/zoom.
+  gl_Position = vec4(a_position.x * 2.0 - 1.0, (1.0 - a_position.y) * 2.0 - 1.0, 0.0, 1.0);
+  
+  v_texCoord = a_texCoord;
 }

package/lib/module/android/src/main/res/raw/fragment_shader.glsl

@@ -1,152 +1,152 @@
-// packages/react-native/android/src/main/res/raw/fragment_shader.glsl
-
-precision highp float;
-varying vec2 v_texCoord;
-
-uniform sampler2D u_data_texture;
-uniform sampler2D u_colormap_texture;
-
-// Data parameters
-uniform float u_scale;
-uniform float u_offset;
-uniform float u_missing_quantized;
-uniform int u_scale_type; // 0 for linear, 1 for sqrt
-
-// Style parameters
-uniform float u_opacity;
-uniform vec2 u_data_range;
-
-// Rendering parameters
-uniform vec2 u_texture_size;
-uniform int u_smoothing;
-uniform int u_is_ptype; // ADDED: Flag for ptype variables
-
-// --- HELPER FUNCTIONS ---
-
-// Dequantizes a signed value (-127 to 127) into a physical value
-float dequantize_val(float q_val) {
-    if (abs(q_val - u_missing_quantized) < 0.5) {
-        return -9999.0;
-    }
-    float intermediate = q_val * u_scale + u_offset;
-    if (u_scale_type == 1) { // 1 = sqrt
-        return intermediate * abs(intermediate);
-    }
-    return intermediate;
-}
-
-// Samples texture, converts 0-255 to signed -128-127 range.
-// Returns a quantized value, or a large positive sentinel for missing data.
-float get_value(vec2 coord) {
-    float value_0_to_255 = texture2D(u_data_texture, coord).a * 255.0;
-    float val = value_0_to_255 - 128.0;
-    float missing_in_texture_range_0_255 = u_missing_quantized + 128.0;
-    if (abs(value_0_to_255 - missing_in_texture_range_0_255) < 0.5) {
-        return 99999.0; // Sentinel for "missing"
-    }
-    return val;
-}
-
-// Maps a physical value to a precipitation type category
-float get_ptype_from_physical(float val) {
-    if (val < 0.0) return -1.0;   // Missing/Invalid
-    if (val < 100.0) return 0.0; // Rain
-    if (val < 200.0) return 1.0; // Mix
-    if (val < 300.0) return 2.0; // Snow
-    return 3.0;                  // Pellets
-}
-
-
-void main() {
-    float raw_value;
-    float total_weight = 1.0; // Used for alpha feathering at data edges
-
-    if (u_smoothing == 0) { // Nearest neighbor
-        float quantized_value = get_value(v_texCoord);
-        if (quantized_value >= 99999.0) {
-             discard;
-        }
-        raw_value = dequantize_val(quantized_value);
-
-    } else { // Bilinear interpolation
-        vec2 texel_size = 1.0 / u_texture_size;
-        vec2 tex_coord_in_texels = v_texCoord * u_texture_size;
-        vec2 bl_texel_index = floor(tex_coord_in_texels - 0.5);
-        vec2 f = fract(tex_coord_in_texels - 0.5); // Interpolation factors
-
-        // Coordinates of the 4 neighboring texels
-        vec2 v00_coord = (bl_texel_index + vec2(0.5, 0.5)) * texel_size;
-        vec2 v10_coord = (bl_texel_index + vec2(1.5, 0.5)) * texel_size;
-        vec2 v01_coord = (bl_texel_index + vec2(0.5, 1.5)) * texel_size;
-        vec2 v11_coord = (bl_texel_index + vec2(1.5, 1.5)) * texel_size;
-
-        if (u_is_ptype == 1) {
-            // --- PTYPE-SPECIFIC INTERPOLATION ---
-            float v00 = dequantize_val(get_value(v00_coord));
-            float v10 = dequantize_val(get_value(v10_coord));
-            float v01 = dequantize_val(get_value(v01_coord));
-            float v11 = dequantize_val(get_value(v11_coord));
-
-            float p00 = get_ptype_from_physical(v00);
-            float p10 = get_ptype_from_physical(v10);
-            float p01 = get_ptype_from_physical(v01);
-            float p11 = get_ptype_from_physical(v11);
-
-            // Determine the dominant precipitation type for this pixel
-            float dominant_ptype = -1.0;
-            if (p00 != -1.0) dominant_ptype = p00;
-            else if (p10 != -1.0) dominant_ptype = p10;
-            else if (p01 != -1.0) dominant_ptype = p01;
-            else if (p11 != -1.0) dominant_ptype = p11;
-
-            if (dominant_ptype == -1.0) discard;
-
-            // Interpolate ONLY the values that match the dominant ptype
-            float total_value = 0.0;
-            total_weight = 0.0;
-            if (p00 == dominant_ptype) { float w = (1.0-f.x)*(1.0-f.y); total_value+=v00*w; total_weight+=w; }
-            if (p10 == dominant_ptype) { float w = f.x*(1.0-f.y);       total_value+=v10*w; total_weight+=w; }
-            if (p01 == dominant_ptype) { float w = (1.0-f.x)*f.y;       total_value+=v01*w; total_weight+=w; }
-            if (p11 == dominant_ptype) { float w = f.x*f.y;             total_value+=v11*w; total_weight+=w; }
-
-            if (total_weight <= 0.0) discard;
-            raw_value = total_value / total_weight;
-
-            // Force full alpha to prevent dark borders between ptype regions
-            total_weight = 1.0;
-
-        } else {
-            // --- STANDARD INTERPOLATION ---
-            float v00_q = get_value(v00_coord);
-            float v10_q = get_value(v10_coord);
-            float v01_q = get_value(v01_coord);
-            float v11_q = get_value(v11_coord);
-
-            float total_value_q = 0.0;
-            total_weight = 0.0;
-            if (v00_q < 99999.0) { float w = (1.0-f.x)*(1.0-f.y); total_value_q+=v00_q*w; total_weight+=w; }
-            if (v10_q < 99999.0) { float w = f.x*(1.0-f.y);       total_value_q+=v10_q*w; total_weight+=w; }
-            if (v01_q < 99999.0) { float w = (1.0-f.x)*f.y;       total_value_q+=v01_q*w; total_weight+=w; }
-            if (v11_q < 99999.0) { float w = f.x*f.y;             total_value_q+=v11_q*w; total_weight+=w; }
-
-            if (total_weight <= 0.0) discard;
-            raw_value = dequantize_val(total_value_q / total_weight);
-        }
-    }
-
-    // --- COMMON FINAL STEPS ---
-
-    if (raw_value < u_data_range.x) {
-        discard;
-    }
-
-    float colormap_coord = clamp((raw_value - u_data_range.x) / (u_data_range.y - u_data_range.x), 0.0, 1.0);
-    vec4 color = texture2D(u_colormap_texture, vec2(colormap_coord, 0.5));
-    
-    if (color.a < 0.1) {
-        discard;
-    }
-
-    float final_alpha = color.a * u_opacity * total_weight;
-    gl_FragColor = vec4(color.rgb * final_alpha, final_alpha);
+// packages/react-native/android/src/main/res/raw/fragment_shader.glsl
+
+precision highp float;
+varying vec2 v_texCoord;
+
+uniform sampler2D u_data_texture;
+uniform sampler2D u_colormap_texture;
+
+// Data parameters
+uniform float u_scale;
+uniform float u_offset;
+uniform float u_missing_quantized;
+uniform int u_scale_type; // 0 for linear, 1 for sqrt
+
+// Style parameters
+uniform float u_opacity;
+uniform vec2 u_data_range;
+
+// Rendering parameters
+uniform vec2 u_texture_size;
+uniform int u_smoothing;
+uniform int u_is_ptype; // ADDED: Flag for ptype variables
+
+// --- HELPER FUNCTIONS ---
+
+// Dequantizes a signed value (-127 to 127) into a physical value
+float dequantize_val(float q_val) {
+    if (abs(q_val - u_missing_quantized) < 0.5) {
+        return -9999.0;
+    }
+    float intermediate = q_val * u_scale + u_offset;
+    if (u_scale_type == 1) { // 1 = sqrt
+        return intermediate * abs(intermediate);
+    }
+    return intermediate;
+}
+
+// Samples texture, converts 0-255 to signed -128-127 range.
+// Returns a quantized value, or a large positive sentinel for missing data.
+float get_value(vec2 coord) {
+    float value_0_to_255 = texture2D(u_data_texture, coord).a * 255.0;
+    float val = value_0_to_255 - 128.0;
+    float missing_in_texture_range_0_255 = u_missing_quantized + 128.0;
+    if (abs(value_0_to_255 - missing_in_texture_range_0_255) < 0.5) {
+        return 99999.0; // Sentinel for "missing"
+    }
+    return val;
+}
+
+// Maps a physical value to a precipitation type category
+float get_ptype_from_physical(float val) {
+    if (val < 0.0) return -1.0;   // Missing/Invalid
+    if (val < 100.0) return 0.0; // Rain
+    if (val < 200.0) return 1.0; // Mix
+    if (val < 300.0) return 2.0; // Snow
+    return 3.0;                  // Pellets
+}
+
+
+void main() {
+    float raw_value;
+    float total_weight = 1.0; // Used for alpha feathering at data edges
+
+    if (u_smoothing == 0) { // Nearest neighbor
+        float quantized_value = get_value(v_texCoord);
+        if (quantized_value >= 99999.0) {
+             discard;
+        }
+        raw_value = dequantize_val(quantized_value);
+
+    } else { // Bilinear interpolation
+        vec2 texel_size = 1.0 / u_texture_size;
+        vec2 tex_coord_in_texels = v_texCoord * u_texture_size;
+        vec2 bl_texel_index = floor(tex_coord_in_texels - 0.5);
+        vec2 f = fract(tex_coord_in_texels - 0.5); // Interpolation factors
+
+        // Coordinates of the 4 neighboring texels
+        vec2 v00_coord = (bl_texel_index + vec2(0.5, 0.5)) * texel_size;
+        vec2 v10_coord = (bl_texel_index + vec2(1.5, 0.5)) * texel_size;
+        vec2 v01_coord = (bl_texel_index + vec2(0.5, 1.5)) * texel_size;
+        vec2 v11_coord = (bl_texel_index + vec2(1.5, 1.5)) * texel_size;
+
+        if (u_is_ptype == 1) {
+            // --- PTYPE-SPECIFIC INTERPOLATION ---
+            float v00 = dequantize_val(get_value(v00_coord));
+            float v10 = dequantize_val(get_value(v10_coord));
+            float v01 = dequantize_val(get_value(v01_coord));
+            float v11 = dequantize_val(get_value(v11_coord));
+
+            float p00 = get_ptype_from_physical(v00);
+            float p10 = get_ptype_from_physical(v10);
+            float p01 = get_ptype_from_physical(v01);
+            float p11 = get_ptype_from_physical(v11);
+
+            // Determine the dominant precipitation type for this pixel
+            float dominant_ptype = -1.0;
+            if (p00 != -1.0) dominant_ptype = p00;
+            else if (p10 != -1.0) dominant_ptype = p10;
+            else if (p01 != -1.0) dominant_ptype = p01;
+            else if (p11 != -1.0) dominant_ptype = p11;
+
+            if (dominant_ptype == -1.0) discard;
+
+            // Interpolate ONLY the values that match the dominant ptype
+            float total_value = 0.0;
+            total_weight = 0.0;
+            if (p00 == dominant_ptype) { float w = (1.0-f.x)*(1.0-f.y); total_value+=v00*w; total_weight+=w; }
+            if (p10 == dominant_ptype) { float w = f.x*(1.0-f.y);       total_value+=v10*w; total_weight+=w; }
+            if (p01 == dominant_ptype) { float w = (1.0-f.x)*f.y;       total_value+=v01*w; total_weight+=w; }
+            if (p11 == dominant_ptype) { float w = f.x*f.y;             total_value+=v11*w; total_weight+=w; }
+
+            if (total_weight <= 0.0) discard;
+            raw_value = total_value / total_weight;
+
+            // Force full alpha to prevent dark borders between ptype regions
+            total_weight = 1.0;
+
+        } else {
+            // --- STANDARD INTERPOLATION ---
+            float v00_q = get_value(v00_coord);
+            float v10_q = get_value(v10_coord);
+            float v01_q = get_value(v01_coord);
+            float v11_q = get_value(v11_coord);
+
+            float total_value_q = 0.0;
+            total_weight = 0.0;
+            if (v00_q < 99999.0) { float w = (1.0-f.x)*(1.0-f.y); total_value_q+=v00_q*w; total_weight+=w; }
+            if (v10_q < 99999.0) { float w = f.x*(1.0-f.y);       total_value_q+=v10_q*w; total_weight+=w; }
+            if (v01_q < 99999.0) { float w = (1.0-f.x)*f.y;       total_value_q+=v01_q*w; total_weight+=w; }
+            if (v11_q < 99999.0) { float w = f.x*f.y;             total_value_q+=v11_q*w; total_weight+=w; }
+
+            if (total_weight <= 0.0) discard;
+            raw_value = dequantize_val(total_value_q / total_weight);
+        }
+    }
+
+    // --- COMMON FINAL STEPS ---
+
+    if (raw_value < u_data_range.x) {
+        discard;
+    }
+
+    float colormap_coord = clamp((raw_value - u_data_range.x) / (u_data_range.y - u_data_range.x), 0.0, 1.0);
+    vec4 color = texture2D(u_colormap_texture, vec2(colormap_coord, 0.5));
+    
+    if (color.a < 0.1) {
+        discard;
+    }
+
+    float final_alpha = color.a * u_opacity * total_weight;
+    gl_FragColor = vec4(color.rgb * final_alpha, final_alpha);
 }