@aguacerowx/mapsgl 0.0.58 → 0.0.59

package/src/satelliteDefaultColormaps.js

@@ -1,37 +1,37 @@
-/**
- * Default GOES brightness-temperature colormaps for WebGL satellite, aligned with
- * aguacero-frontend `src/lib/defaultColormaps.ts` (`SatelliteLongwaveIR` and `SatelliteWV`, K/°C units).
- *
- * Format: flat array `[norm0, '#hex', norm1, '#hex', ...]` where each **norm** is 0–100
- * (cold → hot in texture space; see `SatelliteShaderManager._generateTextureFromColormapData` and
- * frontend `normToKelvin` / `kelvinToNorm` in `utilityFunctions.ts`).
- */
-
-/** Longwave IR (C13–C16-style) — matches `SatelliteLongwaveIR.units.K.colormap` in the frontend. */
-export const DEFAULT_SATELLITE_LONGWAVE_IR_COLORMAP = [
-    5, '#000000',
-    51, '#ffffff',
-    52, '#00ffff',
-    58, '#0033cc',
-    64, '#33ff00',
-    73, '#ffee00',
-    78, '#ff0000',
-    82, '#660000',
-    88, '#808080',
-    90, '#cc66ff',
-    96, '#9933cc',
-    100, '#9933cc',
-];
-
-/** Upper / mid / lower water vapor (C08–C10) — matches `SatelliteWV.units.K.colormap` in the frontend. */
-export const DEFAULT_SATELLITE_WATER_VAPOR_COLORMAP = [
-    10, '#cece55',
-    20, '#ce5555',
-    30, '#262626',
-    45, '#ffffff',
-    55, '#55cece',
-    70, '#5555ce',
-    80, '#4d3366',
-    90, '#e673e6',
-    100, '#efe6eb',
-];
+/**
+ * Default GOES brightness-temperature colormaps for WebGL satellite, aligned with
+ * aguacero-frontend `src/lib/defaultColormaps.ts` (`SatelliteLongwaveIR` and `SatelliteWV`, K/°C units).
+ *
+ * Format: flat array `[norm0, '#hex', norm1, '#hex', ...]` where each **norm** is 0–100
+ * (cold → hot in texture space; see `SatelliteShaderManager._generateTextureFromColormapData` and
+ * frontend `normToKelvin` / `kelvinToNorm` in `utilityFunctions.ts`).
+ */
+
+/** Longwave IR (C13–C16-style) — matches `SatelliteLongwaveIR.units.K.colormap` in the frontend. */
+export const DEFAULT_SATELLITE_LONGWAVE_IR_COLORMAP = [
+    5, '#000000',
+    51, '#ffffff',
+    52, '#00ffff',
+    58, '#0033cc',
+    64, '#33ff00',
+    73, '#ffee00',
+    78, '#ff0000',
+    82, '#660000',
+    88, '#808080',
+    90, '#cc66ff',
+    96, '#9933cc',
+    100, '#9933cc',
+];
+
+/** Upper / mid / lower water vapor (C08–C10) — matches `SatelliteWV.units.K.colormap` in the frontend. */
+export const DEFAULT_SATELLITE_WATER_VAPOR_COLORMAP = [
+    10, '#cece55',
+    20, '#ce5555',
+    30, '#262626',
+    45, '#ffffff',
+    55, '#55cece',
+    70, '#5555ce',
+    80, '#4d3366',
+    90, '#e673e6',
+    100, '#efe6eb',
+];

package/src/satelliteKtxWorker.js

