use vite producing es and umd aladin lite module types. The umd is consistent with what is being used since a long time (including manually the aladin lite script)

This commit is contained in:
bmatthieu3
2023-05-25 14:36:23 +02:00
committed by Matthieu Baumann
parent 6b0f4e4b60
commit bcfe829b03
106 changed files with 657 additions and 683 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -4,10 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', { fov:0.15, target: 'Arp 240', showReticle: false, fullScreen: true });

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: ["P/PanSTARRS/DR1/color-i-r-g"], showReticle: false, gridOptions: {opacity: 0.5}, projection: "AIT", cooFrame: 'galactic', target: "93.2721132 -20.9942421", fov: 1000, showGotoControl: false, showFrame: false, fullScreen: true, showLayersControl: true, showCooGrid: false, showCooGridControl: false});

View File

@@ -4,10 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {projection: "TAN", survey: "P/HSC/DR2/deep/g", target: '02 21 36.529 -05 31 20.16', fov: 0.1});

View File

@@ -16,10 +16,8 @@
</div>
</div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<!-- <script type="text/javascript" src="https://aladin.u-strasbg.fr/AladinLite/api/v3/latest/aladin.js" charset="utf-8"></script> -->
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', fov: 400, fullScreen: true, showCooGrid: false, showReticle: false})

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "P/SPITZER/color", cooFrame: 'galactic', fov: 5});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
var aladin = A.aladin(

View File

@@ -4,10 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {fov: 70,projection: "AIT"});
let hsc = aladin.newImageSurvey("P/HSC/DR2/deep/g", {colormap:"Purples", imgFormat: "fits"});

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'M50', fov: 0.3});

View File

@@ -12,10 +12,8 @@ Show sources with proper motion greater than:
<input id='slider' style='vertical-align:middle;width:60vw;' step='1' min='0' max='500' type='range' value='0'>
<span id='pmVal' >0 mas/yr</span><br><br><div id='aladin-lite-div' style='width: 500px;height: 500px;'></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
var pmThreshold = 0;

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55, showContextMenu: true});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55, showContextMenu: true});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "P/PanSTARRS/DR1/color-z-zg-g", fov:1.5, target: "NGC 7318B"});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -221,13 +221,11 @@
.coro-star {
vertical-align: middle;
}
</style>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin;
A.init.then(() => {
var hipsDir="http://alasky.u-strasbg.fr/CDS_P_Coronelli";

View File

@@ -7,9 +7,8 @@
<div id="aladin-lite-div" style="width:440px;height:300px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: "icrs", fullScreen: true});

View File

@@ -16,11 +16,8 @@ Image Opacity: <br/> <input id="slider" type="range" value=1 min=0 max=1 step=0.
<input id="DSS" type="radio" name="survey" value="P/DSS2/Color" checked><label for="DSS">Optical (DSS2) <label>
<input id="2MASS" type="radio" name="survey" value="P/2MASS/Color"><label for="2MASS">Infrared (2MASS)<label>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: "0 0", cooFrame: "gal"});

View File

