astro-viewer 3.9.0 → 3.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/astroviewer.cjs +183 -112
- package/dist/astroviewer.cjs.map +1 -1
- package/dist/astroviewer.js +183 -112
- package/dist/astroviewer.js.map +1 -1
- package/dist/astroviewer.min.js +1 -1
- package/dist/astroviewer.min.js.map +1 -1
- package/lib-esm/AstroViewer.d.ts.map +1 -1
- package/lib-esm/AstroViewer.js +3 -3
- package/lib-esm/AstroViewer.js.map +1 -1
- package/lib-esm/Global.d.ts +3 -3
- package/lib-esm/Global.d.ts.map +1 -1
- package/lib-esm/Global.js +38 -16
- package/lib-esm/Global.js.map +1 -1
- package/lib-esm/model/Source.d.ts.map +1 -1
- package/lib-esm/model/Source.js +2 -1
- package/lib-esm/model/Source.js.map +1 -1
- package/lib-esm/model/catalogues/CatalogueGL.d.ts +8 -7
- package/lib-esm/model/catalogues/CatalogueGL.d.ts.map +1 -1
- package/lib-esm/model/catalogues/CatalogueGL.js +63 -86
- package/lib-esm/model/catalogues/CatalogueGL.js.map +1 -1
- package/lib-esm/model/footprints/FootprintSetGL.d.ts +1 -3
- package/lib-esm/model/footprints/FootprintSetGL.d.ts.map +1 -1
- package/lib-esm/model/footprints/FootprintSetGL.js +1 -3
- package/lib-esm/model/footprints/FootprintSetGL.js.map +1 -1
- package/lib-esm/model/hips/VisibleTilesManager.d.ts +6 -3
- package/lib-esm/model/hips/VisibleTilesManager.d.ts.map +1 -1
- package/lib-esm/model/hips/VisibleTilesManager.js.map +1 -1
- package/lib-esm/model/meships/MeshHiPS.d.ts +4 -4
- package/lib-esm/model/meships/MeshHiPS.d.ts.map +1 -1
- package/lib-esm/model/meships/MeshHiPS.js +28 -12
- package/lib-esm/model/meships/MeshHiPS.js.map +1 -1
- package/lib-esm/model/terra/TerraFootprintSetGL.d.ts +2 -0
- package/lib-esm/model/terra/TerraFootprintSetGL.d.ts.map +1 -1
- package/lib-esm/model/terra/TerraFootprintSetGL.js +19 -0
- package/lib-esm/model/terra/TerraFootprintSetGL.js.map +1 -1
- package/lib-esm/model/terra/TerraPointSetGL.d.ts +4 -0
- package/lib-esm/model/terra/TerraPointSetGL.d.ts.map +1 -1
- package/lib-esm/model/terra/TerraPointSetGL.js +36 -0
- package/lib-esm/model/terra/TerraPointSetGL.js.map +1 -1
- package/lib-esm/model/terra/TerraPolylineSetGL.d.ts +1 -3
- package/lib-esm/model/terra/TerraPolylineSetGL.d.ts.map +1 -1
- package/lib-esm/model/terra/TerraPolylineSetGL.js +1 -3
- package/lib-esm/model/terra/TerraPolylineSetGL.js.map +1 -1
- package/lib-esm/utils/MouseHelper.d.ts.map +1 -1
- package/lib-esm/utils/MouseHelper.js +2 -1
- package/lib-esm/utils/MouseHelper.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
* Copyright (C) Fabrizio Giordano
|
|
4
4
|
* SPDX-License-Identifier: LicenseRef-AstroViewer-Dual-License
|
|
5
5
|
*/
|
|
6
|
-
import { AbstractSkyEntity } from
|
|
7
|
-
import { fovHelper } from
|
|
8
|
-
import { MeshHiPSShaderProgram } from
|
|
9
|
-
import { MeshHiPSTile } from
|
|
6
|
+
import { AbstractSkyEntity } from "../AbstractSkyEntity.js";
|
|
7
|
+
import { fovHelper } from "../hips/FoVHelper.js";
|
|
8
|
+
import { MeshHiPSShaderProgram } from "../../shader/MeshHiPSShaderProgram.js";
|
|
9
|
+
import { MeshHiPSTile } from "./MeshHiPSTile.js";
|
|
10
10
|
export class MeshHiPS extends AbstractSkyEntity {
|
|
11
11
|
_descriptor;
|
|
12
12
|
_healpixGrid;
|
|
@@ -82,7 +82,9 @@ export class MeshHiPS extends AbstractSkyEntity {
|
|
|
82
82
|
const orders = Array.from(byOrder.keys()).sort((a, b) => a - b);
|
|
83
83
|
for (const order of orders) {
|
|
84
84
|
for (const coord of byOrder.get(order) ?? []) {
|
|
85
|
-
this._tiles
|
|
85
|
+
this._tiles
|
|
86
|
+
.get(this.tileKey(coord))
|
|
87
|
+
?.draw(pMatrix, vMatrix, mMatrix, this._descriptor.color, this._descriptor.wireframe);
|
|
86
88
|
}
|
|
87
89
|
}
|
|
88
90
|
if (wasCullFace)
|
|
@@ -95,7 +97,7 @@ export class MeshHiPS extends AbstractSkyEntity {
|
|
|
95
97
|
getDebugStats() {
|
|
96
98
|
const tiles = Array.from(this._tiles.values());
|
|
97
99
|
return {
|
|
98
|
-
activeBaseLayer:
|
|
100
|
+
activeBaseLayer: "meships",
|
|
99
101
|
meshHiPSName: this._descriptor.name,
|
|
100
102
|
meshHiPSUrl: this._descriptor.baseUrl,
|
|
101
103
|
currentOrder: this._currentOrder,
|
|
@@ -114,33 +116,47 @@ export class MeshHiPS extends AbstractSkyEntity {
|
|
|
114
116
|
? byOrder.pixels
|
|
115
117
|
: [];
|
|
116
118
|
if (pixels.length > 0) {
|
|
117
|
-
return pixels.map((ipix) => ({
|
|
119
|
+
return pixels.map((ipix) => ({
|
|
120
|
+
order: this._currentOrder,
|
|
121
|
+
ipix,
|
|
122
|
+
}));
|
|
118
123
|
}
|
|
119
124
|
const tileCount = 12 * 4 ** this._currentOrder;
|
|
120
|
-
return Array.from({ length: tileCount }, (_, ipix) => ({
|
|
125
|
+
return Array.from({ length: tileCount }, (_, ipix) => ({
|
|
126
|
+
order: this._currentOrder,
|
|
127
|
+
ipix,
|
|
128
|
+
}));
|
|
121
129
|
}
|
|
122
130
|
resolveCoverageTiles(visibleTiles) {
|
|
123
131
|
const tiles = new Map();
|
|
124
132
|
const add = (coord) => {
|
|
125
|
-
if (coord.order < this._descriptor.minOrder ||
|
|
133
|
+
if (coord.order < this._descriptor.minOrder ||
|
|
134
|
+
coord.order > this._descriptor.maxOrder) {
|
|
126
135
|
return;
|
|
136
|
+
}
|
|
127
137
|
tiles.set(this.tileKey(coord), coord);
|
|
128
138
|
};
|
|
129
139
|
for (const coord of visibleTiles) {
|
|
130
140
|
add(coord);
|
|
131
141
|
for (let order = coord.order - 1; order >= this._descriptor.minOrder; order--) {
|
|
132
142
|
const shift = 2 * (coord.order - order);
|
|
133
|
-
add({
|
|
143
|
+
add({
|
|
144
|
+
order,
|
|
145
|
+
ipix: coord.ipix >> shift,
|
|
146
|
+
});
|
|
134
147
|
}
|
|
135
148
|
}
|
|
136
149
|
const manager = this._healpixGrid.visibleTilesManager;
|
|
137
150
|
const ancestorsMap = manager?.ancestorsMap;
|
|
138
151
|
if (ancestorsMap) {
|
|
139
152
|
for (const [order, ipixes] of ancestorsMap) {
|
|
140
|
-
if (order < this._descriptor.minOrder ||
|
|
153
|
+
if (order < this._descriptor.minOrder ||
|
|
154
|
+
order > this._descriptor.maxOrder) {
|
|
141
155
|
continue;
|
|
142
|
-
|
|
156
|
+
}
|
|
157
|
+
for (const ipix of ipixes) {
|
|
143
158
|
add({ order, ipix });
|
|
159
|
+
}
|
|
144
160
|
}
|
|
145
161
|
}
|
|
146
162
|
return Array.from(tiles.values());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeshHiPS.js","sourceRoot":"","sources":["../../../src/model/meships/MeshHiPS.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAsB,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"MeshHiPS.js","sourceRoot":"","sources":["../../../src/model/meships/MeshHiPS.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { FootprintSetGL } from '../footprints/FootprintSetGL.js';
|
|
2
2
|
import { CoordsType } from '../../utils/CoordsType.js';
|
|
3
3
|
import { ParsedGeoJSONFeature } from '../../utils/GeoJSONParser.js';
|
|
4
|
+
import MouseHelper from '../../utils/MouseHelper.js';
|
|
4
5
|
export declare class TerraFootprintSetGL extends FootprintSetGL {
|
|
5
6
|
_kind: string;
|
|
6
7
|
protected _coordsType: CoordsType.GEOGRAPHIC;
|
|
7
8
|
addGeoJSONFeatures(features: ParsedGeoJSONFeature[]): void;
|
|
9
|
+
checkSelection(mouseHelper: MouseHelper): void;
|
|
8
10
|
private createGeoJSONMetadataColumns;
|
|
9
11
|
private createGeoJSONDetails;
|
|
10
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraFootprintSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraFootprintSetGL.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"TerraFootprintSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraFootprintSetGL.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAInE,OAAO,WAAW,MAAM,4BAA4B,CAAA;AAQpD,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,KAAK,EAAE,MAAM,CAAwB;IACrC,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAwB;IAEpE,kBAAkB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,IAAI;IAuB1D,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAwB9C,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,oBAAoB;CAM7B"}
|
|
@@ -14,6 +14,8 @@ import { Footprint } from '../footprints/Footprint.js';
|
|
|
14
14
|
import { MetadataColumn } from '../MetadataColumn.js';
|
|
15
15
|
import { MetadataManager } from '../MetadataManager.js';
|
|
16
16
|
import { ColumnType } from '../MetadataColumn.js';
|
|
17
|
+
import { Point } from '../Point.js';
|
|
18
|
+
import GeomUtils from '../../utils/GeomUtils.js';
|
|
17
19
|
export class TerraFootprintSetGL extends FootprintSetGL {
|
|
18
20
|
_kind = 'TerraFootprintSetGL';
|
|
19
21
|
_coordsType = CoordsType.GEOGRAPHIC;
|
|
@@ -32,6 +34,23 @@ export class TerraFootprintSetGL extends FootprintSetGL {
|
|
|
32
34
|
this._ready = true;
|
|
33
35
|
this._bufferInitialised = false;
|
|
34
36
|
}
|
|
37
|
+
checkSelection(mouseHelper) {
|
|
38
|
+
if (mouseHelper.x == null || mouseHelper.y == null || mouseHelper.z == null)
|
|
39
|
+
return;
|
|
40
|
+
const hoverState = this;
|
|
41
|
+
hoverState._hoveredFootprints = [];
|
|
42
|
+
this.totHoveredPoints = 0;
|
|
43
|
+
const mousePoint = new Point({ x: mouseHelper.x, y: mouseHelper.y, z: mouseHelper.z }, CoordsType.CARTESIAN);
|
|
44
|
+
for (const footprint of this.footprintPolygons) {
|
|
45
|
+
if (!footprint.selectionObj)
|
|
46
|
+
continue;
|
|
47
|
+
if (GeomUtils.checkPointInsidePolygon5(footprint.selectionObj, mousePoint)) {
|
|
48
|
+
hoverState._hoveredFootprints.push(footprint);
|
|
49
|
+
this.totHoveredPoints += footprint.totPoints;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
this.initHoveringBuffer();
|
|
53
|
+
}
|
|
35
54
|
createGeoJSONMetadataColumns(features) {
|
|
36
55
|
const names = new Set();
|
|
37
56
|
features.forEach(feature => Object.keys(feature.properties).forEach(name => names.add(name)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraFootprintSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraFootprintSetGL.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TerraFootprintSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraFootprintSetGL.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { CatalogueGL } from '../catalogues/CatalogueGL.js';
|
|
2
|
+
import { MetadataColumn } from '../MetadataColumn.js';
|
|
3
|
+
import MouseHelper from '../../utils/MouseHelper.js';
|
|
2
4
|
export declare class TerraPointSetGL extends CatalogueGL {
|
|
3
5
|
_kind: string;
|
|
6
|
+
addSources(inData: any[][], columnsMeta: MetadataColumn[]): void;
|
|
7
|
+
draw(inMatrix: Float32Array, inMouseHelper: MouseHelper, viewMatrix: Float32Array, projectionMatrix: Float32Array): void;
|
|
4
8
|
}
|
|
5
9
|
//# sourceMappingURL=TerraPointSetGL.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraPointSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"TerraPointSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAIrD,OAAO,WAAW,MAAM,4BAA4B,CAAA;AAgBpD,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,KAAK,EAAE,MAAM,CAAoB;IAEjC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE;IAsCzD,IAAI,CACF,QAAQ,EAAE,YAAY,EACtB,aAAa,EAAE,WAAW,EAC1B,UAAU,EAAE,YAAY,EACxB,gBAAgB,EAAE,YAAY;CAKjC"}
|
|
@@ -9,7 +9,43 @@
|
|
|
9
9
|
* See LICENSE.md, LICENSE-AGPL.md, and LICENSE-COMMERCIAL.md for details.
|
|
10
10
|
*/
|
|
11
11
|
import { CatalogueGL } from '../catalogues/CatalogueGL.js';
|
|
12
|
+
import { MetadataManager } from '../MetadataManager.js';
|
|
13
|
+
import { Point } from '../Point.js';
|
|
14
|
+
import { CoordsType } from '../../utils/CoordsType.js';
|
|
12
15
|
export class TerraPointSetGL extends CatalogueGL {
|
|
13
16
|
_kind = 'TerraPointSetGL';
|
|
17
|
+
addSources(inData, columnsMeta) {
|
|
18
|
+
this._ready = false;
|
|
19
|
+
this._sources = [];
|
|
20
|
+
const metadataManager = new MetadataManager(columnsMeta);
|
|
21
|
+
this._metadataManager = metadataManager;
|
|
22
|
+
const lonDataIndex = metadataManager.selectedRaColumn?.index ?? -1;
|
|
23
|
+
const latDataIndex = metadataManager.selectedDecColumn?.index ?? -1;
|
|
24
|
+
if (lonDataIndex < 0 || latDataIndex < 0) {
|
|
25
|
+
throw new Error(`(lon, lat) idx not defined (${lonDataIndex}, ${latDataIndex}) `);
|
|
26
|
+
}
|
|
27
|
+
for (const row of inData) {
|
|
28
|
+
const point = new Point({
|
|
29
|
+
lonDeg: Number(row[lonDataIndex]),
|
|
30
|
+
latDeg: Number(row[latDataIndex]),
|
|
31
|
+
}, CoordsType.GEOGRAPHIC);
|
|
32
|
+
this.addSource({
|
|
33
|
+
point,
|
|
34
|
+
details: row,
|
|
35
|
+
healpixPixel: 0,
|
|
36
|
+
shapeSize: CatalogueGL.STANDARD_SHAPE_SIZE,
|
|
37
|
+
brightnessFactor: 3,
|
|
38
|
+
getDetailByindex(index) {
|
|
39
|
+
return index < 0 || index >= row.length ? undefined : row[index];
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
this._ready = true;
|
|
44
|
+
this._bufferInitialised = false;
|
|
45
|
+
}
|
|
46
|
+
draw(inMatrix, inMouseHelper, viewMatrix, projectionMatrix) {
|
|
47
|
+
this._oldMouseCoords = inMouseHelper?.xyz ?? null;
|
|
48
|
+
super.draw(inMatrix, inMouseHelper, viewMatrix, projectionMatrix);
|
|
49
|
+
}
|
|
14
50
|
}
|
|
15
51
|
//# sourceMappingURL=TerraPointSetGL.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraPointSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE1D,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC9C,KAAK,GAAW,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"TerraPointSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAiBtD,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC9C,KAAK,GAAW,iBAAiB,CAAA;IAEjC,UAAU,CAAC,MAAe,EAAE,WAA6B;QACvD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAA;QAClB,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CACvD;QAAC,IAAyC,CAAC,gBAAgB,GAAG,eAAe,CAAA;QAE9E,MAAM,YAAY,GAAG,eAAe,CAAC,gBAAgB,EAAE,KAAK,IAAI,CAAC,CAAC,CAAA;QAClE,MAAM,YAAY,GAAG,eAAe,CAAC,iBAAiB,EAAE,KAAK,IAAI,CAAC,CAAC,CAAA;QAEnE,IAAI,YAAY,GAAG,CAAC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;QACnF,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB;gBACE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACjC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aAClC,EACD,UAAU,CAAC,UAAU,CACtB,CAAA;YAED,IAAI,CAAC,SAAS,CAAC;gBACb,KAAK;gBACL,OAAO,EAAE,GAAG;gBACZ,YAAY,EAAE,CAAC;gBACf,SAAS,EAAE,WAAW,CAAC,mBAAmB;gBAC1C,gBAAgB,EAAE,CAAC;gBACnB,gBAAgB,CAAC,KAAa;oBAC5B,OAAO,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAClE,CAAC;aAC2B,CAAC,CAAA;QACjC,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,CACjB;QAAC,IAAyC,CAAC,kBAAkB,GAAG,KAAK,CAAA;IACxE,CAAC;IAED,IAAI,CACF,QAAsB,EACtB,aAA0B,EAC1B,UAAwB,EACxB,gBAA8B;QAE9B,IAAI,CAAC,eAAe,GAAG,aAAa,EAAE,GAAG,IAAI,IAAI,CAAA;QACjD,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAA;IACnE,CAAC;CACF"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import MouseHelper from '../../utils/MouseHelper.js';
|
|
2
2
|
import { MetadataManager } from '../MetadataManager.js';
|
|
3
|
-
import { VisibleTilesManager } from '../hips/VisibleTilesManager.js';
|
|
4
3
|
export interface TerraPolylinePoint {
|
|
5
4
|
readonly longitudeDeg: number;
|
|
6
5
|
readonly latitudeDeg: number;
|
|
@@ -17,7 +16,6 @@ export declare class TerraPolylineSetGL {
|
|
|
17
16
|
private _providerUrl;
|
|
18
17
|
private _metadataManager;
|
|
19
18
|
private _webgl;
|
|
20
|
-
private _visibleTilesManager;
|
|
21
19
|
static ELEM_SIZE: number;
|
|
22
20
|
static BYTES_X_ELEM: number;
|
|
23
21
|
_kind: string;
|
|
@@ -28,7 +26,7 @@ export declare class TerraPolylineSetGL {
|
|
|
28
26
|
private paths;
|
|
29
27
|
private renderSegments;
|
|
30
28
|
private _polylineShaderProgram;
|
|
31
|
-
constructor(_name: string, _description: string, _providerUrl: string, _metadataManager: MetadataManager, _webgl: WebGL2RenderingContext
|
|
29
|
+
constructor(_name: string, _description: string, _providerUrl: string, _metadataManager: MetadataManager, _webgl: WebGL2RenderingContext);
|
|
32
30
|
addPath(points: readonly TerraPolylinePoint[], metadata?: TerraPolylineMetadata): void;
|
|
33
31
|
addGroundTrack(points: readonly TerraPolylinePoint[], metadata?: TerraPolylineMetadata): void;
|
|
34
32
|
clearPaths(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraPolylineSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraPolylineSetGL.ts"],"names":[],"mappings":"AAaA,OAAO,WAAW,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"TerraPolylineSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraPolylineSetGL.ts"],"names":[],"mappings":"AAaA,OAAO,WAAW,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAGvD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;CACnC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC;AAYD,qBAAa,kBAAkB;IAe3B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,MAAM;IAlBhB,MAAM,CAAC,SAAS,SAAI;IACpB,MAAM,CAAC,YAAY,SAAuC;IAE1D,KAAK,EAAE,MAAM,CAAuB;IACpC,UAAU,EAAE,OAAO,CAAO;IAC1B,MAAM,EAAE,OAAO,CAAO;IAEtB,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,sBAAsB,CAAwB;gBAG5C,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,eAAe,EACjC,MAAM,EAAE,sBAAsB;IAKxC,OAAO,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,EAAE,QAAQ,CAAC,EAAE,qBAAqB,GAAG,IAAI;IAMtF,cAAc,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,EAAE,QAAQ,CAAC,EAAE,qBAAqB,GAAG,IAAI;IAI7F,UAAU,IAAI,IAAI;IAOlB,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIhC,OAAO,IAAI,IAAI;IAOf,IAAI,CACF,UAAU,EAAE,YAAY,EACxB,eAAe,EAAE,WAAW,EAC5B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,GACpB,IAAI;IA2CP,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,mBAAmB;IAgC3B,OAAO,CAAC,SAAS;IA0BjB,OAAO,CAAC,cAAc;CAQvB"}
|
|
@@ -18,7 +18,6 @@ export class TerraPolylineSetGL {
|
|
|
18
18
|
_providerUrl;
|
|
19
19
|
_metadataManager;
|
|
20
20
|
_webgl;
|
|
21
|
-
_visibleTilesManager;
|
|
22
21
|
static ELEM_SIZE = 3;
|
|
23
22
|
static BYTES_X_ELEM = new Float32Array().BYTES_PER_ELEMENT;
|
|
24
23
|
_kind = 'TerraPolylineSetGL';
|
|
@@ -29,13 +28,12 @@ export class TerraPolylineSetGL {
|
|
|
29
28
|
paths = [];
|
|
30
29
|
renderSegments = [];
|
|
31
30
|
_polylineShaderProgram;
|
|
32
|
-
constructor(_name, _description, _providerUrl, _metadataManager, _webgl
|
|
31
|
+
constructor(_name, _description, _providerUrl, _metadataManager, _webgl) {
|
|
33
32
|
this._name = _name;
|
|
34
33
|
this._description = _description;
|
|
35
34
|
this._providerUrl = _providerUrl;
|
|
36
35
|
this._metadataManager = _metadataManager;
|
|
37
36
|
this._webgl = _webgl;
|
|
38
|
-
this._visibleTilesManager = _visibleTilesManager;
|
|
39
37
|
this._polylineShaderProgram = new FootprintShaderProgram(this._webgl);
|
|
40
38
|
}
|
|
41
39
|
addPath(points, metadata) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraPolylineSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraPolylineSetGL.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"TerraPolylineSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraPolylineSetGL.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MouseHelper.d.ts","sourceRoot":"","sources":["../../src/utils/MouseHelper.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,OAAO,EAAQ,YAAY,EAAE,MAAM,WAAW,CAAC;AAG/C,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,GAAG,EACR,KAAK,GAAG,EACT,MAAM,YAAY,CAAC;AAEpB,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAMpC,cAAM,WAAW;IACf,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,YAAY,CAAgC;IAEpD,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IAEb;;;;OAIG;gBAED,MAAM,CAAC,EAAE,GAAG,GAAG,IAAI,EACnB,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,EAChC,cAAc,CAAC,EAAE,eAAe,GAAG,IAAI;IAYzC,iEAAiE;IACjE,WAAW,IAAI,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"MouseHelper.d.ts","sourceRoot":"","sources":["../../src/utils/MouseHelper.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,OAAO,EAAQ,YAAY,EAAE,MAAM,WAAW,CAAC;AAG/C,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,GAAG,EACR,KAAK,GAAG,EACT,MAAM,YAAY,CAAC;AAEpB,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAMpC,cAAM,WAAW;IACf,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,YAAY,CAAgC;IAEpD,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IAEb;;;;OAIG;gBAED,MAAM,CAAC,EAAE,GAAG,GAAG,IAAI,EACnB,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,EAChC,cAAc,CAAC,EAAE,eAAe,GAAG,IAAI;IAYzC,iEAAiE;IACjE,WAAW,IAAI,MAAM,GAAG,IAAI;IAS5B,0EAA0E;IAC1E,MAAM,CAAC,UAAU,EAAE,YAAY,GAAG,GAAG,GAAG,IAAI;IAY5C,KAAK,IAAI,IAAI;IASb,IAAI,GAAG,IAAI,GAAG,GAAG,IAAI,CAEpB;IACD,IAAI,CAAC,IAAI,MAAM,GAAG,IAAI,CAErB;IACD,IAAI,CAAC,IAAI,MAAM,GAAG,IAAI,CAErB;IACD,IAAI,CAAC,IAAI,MAAM,GAAG,IAAI,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,GAAG,IAAI,CAEtB;IACD,IAAI,GAAG,IAAI,MAAM,GAAG,IAAI,CAEvB;IAED,IAAI,GAAG,IAAI,MAAM,GAAG,IAAI,CAEvB;IACD,IAAI,KAAK,IAAI,MAAM,GAAG,IAAI,CAEzB;IAED,IAAI,QAAQ,IAAI,WAAW,GAAG,IAAI,CAEjC;IACD,IAAI,WAAW,IAAI,eAAe,GAAG,IAAI,CAExC;CACF;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -45,7 +45,8 @@ class MouseHelper {
|
|
|
45
45
|
computeNpix() {
|
|
46
46
|
if (!this._xyz)
|
|
47
47
|
return null;
|
|
48
|
-
const hp = global.getHealpix(global.nsideForSelection);
|
|
48
|
+
// const hp: Healpix = global.getHealpix(global.nsideForSelection);
|
|
49
|
+
const hp = global.getHealpix(global.selectionOrder);
|
|
49
50
|
const v = new Vec3(this._xyz[0], this._xyz[1], this._xyz[2]);
|
|
50
51
|
const ptg = new Pointing(v, false);
|
|
51
52
|
return hp.ang2pix(ptg, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MouseHelper.js","sourceRoot":"","sources":["../../src/utils/MouseHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;GAEG;AACH,OAAO,EAAE,IAAI,EAAgB,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAW,MAAM,2BAA2B,CAAC;AACpE,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,EACV,WAAW,GAKZ,MAAM,YAAY,CAAC;AAIpB,SAAS,MAAM,CAAC,CAAqB;IACnC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,WAAW;IACP,IAAI,GAAe,IAAI,CAAC;IACxB,SAAS,GAAuB,IAAI,CAAC;IACrC,YAAY,GAA2B,IAAI,CAAC;IAEpD,KAAK,CAAO;IACZ,MAAM,CAAO;IAEb;;;;OAIG;IACH,YACE,MAAmB,EACnB,WAAgC,EAChC,cAAuC;QAEvC,IAAI,MAAM,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACvC,IAAI,WAAW,IAAI,IAAI;YAAE,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;QACtD,IAAI,cAAc,IAAI,IAAI;YAAE,IAAI,CAAC,YAAY,GAAG,cAAc,CAAC;QAE/D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,WAAW;QACT,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QAC5B,MAAM,EAAE,GAAY,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"MouseHelper.js","sourceRoot":"","sources":["../../src/utils/MouseHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "astro-viewer",
|
|
3
3
|
"description": "3D scientific visualization engine for astronomical and Earth observation data, supporting HiPS, FITS, TAP, ADQL, footprints and WebGL-based spatial exploration.",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.10.0",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"astronomy",
|
|
7
7
|
"astrophysics",
|