astro-viewer 3.1.0 → 3.2.0

package/lib-esm/AstroViewer.d.ts

@@ -10,6 +10,7 @@ import { ReadonlyMat4 } from 'gl-matrix';
 import { ColorMap, ColorMapName } from './model/ColorMaps.js';
 import { HiPS } from './model/hips/HiPS.js';
 import type { WMTSLayerConfig, XYZDebugStats, XYZLayerConfig } from './model/earth/XYZConfig.js';
+import type { HiPSDebugStats } from './model/hips/HiPSConfig.js';
 import { XYZMap } from './model/earth/XYZMap.js';
 import { TerraPointSetGL } from './model/terra/TerraPointSetGL.js';
 import { TerraFootprintSetGL } from './model/terra/TerraFootprintSetGL.js';
@@ -56,6 +57,7 @@ export declare class AstroViewer {
     setXYZMaxConcurrentRequests(value: number): void;
     getXYZMaxConcurrentRequests(): number;
     getXYZDebugStats(): XYZDebugStats;
+    getHiPSDebugStats(): HiPSDebugStats | null;
     loadHiPS(baseUrl: string): Promise<string>;
     changeColorMap(colorMapName: ColorMapName): void;
     changeCustomColorMap(colorMap: ColorMap): void;

package/lib-esm/AstroViewer.js

@@ -145,6 +145,9 @@ export class AstroViewer {
     getXYZDebugStats() {
         return this.astroSphere.getXYZDebugStats();
     }
+    getHiPSDebugStats() {
+        return this.astroSphere.getHiPSDebugStats();
+    }
     async loadHiPS(baseUrl) {
         const hipsUrl = baseUrl.endsWith('/') ? baseUrl : baseUrl + '/';
         const resp = await fetch(hipsUrl + 'properties');

package/lib-esm/Camera.js

@@ -84,13 +84,11 @@ class Camera {
     toggleInsideSphere() {
         // if (inside !== global.insideSphere) {
         //   global.insideSphere = inside;
+        this.insideSphere = global.insideSphere;
         if (global.insideSphere) {
-            if (this.cam_pos[2] <= 2) {
-                this.cam_pos[2] = -2 + this.cam_pos[2];
-            }
-            else {
-                this.cam_pos[2] = -0.005;
-            }
+            this.cam_pos[0] = 0;
+            this.cam_pos[1] = 0;
+            this.cam_pos[2] = -0.005;
         }
         else {
             this.cam_pos[2] = 2.0 + this.cam_pos[2];

package/lib-esm/Config.d.ts

@@ -5,6 +5,8 @@ export interface BootSetup {
     defaultHips: string;
     camera_fov_deg: number;
     camera_fov_rad: number;
+    inside_camera_fov_deg: number;
+    inside_camera_fov_rad: number;
     camera_near_plane: number;
     camera_far_plane: number;
     corsProxyUrl: string;

package/lib-esm/Config.js

@@ -29,6 +29,8 @@ export const bootSetup = {
     defaultHips: "",
     camera_fov_deg: 34,
     camera_fov_rad: 34 * Math.PI / 180.0,
+    inside_camera_fov_deg: 60,
+    inside_camera_fov_rad: 60 * Math.PI / 180.0,
     camera_near_plane: 0.00001,
     camera_far_plane: 2.5,
     corsProxyUrl: "http://localhost:4000/",
@@ -39,5 +41,5 @@ export const bootSetup = {
     version: "Astrobrowser v1.0.0",
     debug: false,
     insideView: false,
-    showViewfinder: false,
+    showViewfinder: true,
 };

package/lib-esm/index.d.ts

@@ -12,6 +12,8 @@ export { MetadataColumn, MetadataInit, ColumnType } from './model/MetadataColumn
 export { Point, SphericalOpts, AstroOpts, PointInitOpts, CartesianOpts } from './model/Point.js';
 export { FoVUtils } from './utils/FoVUtils.js';
 export { CoordsType } from './utils/CoordsType.js';
+export { default as GeoJSONParser } from './utils/GeoJSONParser.js';
+export type { ParsedGeoJSONFeature, GeoJSONProperties } from './utils/GeoJSONParser.js';
 export { ColorMaps, COLOR_MAP_SAMPLE_COUNT, createColorMapFromSamples } from './model/ColorMaps.js';
 export type { ColorMap, ColorMapName } from './model/ColorMaps.js';
 export { HiPS } from './model/hips/HiPS.js';

package/lib-esm/index.js

@@ -23,6 +23,7 @@ export { MetadataColumn, ColumnType } from './model/MetadataColumn.js';
 export { Point } from './model/Point.js';
 export { FoVUtils } from './utils/FoVUtils.js';
 export { CoordsType } from './utils/CoordsType.js';
+export { default as GeoJSONParser } from './utils/GeoJSONParser.js';
 export { ColorMaps, COLOR_MAP_SAMPLE_COUNT, createColorMapFromSamples } from './model/ColorMaps.js';
 export { HiPS } from './model/hips/HiPS.js';
 export { XYZMap } from './model/earth/XYZMap.js';

package/lib-esm/model/AbstractSkyEntity.d.ts

@@ -19,6 +19,7 @@ export interface SkyEntityDrawInput {
         phi: number;
         theta: number;
     }>;
+    cameraMoving?: boolean;
 }
 export declare abstract class AbstractSkyEntity {
     refreshMe: boolean;

package/lib-esm/model/MetadataManager.d.ts

@@ -34,6 +34,7 @@ export declare class MetadataManager {
     get shapeColumnList(): MetadataColumn[];
     set selectedRaColumn(columnName: string);
     set selectedDecColumn(columnName: string);
+    set selectedOutlineColumn(columnName: string);
     set selectedHueColumn(columnName: string);
     set selectedShapeColumn(columnName: string);
     set selectedNameColumn(columnName: string);

package/lib-esm/model/MetadataManager.js

@@ -110,6 +110,9 @@ export class MetadataManager {
     set selectedDecColumn(columnName) {
         this._selectedDecColumn = this._decColumnList.find(c => c.name === columnName) || this._selectedDecColumn;
     }
+    set selectedOutlineColumn(columnName) {
+        this._selectedOutlineColumn = this._outlineColumnList.find(c => c.name === columnName) || this._selectedOutlineColumn;
+    }
     set selectedHueColumn(columnName) {
         this._selectedHueColumn = this._hueColumnList.find(c => c.name === columnName);
     }
@@ -117,7 +120,7 @@ export class MetadataManager {
         this._selectedShapeColumn = this._shapeColumnList.find(c => c.name === columnName);
     }
     set selectedNameColumn(columnName) {
-        this._selectedNameColumn = this._shapeColumnList.find(c => c.name === columnName);
+        this._selectedNameColumn = this._columns.find(c => c.name === columnName);
     }
     resetShapeColumn() {
         this._selectedShapeColumn = undefined;

package/lib-esm/model/Point.d.ts

@@ -9,11 +9,15 @@ export type AstroOpts = {
     raDeg: number;
     decDeg: number;
 };
+export type GeographicOpts = {
+    lonDeg: number;
+    latDeg: number;
+};
 export type SphericalOpts = {
     phiDeg: number;
     thetaDeg: number;
 };
-export type PointInitOpts = CartesianOpts | AstroOpts | SphericalOpts;
+export type PointInitOpts = CartesianOpts | AstroOpts | GeographicOpts | SphericalOpts;
 export declare class Point {
     private _x;
     private _y;
@@ -24,6 +28,7 @@ export declare class Point {
     private _raRad;
     private _decRad;
     private _raDecDeg;
+    private _lonLatDeg?;
     constructor(in_options: PointInitOpts, in_type: CoordsType);
     private computeAstroCoords;
     private computeCartesianCoords;
@@ -47,6 +52,9 @@ export declare class Point {
     get raDeg(): number;
     get decDeg(): number;
     get raDecDeg(): [number, number];
+    get lonDeg(): number;
+    get latDeg(): number;
+    get lonLatDeg(): [number, number];
     toADQL(): string;
     toString(): string;
 }

package/lib-esm/model/Point.js

@@ -28,6 +28,7 @@ export class Point {
     _raRad;
     _decRad;
     _raDecDeg;
+    _lonLatDeg;
     constructor(in_options, in_type) {
         this._xyz = [0, 0, 0];
         this._raDecDeg = [0, 0];
@@ -59,6 +60,20 @@ export class Point {
             this._z = Number(z.toFixed(MAX_DECIMALS));
             this._xyz = [this._x, this._y, this._z];
         }
+        else if (in_type === CoordsType.GEOGRAPHIC) {
+            const { lonDeg, latDeg } = in_options;
+            this._lonLatDeg = [Number(lonDeg), Number(latDeg)];
+            this._raDeg = this._lonLatDeg[0];
+            this._decDeg = this._lonLatDeg[1];
+            this._raDecDeg = [this._raDeg, this._decDeg];
+            this._raRad = (this._raDeg * Math.PI) / 180;
+            this._decRad = (this._decDeg * Math.PI) / 180;
+            const [x, y, z] = this.computeCartesianCoords();
+            this._x = Number(x.toFixed(MAX_DECIMALS));
+            this._y = Number(y.toFixed(MAX_DECIMALS));
+            this._z = Number(z.toFixed(MAX_DECIMALS));
+            this._xyz = [this._x, this._y, this._z];
+        }
         else if (in_type === CoordsType.SPHERICAL) {
             // Not implemented in original; keep behavior
             console.log(`${CoordsType.SPHERICAL} not implemented yet`);
@@ -135,6 +150,9 @@ export class Point {
     get raDeg() { return this._raDeg; }
     get decDeg() { return this._decDeg; }
     get raDecDeg() { return this._raDecDeg; }
+    get lonDeg() { return this._lonLatDeg?.[0] ?? this._raDeg; }
+    get latDeg() { return this._lonLatDeg?.[1] ?? this._decDeg; }
+    get lonLatDeg() { return this._lonLatDeg ?? [this._raDeg, this._decDeg]; }
     toADQL() {
         return `${this._raDecDeg[0]},${this._raDecDeg[1]}`;
     }

package/lib-esm/model/SphereFoV.js

@@ -115,7 +115,7 @@ export class SphereFoV {
         }
         const angleDeg = 2 * this.computeAngularDistanceDeg(centerHit.point, edgeHit.point);
         return {
-            angleDeg: insideSphere ? 360 - angleDeg : angleDeg,
+            angleDeg,
             distance: edgeHit.distance,
         };
     }
@@ -123,8 +123,9 @@ export class SphereFoV {
         const aNorm = vec3.normalize(vec3.create(), a);
         const bNorm = vec3.normalize(vec3.create(), b);
         const dot = vec3.dot(aNorm, bNorm);
-        const clamped = Math.min(1, Math.max(-1, dot));
-        return radToDeg(Math.acos(clamped));
+        const cross = vec3.cross(vec3.create(), aNorm, bNorm);
+        const angleRad = Math.atan2(vec3.length(cross), Math.min(1, Math.max(-1, dot)));
+        return radToDeg(angleRad);
     }
     getIntersectionPointWithModel(mouseX, mouseY, model, camera, pMatrix) {
         const rayWorld = this.getRayFromMouse(mouseX, mouseY, pMatrix, camera.getCameraMatrix());

package/lib-esm/model/earth/XYZConfig.d.ts

@@ -29,6 +29,10 @@ export type XYZLayerDebugStats = {
     coarseTileCount: number;
     hasPendingSelection: boolean;
     pendingSelectionKey: string | null;
+    hipsName?: string;
+    hipsUrl?: string;
+    isGalactic?: boolean;
+    currentOrder?: number | null;
 };
 export type XYZRequestBackoffDebugEntry = {
     host: string;

package/lib-esm/model/earth/XYZFoVHelper.d.ts

@@ -1,6 +1,9 @@
 declare class XYZFoVHelper {
-    getZoom(fov: number): number;
-    getLonLatSteps(fov: number): {
+    private static readonly LEVEL_HYSTERESIS;
+    private static readonly ZOOM_MIN_FOV;
+    getZoom(fov: number, currentZoom?: number): number;
+    private getRawZoom;
+    getLonLatSteps(fov: number, coarse?: boolean): {
         lonStep: number;
         latStep: number;
     };

package/lib-esm/model/earth/XYZFoVHelper.js

@@ -13,7 +13,40 @@
 // FoVHelper.ts
 'use strict';
 class XYZFoVHelper {
-    getZoom(fov) {
+    static LEVEL_HYSTERESIS = 0.12;
+    static ZOOM_MIN_FOV = {
+        2: 179,
+        3: 90,
+        4: 30,
+        5: 20,
+        6: 6,
+        7: 3.2,
+        8: 1.6,
+        9: 0.85,
+        10: 0.42,
+        11: 0.21,
+        12: 0.12,
+        13: 0.06,
+        14: 0.015,
+        15: 0,
+    };
+    getZoom(fov, currentZoom) {
+        const rawZoom = this.getRawZoom(fov);
+        if (currentZoom === undefined || currentZoom === rawZoom)
+            return rawZoom;
+        if (rawZoom > currentZoom) {
+            const boundary = XYZFoVHelper.ZOOM_MIN_FOV[currentZoom];
+            if (boundary > 0 && fov > boundary * (1 - XYZFoVHelper.LEVEL_HYSTERESIS))
+                return currentZoom;
+        }
+        else {
+            const boundary = XYZFoVHelper.ZOOM_MIN_FOV[rawZoom];
+            if (boundary > 0 && fov < boundary * (1 + XYZFoVHelper.LEVEL_HYSTERESIS))
+                return currentZoom;
+        }
+        return rawZoom;
+    }
+    getRawZoom(fov) {
         if (fov >= 179)
             return 2;
         if (fov >= 90)
@@ -43,10 +76,14 @@ class XYZFoVHelper {
         return 15;
     }
     // used in grid drawing
-    getLonLatSteps(fov) {
+    getLonLatSteps(fov, coarse = false) {
         let lonStep;
         let latStep;
-        if (fov >= 179) {
+        if (coarse && fov < 0.21) {
+            lonStep = 10;
+            latStep = 10;
+        }
+        else if (fov >= 179) {
             lonStep = 10;
             latStep = 10;
         }

package/lib-esm/model/footprints/Footprint.d.ts

@@ -3,6 +3,7 @@
  */
 import { SelectionObj } from '../../utils/GeomUtils.js';
 import { Point } from '../Point.js';
+import { CoordsType } from '../../utils/CoordsType.js';
 export interface FootprintDetail {
     key: string;
     value: string | number;
@@ -19,6 +20,7 @@ export declare class Footprint {
     private _totConvexPoints;
     private _npix256?;
     private _footprintsPointsOrder?;
+    private _coordsType;
     private _selectionObj;
     private _identifier?;
     private _center?;
@@ -27,7 +29,8 @@ export declare class Footprint {
      * @param in_details optional metadata
      * @param footprintsPointsOrder 1-> clockwise, -1 counter clockwise
      */
-    constructor(in_stcs?: string, in_details?: FootprintDetail[], footprintsPointsOrder?: 1 | -1);
+    constructor(in_stcs?: string, in_details?: FootprintDetail[], footprintsPointsOrder?: 1 | -1, coordsType?: CoordsType.ASTRO | CoordsType.GEOGRAPHIC);
+    static fromPolygons(polygons: Point[][], details?: FootprintDetail[], coordsType?: CoordsType.ASTRO | CoordsType.GEOGRAPHIC): Footprint;
     private computeSelectionObject;
     private computePoints;
     get valid(): boolean;

package/lib-esm/model/footprints/Footprint.js

@@ -19,6 +19,7 @@
 import GeomUtils from '../../utils/GeomUtils.js';
 // import global from '../../Global.js';
 import STCSParser from '../../utils/STCSParser.js';
+import { CoordsType } from '../../utils/CoordsType.js';
 // export interface ParsedSTCS {
 //   polygons: Point[][]; // array of polygons (each polygon is array of Point objects)
 //   totpoints: number;
@@ -33,6 +34,7 @@ export class Footprint {
     _totConvexPoints = 0;
     _npix256;
     _footprintsPointsOrder;
+    _coordsType;
     _selectionObj;
     _identifier;
     _center; // could be typed if you have a Point type
@@ -41,7 +43,8 @@ export class Footprint {
      * @param in_details optional metadata
      * @param footprintsPointsOrder 1-> clockwise, -1 counter clockwise
      */
-    constructor(in_stcs, in_details = [], footprintsPointsOrder) {
+    constructor(in_stcs, in_details = [], footprintsPointsOrder, coordsType = CoordsType.ASTRO) {
+        this._coordsType = coordsType;
         if (in_stcs) {
             this._stcs = in_stcs.toUpperCase();
             this._details = in_details;
@@ -56,6 +59,17 @@ export class Footprint {
             this._details = [];
         }
     }
+    static fromPolygons(polygons, details = [], coordsType = CoordsType.ASTRO) {
+        const footprint = new Footprint(undefined, [], undefined, coordsType);
+        footprint._polygons = polygons;
+        footprint._details = details;
+        footprint._totPoints = polygons.reduce((total, polygon) => total + polygon.length, 0);
+        footprint._totConvexPoints = 0;
+        footprint._coordsType = coordsType;
+        footprint._selectionObj = footprint.computeSelectionObject();
+        footprint._valid = footprint._totPoints > 0;
+        return footprint;
+    }
     computeSelectionObject() {
         return GeomUtils.computeSelectionObject(this._polygons);
     }
@@ -78,7 +92,9 @@ export class Footprint {
     //   return Array.from(rangeSet.r);
     // }
     computePoints() {
-        const res = STCSParser.parseSTCS(this._stcs);
+        const res = STCSParser.parseSTCS(this._stcs, {
+            coordsType: this._coordsType,
+        });
         this._polygons = res.polygons;
         this._totPoints = res.totpoints;
     }

package/lib-esm/model/footprints/FootprintSetGL.d.ts

@@ -1,5 +1,6 @@
 import { Footprint } from "./Footprint.js";
 import MouseHelper from "../../utils/MouseHelper.js";
+import { CoordsType } from "../../utils/CoordsType.js";
 import { MetadataManager } from "../MetadataManager.js";
 import { MetadataColumn } from "../MetadataColumn.js";
 import { VisibleTilesManager } from "../hips/VisibleTilesManager.js";
@@ -58,10 +59,11 @@ export declare class FootprintSetGL {
     totSelectedPoints: number;
     nSlectedPrimitiveFlags: number;
     _shapeColor: string;
-    private _bufferInitialised;
+    protected _coordsType: CoordsType.ASTRO | CoordsType.GEOGRAPHIC;
+    protected _bufferInitialised: boolean;
     private _webgl;
     _isVisible: boolean;
-    private _metadataManager;
+    protected _metadataManager: MetadataManager;
     _providerUrl: string;
     private _footprintShaderProgram;
     private _visibleTilesManager;

package/lib-esm/model/footprints/FootprintSetGL.js

@@ -58,6 +58,7 @@ export class FootprintSetGL {
     totSelectedPoints;
     nSlectedPrimitiveFlags = 0;
     _shapeColor = "#00fff2ff";
+    _coordsType = CoordsType.ASTRO;
     _bufferInitialised = false;
     _webgl;
     _isVisible = true;
@@ -139,7 +140,7 @@ export class FootprintSetGL {
         }
         for (let j = 0; j < in_data.length; j++) {
             if (in_data[j][geomDataIndex] !== null) {
-                const footprint = new Footprint(in_data[j][geomDataIndex], in_data[j]);
+                const footprint = new Footprint(in_data[j][geomDataIndex], in_data[j], undefined, this._coordsType);
                 if (footprint._valid) {
                     this.addFootprint(footprint);
                     this.totPoints += footprint.totPoints;
@@ -193,6 +194,11 @@ export class FootprintSetGL {
             }
         }
         this.indexes[this.indexes.length - 1] = MAX_UNSIGNED_INT;
+        this._webgl.bindBuffer(this._webgl.ARRAY_BUFFER, this.vertexCataloguePositionBuffer);
+        this._webgl.bufferData(this._webgl.ARRAY_BUFFER, this.vertexCataloguePosition, this._webgl.STATIC_DRAW);
+        this._webgl.bindBuffer(this._webgl.ELEMENT_ARRAY_BUFFER, this.indexBuffer);
+        this._webgl.bufferData(this._webgl.ELEMENT_ARRAY_BUFFER, this.indexes, this._webgl.STATIC_DRAW);
+        this._bufferInitialised = true;
         console.log("Buffer initialized");
     }
     checkSelection(mouseHelper) {
@@ -212,9 +218,8 @@ export class FootprintSetGL {
                 const details = [...footprint.details];
                 // const geomDataIndex = this.footprintsetProps.geomColumn?.index
                 const geomDataIndex = this._metadataManager.selectedOutlineColumn?.index ?? -1;
-                if (geomDataIndex < 0)
-                    continue;
-                details.splice(geomDataIndex, 1);
+                if (geomDataIndex >= 0)
+                    details.splice(geomDataIndex, 1);
                 this._hoveredFootprints.push(footprint);
                 this.totHoveredPoints += footprint.totPoints;
             }
@@ -586,11 +591,9 @@ export class FootprintSetGL {
             this._webgl.drawElements(this._webgl.LINE_LOOP, this.selectedVertexPosition.length / 3 + this.nSlectedPrimitiveFlags, this._webgl.UNSIGNED_INT, 0);
         }
         this._webgl.bindBuffer(this._webgl.ARRAY_BUFFER, this.vertexCataloguePositionBuffer);
-        this._webgl.bufferData(this._webgl.ARRAY_BUFFER, this.vertexCataloguePosition, this._webgl.STATIC_DRAW);
         this._webgl.vertexAttribPointer(this._footprintShaderProgram.locations.position, FootprintSetGL.ELEM_SIZE, this._webgl.FLOAT, false, FootprintSetGL.BYTES_X_ELEM * FootprintSetGL.ELEM_SIZE, 0);
         this._webgl.enableVertexAttribArray(this._footprintShaderProgram.locations.position);
         this._webgl.bindBuffer(this._webgl.ELEMENT_ARRAY_BUFFER, this.indexBuffer);
-        this._webgl.bufferData(this._webgl.ELEMENT_ARRAY_BUFFER, this.indexes, this._webgl.STATIC_DRAW);
         // const shapeColor = [...colorHex2RGB(this.footprintsetProps.shapeColor), 1.0] as [number, number, number, number]
         const shapeColor = [...colorHex2RGB(this._shapeColor), 1.0];
         this._webgl.uniform4f(this._footprintShaderProgram.locations.color, ...shapeColor);

package/lib-esm/model/grid/EquatorialGrid.d.ts

@@ -20,6 +20,7 @@ export declare class EquatorialGrid extends AbstractSkyEntity {
     private _thetaStepRad;
     private _phiArray;
     private _thetaArray;
+    private _bufferKey;
     private _dec4Labels;
     private _ra4Labels;
     private _healpixGrid;
@@ -34,7 +35,7 @@ export declare class EquatorialGrid extends AbstractSkyEntity {
     /** Build RA/Dec line vertex arrays based on FoV step helper */
     private initBuffers;
     /** Update buffers when FoV (in degrees) changes */
-    refresh(fovDeg: number): void;
+    refresh(fovDeg: number, coarse?: boolean): void;
     private vectorDistance;
     private enableShader;
     isVisible(): boolean;

package/lib-esm/model/grid/EquatorialGrid.js

@@ -48,6 +48,7 @@ export class EquatorialGrid extends AbstractSkyEntity {
     _thetaStepRad = 0;
     _phiArray = [];
     _thetaArray = [];
+    _bufferKey = '';
     // For placing text labels near current view center:
     //  - _dec4Labels: key = RA(deg), value = points along that RA ring (for Dec labels)
     //  - _ra4Labels : key = Dec(deg), value = points along that Dec ring (for RA labels)
@@ -108,9 +109,9 @@ export class EquatorialGrid extends AbstractSkyEntity {
         super.webgl.useProgram(this._shaderProgram);
     }
     /** Build RA/Dec line vertex arrays based on FoV step helper */
-    initBuffers(fovDeg) {
+    initBuffers(fovDeg, coarse = false) {
         const R = 1.0;
-        const steps = fovHelper.getRADegSteps(fovDeg);
+        const steps = fovHelper.getRADegSteps(fovDeg, coarse);
         const phiStep = steps.raStep; // RA step (deg)
         const thetaStep = steps.decStep; // Dec step (deg)
         this._phiStep = phiStep;
@@ -162,11 +163,14 @@ export class EquatorialGrid extends AbstractSkyEntity {
         }
     }
     /** Update buffers when FoV (in degrees) changes */
-    refresh(fovDeg) {
+    refresh(fovDeg, coarse = false) {
         // const fovDeg = healpixGridSingleton.getMinFoV()
-        if (this._fov !== fovDeg) {
+        const steps = fovHelper.getRADegSteps(fovDeg, coarse);
+        const bufferKey = `${coarse ? 'coarse' : 'settled'}:${steps.raStep}:${steps.decStep}`;
+        if (this._bufferKey !== bufferKey) {
             this._fov = fovDeg;
-            this.initBuffers(this._fov);
+            this._bufferKey = bufferKey;
+            this.initBuffers(this._fov, coarse);
         }
     }
     vectorDistance(p1, p2) {
@@ -226,7 +230,7 @@ export class EquatorialGrid extends AbstractSkyEntity {
             return;
         if (this._thetaArray.length === 0)
             return;
-        this.refresh(fovDeg);
+        this.refresh(fovDeg, !!input.cameraMoving);
         if (!this.showGrid) {
             // gridTextHelper.resetDivSets();
             this.gridText.resetDivSets();

package/lib-esm/model/grid/HealpixGrid.js

@@ -211,7 +211,7 @@ export class HealpixGrid extends AbstractSkyEntity {
         // (global as any).hipsFoV = fov;
         // global.order = fovHelper.getHiPSNorder(fov);
         // this._visibleorder = global.order;
-        this._visibleorder = fovHelper.getHiPSNorder(fov);
+        this._visibleorder = fovHelper.getHiPSNorder(fov, this._visibleorder);
     }
     enableShader(in_mMatrix, pMatrix, vMatrix) {
         const gl = super.webgl;
@@ -255,7 +255,10 @@ export class HealpixGrid extends AbstractSkyEntity {
         const pMatrix = input.pMatrix;
         if (!pMatrix)
             return;
-        this.refresh(camera, pMatrix);
+        // this.refresh(camera, pMatrix);
+        const rawFov = input.fovDeg ?? this.getMinFoV();
+        const fov = Number.isFinite(rawFov) && rawFov > 0 ? rawFov : 1e-6;
+        this._visibleorder = fovHelper.getHiPSNorder(fov, this._visibleorder);
         if (!this.showGrid) {
             // gridTextHelper.resetDivSets();
             this.gridText.resetDivSets();

package/lib-esm/model/grid/LonLatGrid.d.ts

@@ -17,12 +17,15 @@ export declare class LatLonGrid extends AbstractSkyEntity {
     private _showGrid;
     private _lonArray;
     private _latArray;
+    private _bufferKey;
     private defaultColor;
     private gridText;
     constructor(radius: number, position: [number, number, number], xrad: number, yrad: number, name: string, webgl: WebGL2RenderingContext);
     init(): void;
     private initShaders;
     private initBuffers;
+    private buildLonRange;
+    private buildLatRange;
     private lonLatToCartesian;
     private refresh;
     refreshFoV(input: SkyEntityDrawInput): number;