@@ -6,9 +6,8 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
/*aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -5,11 +5,10 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M 45', fov: 5});

View File

@@ -6,10 +6,8 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -7,10 +7,8 @@
<script src="https://code.jquery.com/jquery-1.10.1.min.js"></script>
<div id='infoDiv'>&nbsp; </div>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
A.init.then(() => {
var aladin = A.aladin('#aladin-lite-div', {target: '05 37 58 +08 17 35', fov: 12, backgroundColor: 'rgb(120, 0, 0)'});
var cat = A.catalog({sourceSize: 20});

View File

@@ -6,10 +6,8 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -36,8 +36,8 @@
</body>
<script src="https://code.jquery.com/jquery-1.10.1.min.js"></script>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
$('#layersControl').show();
var curSelectedSource = null;

View File

@@ -4,10 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "P/DSS2/color", fov:1, showCooGridControl:true});

View File

@@ -4,10 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {projection: "TAN", target: '15 16 57.636 -60 55 7.49', showCooGrid: true, fov: 90});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'http://alasky.cds.unistra.fr/ancillary/GaiaDR2/hips-density-map/', target: 'galactic center'});

View File

@@ -6,11 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<!-- Load a hips located at ./hips/gaia/ -->
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'galactic center'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'http://alasky.cds.unistra.fr/ancillary/GaiaDR2/hips-density-map/', target: 'galactic center'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'galactic center'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
var aladin = A.aladin(

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin(

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
A.init.then(() => {
var aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'LMC', fov: 5});
aladin.addCatalog(A.catalogFromURL('https://vizier.u-strasbg.fr/viz-bin/votable?-source=HIP2&-c=LMC&-out.add=_RAJ,_DEJ&-oc.form=dm&-out.meta=DhuL&-out.max=9999&-c.rm=180', {sourceSize:12, color: '#f08080'}));

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
A.init.then(() => {
let a = A.aladin('#aladin-lite-div', {target: '03 47 00.00 +24 07 00.0', survey: 'P/DSS2/color', zoom: 2, showReticle: false});
var cat = A.catalog({name: 'Some markers', sourceSize: 18});

View File

@@ -6,9 +6,8 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {fov: 180, fullScreen: true, cooFrame: 'equatorial', showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, survey: 'CDS/P/Mars/THEMIS-Day-100m-v12'});

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '240 +10.65', cooFrame: 'j2000d', fov: 90, showFrame: false, showCooGrid: true, showLayersControl: false, showGotoControl: false, fullScreen: true, showContextMenu: true});

View File

@@ -7,10 +7,8 @@
<div id="ui" class="ui">
</div>
</div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '00 00 00 +07 00 00', fov: 130, survey: 'P/ISOPHOT/170'});

View File

@@ -7,10 +7,8 @@
<div id="ui" class="ui">
</div>
</div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55});

View File

@@ -7,10 +7,8 @@
<div id="ui" class="ui">
</div>
</div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '00 00 00 +07 00 00', fov: 130, survey: 'P/Mellinger/color'});

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'M51', fov: 180, fullScreen: true});

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin(

View File

@@ -5,11 +5,10 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M 45', fov: 5, showContextMenu: true});

View File

@@ -8,10 +8,8 @@
<div id="al2" style="width: 500px; height: 500px">
</div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let al1;
let al2;
A.init.then(() => {

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {fullScreen: true, survey: ['P/DM/vizMine', 'P/HST/GOODS/color', 'P/MATLAS/g'], target: '0 0', showCooGrid: true, fov: 180});

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -5,12 +5,9 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '14 18 16.868 +56 44 29.37', fov: 360, projection: 'AIT', showContextMenu: true});

View File

@@ -4,10 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'M1', fov: 0.3});

View File

@@ -4,10 +4,10 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', fov: 110, target: 'galactic center'});

View File

@@ -6,10 +6,9 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -5,10 +5,10 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'Gamma Cas', fov: 10});

View File

@@ -5,10 +5,10 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<div id='buttons'></div>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
A.init.then(() => {
var a = A.aladin('#aladin-lite-div', {target: '03 47 00.00 +24 07 00.0', survey: 'P/DSS2/color', zoom: 2, showReticle: false});
var cat = A.catalog({color: 'red', onClick: 'showTable'});

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M81', fov: 1});

View File

@@ -4,10 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M81', fov: 1});

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin(

View File

@@ -6,9 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', target: 'galactic center', survey: 'P/Finkbeiner'});

View File

@@ -4,9 +4,8 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
// Start up Aladin Lite

View File

@@ -5,7 +5,7 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="https://aladin.cds.unistra.fr/AladinLite/api/v3/latest/aladin.js" charset="utf-8"></script>
<script type="text/javascript" src="https://aladin.cds.unistra.fr/AladinLite/api/v3/latest/aladin.umd.cjs" charset="utf-8"></script>
<script type="text/javascript">
let aladin;

View File

@@ -5,11 +5,10 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
let aladin;
<script type="module">
import A from '../src/js/A.js';
A.init.then(() => {
// Start up Aladin Lite
aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'Sgr a*', fov: 0.5});

View File

@@ -5,10 +5,8 @@
<body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin(

View File

@@ -6,9 +6,10 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: ["P/Mellinger"], cooFrame: 'galactic', fov: 1000, fullScreen: true, showCooGrid: true});

View File

@@ -6,9 +6,9 @@
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin;
A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic', showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: true});

View File

@@ -5,33 +5,12 @@
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
var aladin;
A.init.then(() => {
/*aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic'});
aladin.setProjection('MOL');
aladin.setBaseImageLayer("P/PanSTARRS/DR1/g", {
imgFormat: 'fits',
colormap: 'redtemperature',
stretch: 'Asinh'
});*/
/*aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic'});
aladin.setProjection('AIT');
aladin.setBaseImageLayer("P/PanSTARRS/DR1/g", {imgFormat: "fits"});
aladin.getBaseImageLayer().setColormap('redtemperature', {stretch: "Asinh"});*/
aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", fullScreen: true, expandLayersControl: true, cooFrame: 'equatorial', showProjectionControl: true, showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, showContextMenu: true});
//aladin.setProjection('AIT');
//let survey = aladin.createImageSurvey("P/PanSTARRS/DR1/g", null, null, null, null, );
/*aladin.setBaseImageLayer("P/PanSTARRS/DR1/g");
aladin.getBaseImageLayer().setColormap('viridis', {stretch: "Asinh"});*/
// manage URL parameters
const searchParams = new URL(document.location).searchParams;
@@ -62,8 +41,6 @@
enabled: b
});
}
});
</script>

47
examples/index_es.html Normal file
View File