@@ -1,232 +1,232 @@
-/**
- * KTX2 → GPU bytes for GOES satellite tiles. INITIAL_LOAD matches aguacero-frontend gridWorker.js.
- * Serve matching basis_transcoder.js + basis_transcoder.wasm at basisBaseUrl (e.g. /basis/).
- */
-
-let basisModule = null;
-let basisInitPromise = null;
-let supportedFormats = {};
-
-/** Emscripten expects u32; Basis enum bindings may be numbers, { value: n }, or missing in some builds. */
-function toU32(v) {
-    if (v == null) return 0;
-    if (typeof v === 'number' && Number.isFinite(v)) return v >>> 0;
-    if (typeof v === 'object' && 'value' in v) {
-        const n = v.value;
-        return typeof n === 'number' && Number.isFinite(n) ? n >>> 0 : 0;
-    }
-    return 0;
-}
-
-/** Decode flags (e.g. flip Y). Newer basis_transcoder builds may omit top-level cDecodeFlagsFlipY; THREE.KTX2Loader uses 0. */
-function getDecodeFlags(module) {
-    const raw = module?.cDecodeFlagsFlipY ?? module?.DecodeFlags?.cDecodeFlagsFlipY;
-    return toU32(raw);
-}
-
-function findBestFormatForWorker(module, isUASTC, hasAlpha) {
-    const T = module?.transcoder_texture_format;
-    if (!T) {
-        return { transcoderFormat: 0, webglFormatName: 'RGBA', isCompressed: false };
-    }
-    if (supportedFormats.astc) {
-        const formatEnum = T.cTFASTC_4x4_RGBA;
-        if (formatEnum) {
-            const formatValue = toU32(formatEnum.value ?? formatEnum);
-            if (formatValue !== 0) {
-                return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGBA_ASTC_4x4_KHR', isCompressed: true };
-            }
-        }
-    }
-    if (isUASTC && supportedFormats.bc7) {
-        const formatEnum = T.cTFBC7_RGBA;
-        if (formatEnum) {
-            const formatValue = toU32(formatEnum.value ?? formatEnum);
-            if (formatValue !== 0) {
-                return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGBA_BPTC_UNORM_EXT', isCompressed: true };
-            }
-        }
-    }
-    if (supportedFormats.s3tc) {
-        if (hasAlpha) {
-            const formatEnum = T.cTFBC3_RGBA;
-            if (formatEnum) {
-                const formatValue = toU32(formatEnum.value ?? formatEnum);
-                if (formatValue !== 0) {
-                    return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGBA_S3TC_DXT5_EXT', isCompressed: true };
-                }
-            }
-        } else {
-            const formatEnum = T.cTFBC1_RGB;
-            if (formatEnum) {
-                const formatValue = toU32(formatEnum.value ?? formatEnum);
-                if (formatValue !== 0) {
-                    return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGB_S3TC_DXT1_EXT', isCompressed: true };
-                }
-            }
-        }
-    }
-    if (supportedFormats.etc1 && !hasAlpha) {
-        const formatEnum = T.cTFETC1_RGB;
-        if (formatEnum) {
-            const formatValue = toU32(formatEnum.value ?? formatEnum);
-            if (formatValue !== 0) {
-                return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGB_ETC1_WEBGL', isCompressed: true };
-            }
-        }
-    }
-    const formatEnum = T.cTFRGBA32;
-    const formatValue = formatEnum ? toU32(formatEnum.value ?? formatEnum) : 0;
-    return { transcoderFormat: formatValue, webglFormatName: 'RGBA', isCompressed: false };
-}
-
-const loadBasisModule = async (basisBaseUrl) => {
-    const base = (basisBaseUrl || '/basis/').replace(/\/?$/, '/');
-    const jsUrl = `${base}basis_transcoder.js`;
-    const wasmUrl = `${base}basis_transcoder.wasm`;
-
-    if (typeof self.BASIS === 'undefined') {
-        const scriptText = await (await fetch(jsUrl)).text();
-        const trimmed = scriptText.trimStart();
-        if (trimmed.startsWith('<')) {
-            throw new Error(
-                `Expected JavaScript at ${jsUrl} but got HTML (often a 404 or SPA index). ` +
-                    'Copy basis_transcoder.js and basis_transcoder.wasm to your static host, or set WeatherLayerManager basisBaseUrl.',
-            );
-        }
-        self.eval(scriptText);
-        if (self.Module) {
-            self.Module = undefined;
-        }
-    }
-
-    const BASIS = self.BASIS || self.module?.exports?.default;
-    const ctor = typeof BASIS === 'function' ? BASIS : BASIS?.default;
-    const module = await ctor({
-        locateFile: (filename) => (filename === 'basis_transcoder.wasm' ? wasmUrl : `${base}${filename}`),
-    });
-    module.initializeBasis();
-    return module;
-};
-
-self.onmessage = async function (e) {
-    const { type } = e.data;
-    const taskId = e.data.__taskId || Math.random().toString(36).substr(2, 9);
-
-    try {
-        if (type === 'INIT_WORKER') {
-            supportedFormats = e.data.supportedFormats || {};
-            if (e.data.basisBaseUrl) {
-                self.__BASIS_BASE__ = e.data.basisBaseUrl;
-            }
-            self.postMessage({ __taskId: taskId, type: 'INIT_SUCCESS' });
-            return;
-        }
-
-        if (type === 'INITIAL_LOAD') {
-            const basisBaseUrl = e.data.basisBaseUrl || self.__BASIS_BASE__ || '/basis/';
-
-            if (!basisModule) {
-                try {
-                    if (!basisInitPromise) {
-                        basisInitPromise = loadBasisModule(basisBaseUrl);
-                    }
-                    basisModule = await basisInitPromise;
-                } catch (error) {
-                    self.postMessage({
-                        __taskId: taskId,
-                        type: 'WORKER_ERROR',
-                        frameKey: e.data.frameKey,
-                        error: `Worker not initialized: ${error.message}`,
-                    });
-                    return;
-                }
-            }
-
-            const downsampleRate = e.data.downsampleRate || 1;
-            const { KTX2File } = basisModule;
-            const ktx2File = new KTX2File(new Uint8Array(e.data.ktx2Buffer));
-
-            if (!ktx2File.isValid()) throw new Error('Invalid KTX2 file');
-
-            const width = ktx2File.getWidth();
-            const height = ktx2File.getHeight();
-            const hasAlpha = ktx2File.getHasAlpha();
-            const isUASTC = ktx2File.isUASTC();
-
-            const formatInfo = findBestFormatForWorker(basisModule, isUASTC, hasAlpha);
-
-            let blockWidth = 1;
-            let blockHeight = 1;
-            let bytesPerBlock = 4;
-            if (formatInfo.isCompressed) {
-                switch (formatInfo.webglFormatName) {
-                    case 'COMPRESSED_RGBA_ASTC_4x4_KHR':
-                    case 'COMPRESSED_RGBA_BPTC_UNORM_EXT':
-                    case 'COMPRESSED_RGBA_S3TC_DXT5_EXT':
-                        blockWidth = 4;
-                        blockHeight = 4;
-                        bytesPerBlock = 16;
-                        break;
-                    case 'COMPRESSED_RGB_S3TC_DXT1_EXT':
-                    case 'COMPRESSED_RGB_ETC1_WEBGL':
-                        blockWidth = 4;
-                        blockHeight = 4;
-                        bytesPerBlock = 8;
-                        break;
-                }
-            }
-
-            if (!ktx2File.startTranscoding()) throw new Error('Failed to start transcoding');
-
-            const fullTranscodedData = new Uint8Array(
-                ktx2File.getImageTranscodedSizeInBytes(0, 0, 0, formatInfo.transcoderFormat)
-            );
-
-            if (
-                !ktx2File.transcodeImage(
-                    fullTranscodedData,
-                    0,
-                    0,
-                    0,
-                    formatInfo.transcoderFormat,
-                    getDecodeFlags(basisModule),
-                    -1,
-                    -1
-                )
-            ) {
-                throw new Error('Transcoding failed');
-            }
-
-            ktx2File.close();
-            ktx2File.delete();
-
-            const ktx2Metadata = { fullWidth: width, fullHeight: height, blockWidth, blockHeight, formatInfo, bytesPerBlock, downsampleRate };
-            const sampleRate = downsampleRate;
-            const totalBlocksX = Math.ceil(width / blockWidth);
-            const totalBlocksY = Math.ceil(height / blockHeight);
-            const newBlocksX = Math.floor(totalBlocksX / sampleRate);
-            const newBlocksY = Math.floor(totalBlocksY / sampleRate);
-
-            const lowResData = new Uint8Array(newBlocksX * newBlocksY * bytesPerBlock);
-
-            for (let y = 0; y < newBlocksY; y++) {
-                for (let x = 0; x < newBlocksX; x++) {
-                    const sourceBlockIndex = y * sampleRate * totalBlocksX + x * sampleRate;
-                    const sourceOffset = sourceBlockIndex * bytesPerBlock;
-                    const destOffset = (y * newBlocksX + x) * bytesPerBlock;
-                    lowResData.set(fullTranscodedData.subarray(sourceOffset, sourceOffset + bytesPerBlock), destOffset);
-                }
-            }
-
-            const frameKey = e.data.frameKey;
-            self.postMessage(
-                { __taskId: taskId, type: 'INITIAL_LOAD_RESULT', frameKey, lowResData, ktx2Metadata, fullTranscodedData },
-                [lowResData.buffer, fullTranscodedData.buffer]
-            );
-            return;
-        }
-    } catch (error) {
-        self.postMessage({ __taskId: taskId, type: 'WORKER_ERROR', frameKey: e.data?.frameKey, error: error.message });
-    }
-};
+/**
+ * KTX2 → GPU bytes for GOES satellite tiles. INITIAL_LOAD matches aguacero-frontend gridWorker.js.
+ * Serve matching basis_transcoder.js + basis_transcoder.wasm at basisBaseUrl (e.g. /basis/).
+ */
+
+let basisModule = null;
+let basisInitPromise = null;
+let supportedFormats = {};
+
+/** Emscripten expects u32; Basis enum bindings may be numbers, { value: n }, or missing in some builds. */
+function toU32(v) {
+    if (v == null) return 0;
+    if (typeof v === 'number' && Number.isFinite(v)) return v >>> 0;
+    if (typeof v === 'object' && 'value' in v) {
+        const n = v.value;
+        return typeof n === 'number' && Number.isFinite(n) ? n >>> 0 : 0;
+    }
+    return 0;
+}
+
+/** Decode flags (e.g. flip Y). Newer basis_transcoder builds may omit top-level cDecodeFlagsFlipY; THREE.KTX2Loader uses 0. */
+function getDecodeFlags(module) {
+    const raw = module?.cDecodeFlagsFlipY ?? module?.DecodeFlags?.cDecodeFlagsFlipY;
+    return toU32(raw);
+}
+
+function findBestFormatForWorker(module, isUASTC, hasAlpha) {
+    const T = module?.transcoder_texture_format;
+    if (!T) {
+        return { transcoderFormat: 0, webglFormatName: 'RGBA', isCompressed: false };
+    }
+    if (supportedFormats.astc) {
+        const formatEnum = T.cTFASTC_4x4_RGBA;
+        if (formatEnum) {
+            const formatValue = toU32(formatEnum.value ?? formatEnum);
+            if (formatValue !== 0) {
+                return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGBA_ASTC_4x4_KHR', isCompressed: true };
+            }
+        }
+    }
+    if (isUASTC && supportedFormats.bc7) {
+        const formatEnum = T.cTFBC7_RGBA;
+        if (formatEnum) {
+            const formatValue = toU32(formatEnum.value ?? formatEnum);
+            if (formatValue !== 0) {
+                return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGBA_BPTC_UNORM_EXT', isCompressed: true };
+            }
+        }
+    }
+    if (supportedFormats.s3tc) {
+        if (hasAlpha) {
+            const formatEnum = T.cTFBC3_RGBA;
+            if (formatEnum) {
+                const formatValue = toU32(formatEnum.value ?? formatEnum);
+                if (formatValue !== 0) {
+                    return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGBA_S3TC_DXT5_EXT', isCompressed: true };
+                }
+            }
+        } else {
+            const formatEnum = T.cTFBC1_RGB;
+            if (formatEnum) {
+                const formatValue = toU32(formatEnum.value ?? formatEnum);
+                if (formatValue !== 0) {
+                    return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGB_S3TC_DXT1_EXT', isCompressed: true };
+                }
+            }
+        }
+    }
+    if (supportedFormats.etc1 && !hasAlpha) {
+        const formatEnum = T.cTFETC1_RGB;
+        if (formatEnum) {
+            const formatValue = toU32(formatEnum.value ?? formatEnum);
+            if (formatValue !== 0) {
+                return { transcoderFormat: formatValue, webglFormatName: 'COMPRESSED_RGB_ETC1_WEBGL', isCompressed: true };
+            }
+        }
+    }
+    const formatEnum = T.cTFRGBA32;
+    const formatValue = formatEnum ? toU32(formatEnum.value ?? formatEnum) : 0;
+    return { transcoderFormat: formatValue, webglFormatName: 'RGBA', isCompressed: false };
+}
+
+const loadBasisModule = async (basisBaseUrl) => {
+    const base = (basisBaseUrl || '/basis/').replace(/\/?$/, '/');
+    const jsUrl = `${base}basis_transcoder.js`;
+    const wasmUrl = `${base}basis_transcoder.wasm`;
+
+    if (typeof self.BASIS === 'undefined') {
+        const scriptText = await (await fetch(jsUrl)).text();
+        const trimmed = scriptText.trimStart();
+        if (trimmed.startsWith('<')) {
+            throw new Error(
+                `Expected JavaScript at ${jsUrl} but got HTML (often a 404 or SPA index). ` +
+                    'Copy basis_transcoder.js and basis_transcoder.wasm to your static host, or set WeatherLayerManager basisBaseUrl.',
+            );
+        }
+        self.eval(scriptText);
+        if (self.Module) {
+            self.Module = undefined;
+        }
+    }
+
+    const BASIS = self.BASIS || self.module?.exports?.default;
+    const ctor = typeof BASIS === 'function' ? BASIS : BASIS?.default;
+    const module = await ctor({
+        locateFile: (filename) => (filename === 'basis_transcoder.wasm' ? wasmUrl : `${base}${filename}`),
+    });
+    module.initializeBasis();
+    return module;
+};
+
+self.onmessage = async function (e) {
+    const { type } = e.data;
+    const taskId = e.data.__taskId || Math.random().toString(36).substr(2, 9);
+
+    try {
+        if (type === 'INIT_WORKER') {
+            supportedFormats = e.data.supportedFormats || {};
+            if (e.data.basisBaseUrl) {
+                self.__BASIS_BASE__ = e.data.basisBaseUrl;
+            }
+            self.postMessage({ __taskId: taskId, type: 'INIT_SUCCESS' });
+            return;
+        }
+
+        if (type === 'INITIAL_LOAD') {
+            const basisBaseUrl = e.data.basisBaseUrl || self.__BASIS_BASE__ || '/basis/';
+
+            if (!basisModule) {
+                try {
+                    if (!basisInitPromise) {
+                        basisInitPromise = loadBasisModule(basisBaseUrl);
+                    }
+                    basisModule = await basisInitPromise;
+                } catch (error) {
+                    self.postMessage({
+                        __taskId: taskId,
+                        type: 'WORKER_ERROR',
+                        frameKey: e.data.frameKey,
+                        error: `Worker not initialized: ${error.message}`,
+                    });
+                    return;
+                }
+            }
+
+            const downsampleRate = e.data.downsampleRate || 1;
+            const { KTX2File } = basisModule;
+            const ktx2File = new KTX2File(new Uint8Array(e.data.ktx2Buffer));
+
+            if (!ktx2File.isValid()) throw new Error('Invalid KTX2 file');
+
+            const width = ktx2File.getWidth();
+            const height = ktx2File.getHeight();
+            const hasAlpha = ktx2File.getHasAlpha();
+            const isUASTC = ktx2File.isUASTC();
+
+            const formatInfo = findBestFormatForWorker(basisModule, isUASTC, hasAlpha);
+
+            let blockWidth = 1;
+            let blockHeight = 1;
+            let bytesPerBlock = 4;
+            if (formatInfo.isCompressed) {
+                switch (formatInfo.webglFormatName) {
+                    case 'COMPRESSED_RGBA_ASTC_4x4_KHR':
+                    case 'COMPRESSED_RGBA_BPTC_UNORM_EXT':
+                    case 'COMPRESSED_RGBA_S3TC_DXT5_EXT':
+                        blockWidth = 4;
+                        blockHeight = 4;
+                        bytesPerBlock = 16;
+                        break;
+                    case 'COMPRESSED_RGB_S3TC_DXT1_EXT':
+                    case 'COMPRESSED_RGB_ETC1_WEBGL':
+                        blockWidth = 4;
+                        blockHeight = 4;
+                        bytesPerBlock = 8;
+                        break;
+                }
+            }
+
+            if (!ktx2File.startTranscoding()) throw new Error('Failed to start transcoding');
+
+            const fullTranscodedData = new Uint8Array(
+                ktx2File.getImageTranscodedSizeInBytes(0, 0, 0, formatInfo.transcoderFormat)
+            );
+
+            if (
+                !ktx2File.transcodeImage(
+                    fullTranscodedData,
+                    0,
+                    0,
+                    0,
+                    formatInfo.transcoderFormat,
+                    getDecodeFlags(basisModule),
+                    -1,
+                    -1
+                )
+            ) {
+                throw new Error('Transcoding failed');
+            }
+
+            ktx2File.close();
+            ktx2File.delete();
+
+            const ktx2Metadata = { fullWidth: width, fullHeight: height, blockWidth, blockHeight, formatInfo, bytesPerBlock, downsampleRate };
+            const sampleRate = downsampleRate;
+            const totalBlocksX = Math.ceil(width / blockWidth);
+            const totalBlocksY = Math.ceil(height / blockHeight);
+            const newBlocksX = Math.floor(totalBlocksX / sampleRate);
+            const newBlocksY = Math.floor(totalBlocksY / sampleRate);
+
+            const lowResData = new Uint8Array(newBlocksX * newBlocksY * bytesPerBlock);
+
+            for (let y = 0; y < newBlocksY; y++) {
+                for (let x = 0; x < newBlocksX; x++) {
+                    const sourceBlockIndex = y * sampleRate * totalBlocksX + x * sampleRate;
+                    const sourceOffset = sourceBlockIndex * bytesPerBlock;
+                    const destOffset = (y * newBlocksX + x) * bytesPerBlock;
+                    lowResData.set(fullTranscodedData.subarray(sourceOffset, sourceOffset + bytesPerBlock), destOffset);
+                }
+            }
+
+            const frameKey = e.data.frameKey;
+            self.postMessage(
+                { __taskId: taskId, type: 'INITIAL_LOAD_RESULT', frameKey, lowResData, ktx2Metadata, fullTranscodedData },
+                [lowResData.buffer, fullTranscodedData.buffer]
+            );
+            return;
+        }
+    } catch (error) {
+        self.postMessage({ __taskId: taskId, type: 'WORKER_ERROR', frameKey: e.data?.frameKey, error: error.message });
+    }
+};

