astro-viewer 3.8.0 → 3.9.0

package/dist/astroviewer.cjs

@@ -4130,6 +4130,21 @@ class AstroSphere {
         }
         this._activeHiPS.changeFormat(format);
     }
+    setHiPSFITSScaleFunction(scaleFunction, scaleParam) {
+        if (!this._activeHiPS) {
+            throw new Error("No active HiPS.");
+        }
+        this._activeHiPS.setFITSScaleFunction(scaleFunction, scaleParam);
+    }
+    getActiveHiPSFITSStretch() {
+        return this._activeHiPS?.fitsStretch ?? null;
+    }
+    setHiPSFITSRangeMode(rangeMode) {
+        if (!this._activeHiPS) {
+            throw new Error("No active HiPS.");
+        }
+        this._activeHiPS.setFITSRangeMode(rangeMode);
+    }
     createHiPS(hipsDescriptor) {
         return new HiPS_js_1.HiPS(1, [0.0, 0.0, 0.0], 0, 0, hipsDescriptor, this._webgl, this._healpixGrid);
     }
@@ -5001,6 +5016,15 @@ class AstroViewer {
     changeHiPSFormat(format) {
         this.astroSphere.changeHiPSFormat(format);
     }
+    setHiPSFITSScaleFunction(scaleFunction, scaleParam) {
+        this.astroSphere.setHiPSFITSScaleFunction(scaleFunction, scaleParam);
+    }
+    getActiveHiPSFITSStretch() {
+        return this.astroSphere.getActiveHiPSFITSStretch();
+    }
+    setHiPSFITSRangeMode(rangeMode) {
+        this.astroSphere.setHiPSFITSRangeMode(rangeMode);
+    }
     getActiveHiPSFormats() {
         return this.astroSphere.activeHiPS?.availableFormats ?? [];
     }
@@ -5867,7 +5891,6 @@ var Source_js_1 = __webpack_require__(146);
 Object.defineProperty(exports, "Source", ({ enumerable: true, get: function () { return Source_js_1.Source; } }));
 var Footprint_js_1 = __webpack_require__(2475);
 Object.defineProperty(exports, "Footprint", ({ enumerable: true, get: function () { return Footprint_js_1.Footprint; } }));
-console.log('astroviewer UMD loaded');
 
 
 /***/ },