@@ -0,0 +1,47 @@
<!doctype html>
<html>
<head>
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no">
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="module">
import A from '../dist/aladin.js';
A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", fullScreen: true, expandLayersControl: true, cooFrame: 'equatorial', showProjectionControl: true, showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, showContextMenu: true});
// manage URL parameters
const searchParams = new URL(document.location).searchParams;
if (searchParams.has('baseImageLayer')) {
aladin.setBaseImageLayer(searchParams.get('baseImageLayer'));
}
if (searchParams.has('overlayImageLayer')) {
aladin.setOverlayImageLayer(searchParams.get('overlayImageLayer'));
}
if (searchParams.has('cooFrame')) {
aladin.setFrame(searchParams.get('cooFrame'));
}
if (searchParams.has('fov')) {
aladin.setFoV(parseFloat(searchParams.get('fov')));
}
if (searchParams.has('ra') && searchParams.has('dec')) {
aladin.gotoRaDec(parseFloat(searchParams.get('ra')), parseFloat(searchParams.get('dec')));
}
if (searchParams.has('showReticle')) {
aladin.showReticle(searchParams.get('showReticle')==='true');
}
if (searchParams.has('projection')) {
aladin.setProjection(searchParams.get('projection'));
}
if (searchParams.has('showCooGrid')) {
const b = searchParams.get('showCooGrid') === 'true';
aladin.view.setGridConfig({
enabled: b
});
}
});
</script>
</body>
</html>

47
examples/index_umd.html Normal file
View File

@@ -0,0 +1,47 @@
<!doctype html>
<html>
<head>
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no">
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../dist/aladin.umd.cjs" charset="utf-8"></script>
<script type="text/javascript">
A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", fullScreen: true, expandLayersControl: true, cooFrame: 'equatorial', showProjectionControl: true, showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, showContextMenu: true});
// manage URL parameters
const searchParams = new URL(document.location).searchParams;
if (searchParams.has('baseImageLayer')) {
aladin.setBaseImageLayer(searchParams.get('baseImageLayer'));
}
if (searchParams.has('overlayImageLayer')) {
aladin.setOverlayImageLayer(searchParams.get('overlayImageLayer'));
}
if (searchParams.has('cooFrame')) {
aladin.setFrame(searchParams.get('cooFrame'));
}
if (searchParams.has('fov')) {
aladin.setFoV(parseFloat(searchParams.get('fov')));
}
if (searchParams.has('ra') && searchParams.has('dec')) {
aladin.gotoRaDec(parseFloat(searchParams.get('ra')), parseFloat(searchParams.get('dec')));
}
if (searchParams.has('showReticle')) {
aladin.showReticle(searchParams.get('showReticle')==='true');
}
if (searchParams.has('projection')) {
aladin.setProjection(searchParams.get('projection'));
}
if (searchParams.has('showCooGrid')) {
const b = searchParams.get('showCooGrid') === 'true';
aladin.view.setGridConfig({
enabled: b
});
}
});
</script>
</body>
</html>

View File

@@ -1,5 +0,0 @@
#!/bin/bash
for filename in *.html; do
google-chrome http://localhost:8080/${filename}
done

View File

@@ -1,14 +1,21 @@
{
"homepage": "https://aladin.u-strasbg.fr/",
"name": "aladin-lite",
"type": "module",
"version": "3.1.0",
"description": "An astronomical HiPS visualizer in the browser",
"author": "Thomas Boch and Matthieu Baumann",
"license": "GPL-3",
"main": "dist/aladin.js",
"module": "./dist/aladin.js",
"main": "./dist/aladin.js",
"files": [
"dist/*"
"dist"
],
"exports": {
".": {
"import": "./dist/aladin.js"
}
},
"repository": {
"type": "git",
"url": "https://github.com/cds-astro/aladin-lite"
@@ -21,32 +28,26 @@
"HiPS"
],
"scripts": {
"wasm": "wasm-pack build ./src/core --target web --release --out-name core -- --features webgl2",
"package-tar": "tar -zcvf AladinLiteAssets.tar.gz dist/*",
"predeploy": "npm run build && npm run package-tar",
"deploy": "./deploy-dbg.sh",
"build": "webpack && sed \"s/\\\\.\\\\/\\\\.\\\\.\\\\/aladin\\\\.js/https:\\\\/\\\\/aladin.cds.unistra.fr\\\\/AladinLite\\\\/api\\\\/v3\\\\/latest\\\\/aladin.js/g\" examples/index.html > dist/index.html",
"serve": "webpack-dev-server"
"build": "npm run wasm && vite build && sed \"s/\\\\.\\\\/\\\\.\\\\.\\\\/aladin\\\\.js/https:\\\\/\\\\/aladin.cds.unistra.fr\\\\/AladinLite\\\\/api\\\\/v3\\\\/latest\\\\/aladin.js/g\" examples/index.html > dist/index.html",
"dev": "npm run build && vite",
"preview": "vite preview"
},
"devDependencies": {
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@wasm-tool/wasm-pack-plugin": "^1.6.0",
"babel-loader": "^8.2.5",
"npm": "^8.19.2",
"terser-webpack-plugin": "^5.3.3",
"webpack": "^5.74.0",
"webpack-cli": "^4.9.0",
"webpack-dev-server": "^4.7.4",
"webpack-glsl-loader": "^1.0.1",
"webpack-glsl-minify": "^1.5.0"
"terser": "^5.17.6",
"vite": "^4.3.8",
"vite-plugin-css-injected-by-js": "^3.1.1",
"vite-plugin-glsl": "^1.1.2",
"vite-plugin-top-level-await": "^1.3.1",
"vite-plugin-wasm": "^3.2.2",
"vite-plugin-wasm-pack": "^0.1.12"
},
"dependencies": {
"autocompleter": "^6.1.3",
"babel-preset-es2015": "^6.24.1",
"css-loader": "^5.0.1",
"file-loader": "^6.1.0",
"jquery": "^3.6.1",
"style-loader": "^3.3.1",
"wasm-pack": "^0.10.3"
"jquery": "^3.6.1"
}
}