package/src/satelliteShader.js

@@ -1,17 +1,17 @@
-/** Minimal shader compile helper (same as aguacero-frontend satelliteShader.js). */
-export function createProgram(gl, vertexSource, fragmentSource) {
-    const vertexShader = gl.createShader(gl.VERTEX_SHADER);
-    gl.shaderSource(vertexShader, vertexSource);
-    gl.compileShader(vertexShader);
-
-    const fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
-    gl.shaderSource(fragmentShader, fragmentSource);
-    gl.compileShader(fragmentShader);
-
-    const program = gl.createProgram();
-    gl.attachShader(program, vertexShader);
-    gl.attachShader(program, fragmentShader);
-    gl.linkProgram(program);
-
-    return program;
-}
+/** Minimal shader compile helper (same as aguacero-frontend satelliteShader.js). */
+export function createProgram(gl, vertexSource, fragmentSource) {
+    const vertexShader = gl.createShader(gl.VERTEX_SHADER);
+    gl.shaderSource(vertexShader, vertexSource);
+    gl.compileShader(vertexShader);
+
+    const fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
+    gl.shaderSource(fragmentShader, fragmentSource);
+    gl.compileShader(fragmentShader);
+
+    const program = gl.createProgram();
+    gl.attachShader(program, vertexShader);
+    gl.attachShader(program, fragmentShader);
+    gl.linkProgram(program);
+
+    return program;
+}