@@ -11633,8 +11656,14 @@ class HealpixGrid extends AbstractSkyEntity_js_1.AbstractSkyEntity {
         // FIX: pass model & pMatrix to match FoVUtils TS signature
         const center = FoVUtils_js_1.FoVUtils.getCenterJ2000(gl.canvas, this, this._webgl, camera, pMatrix);
         const fovMin = (this.getMinFoV() * Math.PI) / 180 / 2;
+        const visibleHealpix = Global_js_1.default.getHealpix(this._visibleorder);
+        const maxPixel = visibleHealpix.getNPix();
         for (let p = 0; p < pixels.length; p++) {
-            const pixCenter = Global_js_1.default.getHealpix(this._visibleorder).pix2vec(pixels[p]);
+            const pixel = pixels[p];
+            if (!Number.isInteger(pixel) || pixel < 0 || pixel >= maxPixel) {
+                continue;
+            }
+            const pixCenter = visibleHealpix.pix2vec(pixel);
             // const pixCenter = (global.getHealpix(global.order).pix2vec(pixels[p]) as BoundVec);
             const point = new Point_js_1.Point({ x: pixCenter.x, y: pixCenter.y, z: pixCenter.z }, CoordsType_js_1.CoordsType.CARTESIAN);
             const distance = GeomUtils_js_1.default.orthodromicDistance(center, point);
@@ -12062,6 +12091,7 @@ class AllSky {
     async loadFits() {
         try {
             this._fitsTile = await (0, FitsTileLoader_js_1.loadFitsTile)(this._texurl);
+            this._hips.observeFITSDataRange(this._fitsTile);
             this.textureLoaded();
             this.initModelBuffer();
             this._textureLoaded = true;
@@ -12106,30 +12136,7 @@ class AllSky {
         }
     }
     getFitsDataRange() {
-        const hipsRange = this._hips.dataRange;
-        if (hipsRange.min !== undefined &&
-            hipsRange.max !== undefined &&
-            Number.isFinite(hipsRange.min) &&
-            Number.isFinite(hipsRange.max) &&
-            hipsRange.max > hipsRange.min) {
-            return {
-                min: hipsRange.min,
-                max: hipsRange.max,
-            };
-        }
-        const fits = this._fitsTile;
-        if (fits &&
-            fits.dataMin !== null &&
-            fits.dataMax !== null &&
-            Number.isFinite(fits.dataMin) &&
-            Number.isFinite(fits.dataMax) &&
-            fits.dataMax > fits.dataMin) {
-            return {
-                min: fits.dataMin,
-                max: fits.dataMax,
-            };
-        }
-        return null;
+        return this._hips.getFITSDisplayRange(this._fitsTile);
     }
     initModelBuffer() {
         const gl = this._webgl;
@@ -12243,7 +12250,7 @@ class AllSky {
                 console.error(`[AllSky] No display range available for FITS atlas ${this._texurl}`);
                 return false;
             }
-            this._hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, true, range.min, range.max);
+            this._hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, true, range.min, range.max, this._hips.fitsStretch.scaleFunctionIndex, this._hips.fitsStretch.scaleParam);
         }
         else {
             this._hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, false);
@@ -12380,6 +12387,7 @@ class AncestorTile {
     async loadFits() {
         try {
             this._fitsTile = await (0, FitsTileLoader_js_1.loadFitsTile)(this._texurl);
+            this._hips.observeFITSDataRange(this._fitsTile);
             this.textureLoaded();
             const fits = this._fitsTile;
             if (!fits) {
@@ -12437,30 +12445,7 @@ class AncestorTile {
         }
     }
     getFitsDataRange() {
-        const hipsRange = this._hips.dataRange;
-        if (hipsRange.min !== undefined &&
-            hipsRange.max !== undefined &&
-            Number.isFinite(hipsRange.min) &&
-            Number.isFinite(hipsRange.max) &&
-            hipsRange.max > hipsRange.min) {
-            return {
-                min: hipsRange.min,
-                max: hipsRange.max,
-            };
-        }
-        const fits = this._fitsTile;
-        if (fits &&
-            fits.dataMin !== null &&
-            fits.dataMax !== null &&
-            Number.isFinite(fits.dataMin) &&
-            Number.isFinite(fits.dataMax) &&
-            fits.dataMax > fits.dataMin) {
-            return {
-                min: fits.dataMin,
-                max: fits.dataMax,
-            };
-        }
-        return null;
+        return this._hips.getFITSDisplayRange(this._fitsTile);
     }
     initModelBuffer() {
         const gl = this._webgl;
@@ -12560,7 +12545,7 @@ class AncestorTile {
                 console.error(`[AncestorTile] No display range available for FITS tile ${this._texurl}`);
                 return false;
             }
-            this._hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, true, range.min, range.max);
+            this._hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, true, range.min, range.max, this._hips.fitsStretch.scaleFunctionIndex, this._hips.fitsStretch.scaleParam);
         }
         else {
             this._hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, false);
@@ -12637,6 +12622,9 @@ var __webpack_unused_export__;
 __webpack_unused_export__ = ({ value: true });
 exports.loadFitsTile = loadFitsTile;
 const jsfitsio_1 = __webpack_require__(4971);
+const ROBUST_SAMPLE_COUNT = 8192;
+const ROBUST_LOW_PERCENTILE = 0.005;
+const ROBUST_HIGH_PERCENTILE = 0.995;
 async function loadFitsTile(url) {
     const fitsFile = await jsfitsio_1.FITSParser.loadFITSFile(url);
     if (!fitsFile?.primaryHDU) {
@@ -12666,22 +12654,57 @@ async function loadFitsTile(url) {
     const dataMin = getNumericHeaderValue(image.header, jsfitsio_1.FITSHeaderManager.DATAMIN);
     const dataMax = getNumericHeaderValue(image.header, jsfitsio_1.FITSHeaderManager.DATAMAX);
     const pixels = new Float32Array(data.length);
+    let physicalMin = null;
+    let physicalMax = null;
+    const robustSamples = [];
+    const sampleStep = Math.max(1, Math.floor(data.length / ROBUST_SAMPLE_COUNT));
     for (let i = 0; i < data.length; i++) {
         const rawValue = data[i];
         if (!Number.isFinite(rawValue) || (blank !== null && rawValue === blank)) {
             pixels[i] = Number.NaN;
             continue;
         }
-        pixels[i] = rawValue * bscale + bzero;
+        const physicalValue = rawValue * bscale + bzero;
+        pixels[i] = physicalValue;
+        if (Number.isFinite(physicalValue)) {
+            physicalMin =
+                physicalMin === null ? physicalValue : Math.min(physicalMin, physicalValue);
+            physicalMax =
+                physicalMax === null ? physicalValue : Math.max(physicalMax, physicalValue);
+            if (i % sampleStep === 0) {
+                robustSamples.push(physicalValue);
+            }
+        }
     }
+    const robustRange = computeRobustRange(robustSamples);
     return {
         width,
         height,
         pixels,
         dataMin,
         dataMax,
+        physicalMin,
+        physicalMax,
+        robustMin: robustRange?.min ?? null,
+        robustMax: robustRange?.max ?? null,
     };
 }
+function computeRobustRange(samples) {
+    if (samples.length === 0) {
+        return null;
+    }
+    samples.sort((a, b) => a - b);
+    const min = percentile(samples, ROBUST_LOW_PERCENTILE);
+    const max = percentile(samples, ROBUST_HIGH_PERCENTILE);
+    if (!Number.isFinite(min) || !Number.isFinite(max) || max <= min) {
+        return null;
+    }
+    return { min, max };
+}
+function percentile(sortedValues, p) {
+    const index = Math.min(sortedValues.length - 1, Math.max(0, Math.round((sortedValues.length - 1) * p)));
+    return sortedValues[index];
+}
 function getNumericHeaderValue(header, key) {
     const item = header.findById(key);
     if (!item) {
@@ -12885,6 +12908,21 @@ const ColorMaps_js_1 = __importDefault(__webpack_require__(619));
 const AncestorTile_js_1 = __importDefault(__webpack_require__(2885));
 const AllSky_js_1 = __importDefault(__webpack_require__(2368));
 const HiPSCoverage_js_1 = __webpack_require__(9912);
+const FITS_SCALE_FUNCTION_INDEX = {
+    linear: 0,
+    sqrt: 1,
+    log: 2,
+    asinh: 3,
+    gamma: 4,
+};
+const DEFAULT_FITS_SCALE_PARAM = {
+    linear: 1,
+    sqrt: 1,
+    log: 100,
+    asinh: 10,
+    gamma: 0.5,
+};
+const MAX_ROBUST_TILE_RANGES = 512;
 class HiPS extends AbstractSkyEntity_js_1.AbstractSkyEntity {
     _ancestorTiles;
     _allSkyTile;
@@ -12901,6 +12939,13 @@ class HiPS extends AbstractSkyEntity_js_1.AbstractSkyEntity {
     samplerIdx = 0;
     colorMapIdx = 0;
     colorMap = ColorMaps_js_1.default["native"];
+    _fitsStretch = {
+        scaleFunction: "linear",
+        scaleFunctionIndex: FITS_SCALE_FUNCTION_INDEX.linear,
+        scaleParam: DEFAULT_FITS_SCALE_PARAM.linear,
+        rangeMode: "robust",
+    };
+    _robustFITSRanges = [];
     _healpixGrid;
     // exposed read-only helpers
     get maxOrder() {
@@ -13136,6 +13181,137 @@ class HiPS extends AbstractSkyEntity_js_1.AbstractSkyEntity {
     get dataRange() {
         return this._descriptor.dataRange;
     }
+    get fitsStretch() {
+        return this._fitsStretch;
+    }
+    setFITSScaleFunction(scaleFunction, scaleParam) {
+        const scaleFunctionIndex = FITS_SCALE_FUNCTION_INDEX[scaleFunction];
+        if (scaleFunctionIndex === undefined) {
+            throw new Error(`Unsupported FITS scale function: ${scaleFunction}`);
+        }
+        const defaultParam = DEFAULT_FITS_SCALE_PARAM[scaleFunction];
+        const param = scaleParam ?? defaultParam;
+        if (!Number.isFinite(param) || param <= 0) {
+            throw new Error(`Invalid FITS scale parameter: ${param}`);
+        }
+        this._fitsStretch = {
+            ...this._fitsStretch,
+            scaleFunction,
+            scaleFunctionIndex,
+            scaleParam: param,
+        };
+    }
+    setFITSRangeMode(rangeMode) {
+        if (rangeMode !== "robust" && rangeMode !== "hips" && rangeMode !== "tile") {
+            throw new Error(`Unsupported FITS range mode: ${rangeMode}`);
+        }
+        this._fitsStretch = {
+            ...this._fitsStretch,
+            rangeMode,
+        };
+    }
+    observeFITSDataRange(fits) {
+        if (fits.robustMin === null ||
+            fits.robustMax === null ||
+            !Number.isFinite(fits.robustMin) ||
+            !Number.isFinite(fits.robustMax) ||
+            fits.robustMax <= fits.robustMin) {
+            return;
+        }
+        this._robustFITSRanges.push({
+            min: fits.robustMin,
+            max: fits.robustMax,
+        });
+        if (this._robustFITSRanges.length > MAX_ROBUST_TILE_RANGES) {
+            this._robustFITSRanges.shift();
+        }
+    }
+    getFITSDisplayRange(fits) {
+        const hipsRange = this.getHiPSDataRange();
+        if (this._fitsStretch.rangeMode === "hips" && hipsRange) {
+            return hipsRange;
+        }
+        if (this._fitsStretch.rangeMode === "robust") {
+            const robustRange = this.getRobustFITSRange() ?? this.getTileRobustRange(fits);
+            if (robustRange) {
+                return robustRange;
+            }
+        }
+        const tileRange = this.getTilePhysicalRange(fits) ?? this.getTileHeaderRange(fits);
+        if (tileRange) {
+            return tileRange;
+        }
+        return hipsRange;
+    }
+    getHiPSDataRange() {
+        const hipsRange = this.dataRange;
+        if (hipsRange.min !== undefined &&
+            hipsRange.max !== undefined &&
+            Number.isFinite(hipsRange.min) &&
+            Number.isFinite(hipsRange.max) &&
+            hipsRange.max > hipsRange.min) {
+            return {
+                min: hipsRange.min,
+                max: hipsRange.max,
+            };
+        }
+        return null;
+    }
+    getRobustFITSRange() {
+        if (this._robustFITSRanges.length === 0) {
+            return null;
+        }
+        const lows = this._robustFITSRanges.map((range) => range.min).sort((a, b) => a - b);
+        const highs = this._robustFITSRanges.map((range) => range.max).sort((a, b) => a - b);
+        const min = lows[Math.floor((lows.length - 1) * 0.1)];
+        const max = highs[Math.ceil((highs.length - 1) * 0.9)];
+        if (!Number.isFinite(min) || !Number.isFinite(max) || max <= min) {
+            return null;
+        }
+        return { min, max };
+    }
+    getTileRobustRange(fits) {
+        if (fits &&
+            fits.robustMin !== null &&
+            fits.robustMax !== null &&
+            Number.isFinite(fits.robustMin) &&
+            Number.isFinite(fits.robustMax) &&
+            fits.robustMax > fits.robustMin) {
+            return {
+                min: fits.robustMin,
+                max: fits.robustMax,
+            };
+        }
+        return null;
+    }
+    getTilePhysicalRange(fits) {
+        if (fits &&
+            fits.physicalMin !== null &&
+            fits.physicalMax !== null &&
+            Number.isFinite(fits.physicalMin) &&
+            Number.isFinite(fits.physicalMax) &&
+            fits.physicalMax > fits.physicalMin) {
+            return {
+                min: fits.physicalMin,
+                max: fits.physicalMax,
+            };
+        }
+        return null;
+    }
+    getTileHeaderRange(fits) {
+        if (fits &&
+            fits.dataMin !== null &&
+            fits.dataMax !== null &&
+            Number.isFinite(fits.dataMin) &&
+            Number.isFinite(fits.dataMax) &&
+            fits.dataMax > fits.dataMin) {
+            return {
+                min: fits.dataMin,
+                max: fits.dataMax,
+            };
+        }
+        return null;
+    }
     getCurrentHealpixOrder() {
         return this._visibleorder;
     }
@@ -13646,6 +13822,7 @@ class Tile {
     async loadFits() {
         try {
             this._fitsTile = await (0, FitsTileLoader_js_1.loadFitsTile)(this._texurl);
+            this._hips.observeFITSDataRange(this._fitsTile);
             this._ready = true;
         }
         catch (error) {
@@ -13784,30 +13961,7 @@ class Tile {
         gl.bufferData(gl.ARRAY_BUFFER, this.vertexPosition[qidx], gl.STATIC_DRAW);
     }
     getFitsDataRange() {
-        const hipsRange = this._hips.dataRange;
-        if (hipsRange.min !== undefined &&
-            hipsRange.max !== undefined &&
-            Number.isFinite(hipsRange.min) &&
-            Number.isFinite(hipsRange.max) &&
-            hipsRange.max > hipsRange.min) {
-            return {
-                min: hipsRange.min,
-                max: hipsRange.max,
-            };
-        }
-        const fits = this._fitsTile;
-        if (fits &&
-            fits.dataMin !== null &&
-            fits.dataMax !== null &&
-            Number.isFinite(fits.dataMin) &&
-            Number.isFinite(fits.dataMax) &&
-            fits.dataMax > fits.dataMin) {
-            return {
-                min: fits.dataMin,
-                max: fits.dataMax,
-            };
-        }
-        return null;
+        return this._hips.getFITSDisplayRange(this._fitsTile);
     }
     get inView() {
         return this._inView;
@@ -13911,7 +14065,7 @@ class Tile {
                 console.error(`[Tile] No display range available for FITS tile ${this._texurl}`);
                 return;
             }
-            hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, true, range.min, range.max);
+            hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, true, range.min, range.max, this._hips.fitsStretch.scaleFunctionIndex, this._hips.fitsStretch.scaleParam);
         }
         else {
             hipsShaderProgram.setTextureDataMode(this._hipsShaderIndex, false);
@@ -16756,6 +16910,8 @@ class HiPSShaderProgram {
             textureMode: "uTextureMode",
             dataMin: "uDataMin",
             dataMax: "uDataMax",
+            scaleFunction: "uScaleFunction",
+            scaleParam: "uScaleParam",
         };
         this.gl_attributes = {
             vertex_pos: "aVertexPosition",
@@ -16770,6 +16926,8 @@ class HiPSShaderProgram {
             textureMode: new Array(8).fill(null),
             dataMin: new Array(8).fill(null),
             dataMax: new Array(8).fill(null),
+            scaleFunction: new Array(8).fill(null),
+            scaleParam: new Array(8).fill(null),
             layerOpacity: null,
             clorMapIdx: null,
             vertexPositionAttribute: -1,
@@ -16903,7 +17061,7 @@ class HiPSShaderProgram {
         }
         gl.useProgram(this.shaderProgram);
     }
-    setTextureDataMode(samplerIndex, fits, min, max) {
+    setTextureDataMode(samplerIndex, fits, min, max, scaleFunction = 0, scaleParam = 1) {
         if (samplerIndex < 0 || samplerIndex >= 8) {
             throw new Error(`Invalid HiPS sampler index: ${samplerIndex}`);
         }
@@ -16924,12 +17082,20 @@ class HiPSShaderProgram {
         }
         const minLocation = this.locations.dataMin[samplerIndex];
         const maxLocation = this.locations.dataMax[samplerIndex];
+        const scaleFunctionLocation = this.locations.scaleFunction[samplerIndex];
+        const scaleParamLocation = this.locations.scaleParam[samplerIndex];
         if (minLocation) {
             gl.uniform1f(minLocation, min);
         }
         if (maxLocation) {
             gl.uniform1f(maxLocation, max);
         }
+        if (scaleFunctionLocation) {
+            gl.uniform1i(scaleFunctionLocation, scaleFunction);
+        }
+        if (scaleParamLocation) {
+            gl.uniform1f(scaleParamLocation, scaleParam);
+        }
     }
     enableShaders(pMatrix, vMatrix, mMatrix, colorMapIdx) {
         // const gl = global.gl
@@ -16945,6 +17111,8 @@ class HiPSShaderProgram {
             this.locations.textureMode[i] = gl.getUniformLocation(this.shaderProgram, `uTextureMode${i}`);
             this.locations.dataMin[i] = gl.getUniformLocation(this.shaderProgram, `uDataMin${i}`);
             this.locations.dataMax[i] = gl.getUniformLocation(this.shaderProgram, `uDataMax${i}`);
+            this.locations.scaleFunction[i] = gl.getUniformLocation(this.shaderProgram, `uScaleFunction${i}`);
+            this.locations.scaleParam[i] = gl.getUniformLocation(this.shaderProgram, `uScaleParam${i}`);
             if (this.locations.samplers[i]) {
                 gl.uniform1i(this.locations.samplers[i], i);
             }
@@ -17281,7 +17449,7 @@ class ShaderManager {
     }
     static footprintVS() {
         return `#version 300 es
-    precision highp float;
+    precision mediump float;
 
     layout(location = 0) in vec4 aCatPosition;
 
@@ -17323,7 +17491,7 @@ class ShaderManager {
     }
     static hipsNativeFS() {
         return `#version 300 es
-    precision mediump float;
+    precision highp float;
 
     in vec2 vTextureCoord;
 
@@ -17389,7 +17557,7 @@ class ShaderManager {
     }
     static hipsGrayscaleFS() {
         return `#version 300 es
-    precision mediump float;
+    precision highp float;
 
     in vec2 vTextureCoord;
 
@@ -17463,7 +17631,7 @@ class ShaderManager {
     }
     static hipsColorMapFS() {
         return `#version 300 es
-    precision mediump float;
+    precision highp float;
 
     uniform float uLayerOpacity;
 
@@ -17568,6 +17736,36 @@ class ShaderManager {
     uniform int uTextureMode${index};
     uniform float uDataMin${index};
     uniform float uDataMax${index};
+    uniform int uScaleFunction${index};
+    uniform float uScaleParam${index};
+
+    float asinhCompat${index}(float value) {
+      return log(value + sqrt(value * value + 1.0));
+    }
+
+    float applyFitsScale${index}(float normalized) {
+      float x = clamp(normalized, 0.0, 1.0);
+
+      if (uScaleFunction${index} == 1) {
+        return sqrt(x);
+      }
+
+      if (uScaleFunction${index} == 2) {
+        float strength = max(uScaleParam${index}, 1.0);
+        return log(1.0 + strength * x) / log(1.0 + strength);
+      }
+
+      if (uScaleFunction${index} == 3) {
+        float strength = max(uScaleParam${index}, 1.0);
+        return asinhCompat${index}(strength * x) / asinhCompat${index}(strength);
+      }
+
+      if (uScaleFunction${index} == 4) {
+        return pow(x, max(uScaleParam${index}, 0.0001));
+      }
+
+      return x;
+    }
 
     vec4 sampleHiPSTexture${index}(vec2 uv) {
       vec4 color = texture(uSampler${index}, uv);
@@ -17591,10 +17789,12 @@ class ShaderManager {
         1.0
       );
 
+      float scaled = applyFitsScale${index}(normalized);
+
       return vec4(
-        normalized,
-        normalized,
-        normalized,
+        scaled,
+        scaled,
+        scaled,
         1.0
       );
     }