View File

@@ -119,7 +119,7 @@ codegen-units = 256
rpath = false
[profile.release]
opt-level = 3
opt-level = 'z'
debug = false
debug-assertions = false
overflow-checks = false

View File

@@ -1,6 +1,6 @@
use wasm_bindgen::prelude::*;
#[wasm_bindgen(raw_module = "../src/js/Color")]
#[wasm_bindgen(raw_module = "../../js/Color")]
extern "C" {
pub type Color;

View File

@@ -135,7 +135,6 @@ impl App {
WebGl2RenderingContext::ONE,
WebGl2RenderingContext::ONE,
);
// TODO: https://caniuse.com/?search=scissor is not supported for safari <= 14.1
// When it will be supported nearly everywhere, we will need to uncomment this line to
// enable it

View File

@@ -15,7 +15,7 @@ uniform vec2 kernel_size;
out vec2 out_uv;
out vec3 out_p;
@include "../hips/projection.glsl"
#include ../hips/projection.glsl;
void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv;
out vec3 out_p;
@include "../hips/projection.glsl"
#include ../hips/projection.glsl;
void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -15,7 +15,7 @@ uniform vec2 kernel_size;
out vec2 out_uv;
out vec3 out_p;
@include "../hips/projection.glsl"
#include ../hips/projection.glsl;
void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv;
out vec3 out_p;
@include "../hips/projection.glsl"
#include ../hips/projection.glsl;
void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv;
out vec3 out_p;
@include "../hips/projection.glsl"
#include ../hips/projection.glsl;
void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv;
out vec3 out_p;
@include "../hips/projection.glsl"
#include ../hips/projection.glsl;
void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -15,7 +15,7 @@ uniform vec2 kernel_size;
out vec2 out_uv;
out vec3 out_p;
@include "../hips/projection.glsl"
#include ../hips/projection.glsl;
void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -8,7 +8,7 @@ out vec4 color;
uniform sampler2D texture_fbo;
uniform float alpha;
@include "./colormap.glsl"
#include ./colormap.glsl;
void main() {
float opacity = texture(texture_fbo, out_uv).r;

View File

@@ -11,7 +11,7 @@ in vec2 frag_uv;
uniform isampler2D tex;
uniform float opacity;
@include "../hips/color.glsl"
#include ../hips/color.glsl;
void main() {
ivec4 color = texture(tex, frag_uv);

View File

@@ -11,7 +11,7 @@ in vec2 frag_uv;
uniform sampler2D tex;
uniform float opacity;
@include "../hips/color.glsl"
#include ../hips/color.glsl;
void main() {
vec4 color = texture(tex, frag_uv);

View File

@@ -11,7 +11,7 @@ in vec2 frag_uv;
uniform usampler2D tex;
uniform float opacity;
@include "../hips/color.glsl"
#include ../hips/color.glsl;
void main() {
uvec4 color = texture(tex, frag_uv);

View File

@@ -17,10 +17,10 @@ uniform float size_tile_uv;
uniform int tex_storing_fits;
@include "../colormaps/colormap.glsl"
@include "./transfer_funcs.glsl"
@include "./tonal_corrections.glsl"
@include "./hsv.glsl"
#include ../colormaps/colormap.glsl;
#include ./transfer_funcs.glsl;
#include ./tonal_corrections.glsl;
#include ./hsv.glsl;
vec4 get_pixels(vec3 uv) {
int idx_texture = int(uv.z);

View File

@@ -17,9 +17,9 @@ uniform float size_tile_uv;
uniform int tex_storing_fits;
@include "../colormaps/colormap.glsl"
@include "./transfer_funcs.glsl"
@include "./tonal_corrections.glsl"
#include ../colormaps/colormap.glsl;
#include ./transfer_funcs.glsl;
#include ./tonal_corrections.glsl;
ivec4 get_pixels(vec3 uv) {
int idx_texture = int(uv.z);

View File

@@ -17,9 +17,9 @@ uniform float size_tile_uv;
uniform int tex_storing_fits;
@include "../colormaps/colormap.glsl"
@include "./transfer_funcs.glsl"
@include "./tonal_corrections.glsl"
#include ../colormaps/colormap.glsl;
#include ./transfer_funcs.glsl;
#include ./tonal_corrections.glsl;
uvec4 get_pixels(vec3 uv) {
int idx_texture = int(uv.z);

View File

@@ -13,7 +13,7 @@ in float m_end;
out vec4 out_frag_color;
uniform float opacity;
@include "../color.glsl"
#include ../color.glsl;
void main() {
vec4 color_start = get_color_from_texture(frag_uv_start);

View File

@@ -12,7 +12,7 @@ in float m_end;
out vec4 out_frag_color;
@include "../color.glsl"
#include ../color.glsl;
uniform float opacity;

View File

@@ -12,7 +12,7 @@ in float m_end;
out vec4 out_frag_color;
@include "../color_i.glsl"
#include ../color_i.glsl;
uniform float opacity;

View File

@@ -13,7 +13,7 @@ in float m_end;
out vec4 out_frag_color;
@include "../color_u.glsl"
#include ../color_u.glsl;
uniform float opacity;

View File

@@ -23,7 +23,7 @@ uniform float czf;
// current time in ms
uniform float current_time;
@include "../projection.glsl"
#include ../projection.glsl;
void main() {
gl_Position = vec4(ndc_pos, 0.0, 1.0);

View File

@@ -19,8 +19,8 @@ struct Tile {
uniform Tile textures_tiles[12];
uniform int num_tiles;
@include "../color.glsl"
@include "./healpix.glsl"
#include ../color.glsl;
#include ./healpix.glsl;
uniform float opacity;

View File

@@ -25,8 +25,8 @@ struct TileColor {
bool found;
};
@include "../color.glsl"
@include "./healpix.glsl"
#include ../color.glsl;
#include ./healpix.glsl;
vec4 get_tile_color(vec3 pos) {
HashDxDy result = hash_with_dxdy(0, pos.zxy);

View File

@@ -20,8 +20,8 @@ uniform Tile textures_tiles[12];
uniform float opacity;
@include "../color_i.glsl"
@include "./healpix.glsl"
#include ../color_i.glsl;
#include ./healpix.glsl;
vec4 get_tile_color(vec3 pos) {
HashDxDy result = hash_with_dxdy(0, pos.zxy);

View File

@@ -20,8 +20,8 @@ uniform Tile textures_tiles[12];
uniform float opacity;
@include "../color_u.glsl"
@include "./healpix.glsl"
#include ../color_u.glsl;
#include ./healpix.glsl;
vec4 get_tile_color(vec3 pos) {
HashDxDy result = hash_with_dxdy(0, pos.zxy);

View File

@@ -12,7 +12,7 @@ uniform float czf;
uniform mat4 model;
uniform sampler2D position_tex;
@include "../projection.glsl"
#include ../projection.glsl;
void main() {
vec2 uv = pos_clip_space * 0.5 + 0.5;

311
src/js/A.js Normal file
View File

@@ -0,0 +1,311 @@
// Copyright 2013 - UDS/CNRS
// The Aladin Lite program is distributed under the terms
// of the GNU General Public License version 3.
//
// This file is part of Aladin Lite.
//
// Aladin Lite is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 3 of the License.
//
// Aladin Lite is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// The GNU General Public License is available in COPYING file
// along with Aladin Lite.
//
/******************************************************************************
* Aladin Lite project
*
* File Aladin.js (main class)
* Facade to expose Aladin Lite methods
*
* Author: Thomas Boch[CDS]
*
*****************************************************************************/
import { MOC } from "./MOC.js";
import { Overlay } from "./Overlay.js";
import { Circle } from "./Circle.js";
import { Ellipse } from "./Ellipse.js";
import { Polyline } from "./Polyline.js";
import { Catalog } from "./Catalog.js";
import { ProgressiveCat } from "./ProgressiveCat.js";
import { Source } from "./Source.js";
import { Coo } from "./libs/astro/coo.js";
import { URLBuilder } from "./URLBuilder.js";
import { HiPSDefinition } from "./HiPSDefinition.js";
import { ColorCfg } from './ColorCfg.js';
import { ObsCore } from "./vo/ObsCore.js";
import { Aladin } from "./Aladin.js";
// Wasm top level import
import init, * as module from './../core/pkg';
import $ from 'jquery';
// Import aladin css inside the project
import './../css/aladin.css';
///////////////////////////////
/////// Aladin Lite API ///////
///////////////////////////////
let A = {};
//// New API ////
// For developers using Aladin lite: all objects should be created through the API,
// rather than creating directly the corresponding JS objects
// This facade allows for more flexibility as objects can be updated/renamed harmlessly
//@API
A.aladin = function (divSelector, options) {
return new Aladin($(divSelector)[0], options);
};
// @API
A.source = function (ra, dec, data, options) {
return new Source(ra, dec, data, options);
};
// @API
A.marker = function (ra, dec, options, data) {
options = options || {};
options['marker'] = true;
return A.source(ra, dec, data, options);
};
// @API
A.polygon = function (raDecArray, options) {
const numVertices = raDecArray.length;
if (numVertices < 3) {
// Cannot define a polygon from that
throw 'Cannot define a polygon from less than 3 vertices';
}
const lastVertexIdx = numVertices - 1;
// User gave a closed polygon, so we remove the last vertex
if (raDecArray[0][0] == raDecArray[lastVertexIdx][0] && raDecArray[0][1] == raDecArray[lastVertexIdx][1]) {
raDecArray.pop()
// but declare the polygon as closed
}
options = options || {};
options.closed = true;
return new Polyline(raDecArray, options);
};
//@API
A.polyline = function (raDecArray, options) {
return new Polyline(raDecArray, options);
};
// @API
A.circle = function (ra, dec, radiusDeg, options) {
return new Circle([ra, dec], radiusDeg, options);
};
/**
*
* @API
*
* @param ra
* @param dec
* @param radiusRaDeg the radius along the ra axis in degrees
* @param radiusDecDeg the radius along the dec axis in degrees
* @param rotationDeg the rotation angle in degrees
*
*/
A.ellipse = function (ra, dec, radiusRaDeg, radiusDecDeg, rotationDeg, options) {
return new Ellipse([ra, dec], radiusRaDeg, radiusDecDeg, rotationDeg, options);
};
// @API
A.graphicOverlay = function (options) {
return new Overlay(options);
};
// @API
A.catalog = function (options) {
return new Catalog(options);
};
// @API
A.catalogHiPS = function (rootURL, options) {
return new ProgressiveCat(rootURL, null, null, options);
};
// API
A.footprintsFromSTCS = function (stcs, options) {
var footprints = Overlay.parseSTCS(stcs, options);
return footprints;
}
// API
A.MOCFromURL = function (url, options, successCallback) {
var moc = new MOC(options);
moc.dataFromFITSURL(url, successCallback);
return moc;
};
// API
A.MOCFromJSON = function (jsonMOC, options) {
var moc = new MOC(options);
moc.dataFromJSON(jsonMOC);
return moc;
};
// TODO: try first without proxy, and then with, if param useProxy not set
// API
A.catalogFromURL = function (url, options, successCallback, errorCallback, useProxy) {
var catalog = A.catalog(options);
const processVOTable = function (sources, footprints, fields) {
catalog.setFields(fields);
if (catalog.isObsCore()) {
// The fields corresponds to obscore ones
// Set the name of the catalog to be ObsCore:<catalog name>
catalog.name = "ObsCore:" + url;
}
// Even if the votable is not a proper ObsCore one, try to see if specific columns are given
// e.g. access_format and access_url
ObsCore.handleActions(catalog);
catalog.addFootprints(footprints)
catalog.addSources(sources);
if (successCallback) {
successCallback(sources);
}
};
if (useProxy !== undefined) {
Catalog.parseVOTable(
url,
processVOTable,
errorCallback,
catalog.maxNbSources,
useProxy,
catalog.raField, catalog.decField
);
} else {
Catalog.parseVOTable(
url,
processVOTable,
() => {
console.log("error cors")
Catalog.parseVOTable(
url,
processVOTable,
errorCallback,
catalog.maxNbSources,
true,
catalog.raField, catalog.decField
);
},
catalog.maxNbSources,
false,
catalog.raField, catalog.decField
);
}
return catalog;
};
// API
// @param target: can be either a string representing a position or an object name, or can be an object with keys 'ra' and 'dec' (values being in decimal degrees)
A.catalogFromSimbad = function (target, radius, options, successCallback, errorCallback) {
options = options || {};
if (!('name' in options)) {
options['name'] = 'Simbad';
}
var url = URLBuilder.buildSimbadCSURL(target, radius);
return A.catalogFromURL(url, options, successCallback, errorCallback, false);
};
// API
A.catalogFromNED = function (target, radius, options, successCallback, errorCallback) {
options = options || {};
if (!('name' in options)) {
options['name'] = 'NED';
}
var url;
if (target && (typeof target === "object")) {
if ('ra' in target && 'dec' in target) {
url = URLBuilder.buildNEDPositionCSURL(target.ra, target.dec, radius);
}
}
else {
var isObjectName = /[a-zA-Z]/.test(target);
if (isObjectName) {
url = URLBuilder.buildNEDObjectCSURL(target, radius);
}
else {
var coo = new Coo();
coo.parse(target);
url = URLBuilder.buildNEDPositionCSURL(coo.lon, coo.lat, radius);
}
}
return A.catalogFromURL(url, options, successCallback, errorCallback, true);
};
// API
A.catalogFromVizieR = function (vizCatId, target, radius, options, successCallback, errorCallback) {
options = options || {};
if (!('name' in options)) {
options['name'] = 'VizieR:' + vizCatId;
}
var url = URLBuilder.buildVizieRCSURL(vizCatId, target, radius, options);
return A.catalogFromURL(url, options, successCallback, errorCallback, false);
};
// API
A.catalogFromSkyBot = function (ra, dec, radius, epoch, queryOptions, options, successCallback, errorCallback) {
queryOptions = queryOptions || {};
options = options || {};
if (!('name' in options)) {
options['name'] = 'SkyBot';
}
var url = URLBuilder.buildSkyBotCSURL(ra, dec, radius, epoch, queryOptions);
return A.catalogFromURL(url, options, successCallback, errorCallback, false);
};
A.hipsDefinitionFromURL = function(url, successCallback) {
HiPSDefinition.fromURL(url, successCallback);
};
A.getAvailableListOfColormaps = function() {
return ColorCfg.COLORMAPS;
};
A.init = (async () => {
const isWebGL2Supported = document
.createElement('canvas')
.getContext('webgl2');
await init();
// Check for webgl2 support
if (isWebGL2Supported) {
Aladin.wasmLibs.core = module;
} else {
// WebGL1 not supported
// According to caniuse, https://caniuse.com/webgl2, webgl2 is supported by 89% of users
throw "WebGL2 not supported by your browser";
}
})();
export default A;

View File

@@ -29,26 +29,18 @@
*****************************************************************************/
import { View } from "./View.js";
import { MOC } from "./MOC.js";
import { Utils } from "./Utils.js";
import { Overlay } from "./Overlay.js";
import { Circle } from "./Circle.js";
import { Ellipse } from "./Ellipse.js";
import { Polyline } from "./Polyline.js";
import { Logger } from "./Logger.js";
import { Catalog } from "./Catalog.js";
import { ProgressiveCat } from "./ProgressiveCat.js";
import { Sesame } from "./Sesame.js";
import { PlanetaryFeaturesNameResolver } from "./PlanetaryFeaturesNameResolver.js";
import { CooFrameEnum } from "./CooFrameEnum.js";
import { MeasurementTable } from "./MeasurementTable.js";
import { Location } from "./Location.js";
import { Source } from "./Source.js";
import { ImageSurvey } from "./ImageSurvey.js";
import { Coo } from "./libs/astro/coo.js";
import { CooConversion } from "./CooConversion.js";
import { URLBuilder } from "./URLBuilder.js";
import { HiPSDefinition } from "./HiPSDefinition.js";
import { AladinLogo } from "./gui/AladinLogo.js";
import { ProjectionSelector } from "./gui/ProjectionSelector";
import { ProjectionEnum } from "./ProjectionEnum";
@@ -57,18 +49,12 @@ import { CooGrid } from "./gui/CooGrid.js";
import { ContextMenu } from "./gui/ContextMenu";
import { ALEvent } from "./events/ALEvent.js";
import { Color } from './Color.js';
import { ColorCfg } from './ColorCfg.js';
import { ImageFITS } from "./ImageFITS.js";
import { SimbadPointer } from "./SimbadPointer.js";
import { PlanetaryFeaturesPointer } from "./PlanetaryFeaturesPointer.js";
import { DefaultActionsForContextMenu } from "./DefaultActionsForContextMenu.js";
import { ObsCore } from "./vo/ObsCore.js";
import A from "./A.js";
import $ from 'jquery';
// Import aladin css inside the project
import './../css/aladin.css';
export let Aladin = (function () {
// Constructor
@@ -1610,98 +1596,6 @@ export let Aladin = (function () {
return Aladin;
})();
///////////////////////////////
/////// Aladin Lite API ///////
///////////////////////////////
export let A = {};
export default A;
//// New API ////
// For developers using Aladin lite: all objects should be created through the API,
// rather than creating directly the corresponding JS objects
// This facade allows for more flexibility as objects can be updated/renamed harmlessly
//@API
A.aladin = function (divSelector, options) {
return new Aladin($(divSelector)[0], options);
};
// @API
A.source = function (ra, dec, data, options) {
return new Source(ra, dec, data, options);
};
// @API
A.marker = function (ra, dec, options, data) {
options = options || {};
options['marker'] = true;
return A.source(ra, dec, data, options);
};
// @API
A.polygon = function (raDecArray, options) {
const numVertices = raDecArray.length;
if (numVertices < 3) {
// Cannot define a polygon from that
throw 'Cannot define a polygon from less than 3 vertices';
}
const lastVertexIdx = numVertices - 1;
// User gave a closed polygon, so we remove the last vertex
if (raDecArray[0][0] == raDecArray[lastVertexIdx][0] && raDecArray[0][1] == raDecArray[lastVertexIdx][1]) {
raDecArray.pop()
// but declare the polygon as closed
}
options = options || {};
options.closed = true;
return new Polyline(raDecArray, options);
};
//@API
A.polyline = function (raDecArray, options) {
return new Polyline(raDecArray, options);
};
// @API
A.circle = function (ra, dec, radiusDeg, options) {
return new Circle([ra, dec], radiusDeg, options);
};
/**
*
* @API
*
* @param ra
* @param dec
* @param radiusRaDeg the radius along the ra axis in degrees
* @param radiusDecDeg the radius along the dec axis in degrees
* @param rotationDeg the rotation angle in degrees
*
*/
A.ellipse = function (ra, dec, radiusRaDeg, radiusDecDeg, rotationDeg, options) {
return new Ellipse([ra, dec], radiusRaDeg, radiusDecDeg, rotationDeg, options);
};
// @API
A.graphicOverlay = function (options) {
return new Overlay(options);
};
// @API
A.catalog = function (options) {
return new Catalog(options);
};
// @API
A.catalogHiPS = function (rootURL, options) {
return new ProgressiveCat(rootURL, null, null, options);
};
// @API
/*
* return a Box GUI element to insert content
@@ -1888,150 +1782,4 @@ Aladin.prototype.displayJPG = Aladin.prototype.displayPNG = function (url, optio
Aladin.prototype.setReduceDeformations = function (reduce) {
this.reduceDeformations = reduce;
this.view.requestRedraw();
}
// API
A.footprintsFromSTCS = function (stcs, options) {
var footprints = Overlay.parseSTCS(stcs, options);
return footprints;
}
// API
A.MOCFromURL = function (url, options, successCallback) {
var moc = new MOC(options);
moc.dataFromFITSURL(url, successCallback);
return moc;
};
// API
A.MOCFromJSON = function (jsonMOC, options) {
var moc = new MOC(options);
moc.dataFromJSON(jsonMOC);
return moc;
};
// TODO: try first without proxy, and then with, if param useProxy not set
// API
A.catalogFromURL = function (url, options, successCallback, errorCallback, useProxy) {
var catalog = A.catalog(options);
Catalog.parseVOTable(
url,
function (sources, footprints, fields) {
catalog.setFields(fields);
if (catalog.isObsCore()) {
// The fields corresponds to obscore ones
// Set the name of the catalog to be ObsCore:<catalog name>
catalog.name = "ObsCore:" + url;
}
// Even if the votable is not a proper ObsCore one, try to see if specific columns are given
// e.g. access_format and access_url
ObsCore.handleActions(catalog);
catalog.addFootprints(footprints)
catalog.addSources(sources);
if (successCallback) {
successCallback(sources);
}
},
errorCallback,
catalog.maxNbSources,
useProxy,
catalog.raField, catalog.decField
);
return catalog;
};
// API
// @param target: can be either a string representing a position or an object name, or can be an object with keys 'ra' and 'dec' (values being in decimal degrees)
A.catalogFromSimbad = function (target, radius, options, successCallback, errorCallback) {
options = options || {};
if (!('name' in options)) {
options['name'] = 'Simbad';
}
var url = URLBuilder.buildSimbadCSURL(target, radius);
return A.catalogFromURL(url, options, successCallback, errorCallback, false);
};
// API
A.catalogFromNED = function (target, radius, options, successCallback, errorCallback) {
options = options || {};
if (!('name' in options)) {
options['name'] = 'NED';
}
var url;
if (target && (typeof target === "object")) {
if ('ra' in target && 'dec' in target) {
url = URLBuilder.buildNEDPositionCSURL(target.ra, target.dec, radius);
}
}
else {
var isObjectName = /[a-zA-Z]/.test(target);
if (isObjectName) {
url = URLBuilder.buildNEDObjectCSURL(target, radius);
}
else {
var coo = new Coo();
coo.parse(target);
url = URLBuilder.buildNEDPositionCSURL(coo.lon, coo.lat, radius);
}
}
return A.catalogFromURL(url, options, successCallback, errorCallback, true);
};
// API
A.catalogFromVizieR = function (vizCatId, target, radius, options, successCallback, errorCallback) {
options = options || {};
if (!('name' in options)) {
options['name'] = 'VizieR:' + vizCatId;
}
var url = URLBuilder.buildVizieRCSURL(vizCatId, target, radius, options);
return A.catalogFromURL(url, options, successCallback, errorCallback, false);
};
// API
A.catalogFromSkyBot = function (ra, dec, radius, epoch, queryOptions, options, successCallback, errorCallback) {
queryOptions = queryOptions || {};
options = options || {};
if (!('name' in options)) {
options['name'] = 'SkyBot';
}
var url = URLBuilder.buildSkyBotCSURL(ra, dec, radius, epoch, queryOptions);
return A.catalogFromURL(url, options, successCallback, errorCallback, false);
};
A.hipsDefinitionFromURL = function(url, successCallback) {
HiPSDefinition.fromURL(url, successCallback);
};
A.getAvailableListOfColormaps = function() {
return ColorCfg.COLORMAPS;
};
A.init = (async () => {
const isWebGL2Supported = document
.createElement('canvas')
.getContext('webgl2');
// Check for webgl2 support
if (isWebGL2Supported) {
const module = await import('./../../pkg-webgl2');
Aladin.wasmLibs.core = module;
} else {
// WebGL1 not supported
// According to caniuse, https://caniuse.com/webgl2, webgl2 is supported by 89% of users
throw "WebGL2 not supported by your browser";
}
})();
window.A = A;
}

Some files were not shown because too many files have changed in this diff Show More