New option to make the north pole remain up to the view

* lockNorthUp new Aladin init option. False by default.
* setRotation is still allowed if lockNorthUp=true but when panning, the
view resets its orientation so that the north pole is up

.github/workflows/npm-publish.yml

@@ -32,7 +32,7 @@ jobs:
           npm install
       - name: "Build Aladin Lite"
         run: |
-          npm run build:npm
+          npm run build
       - name: "Publish Aladin Lite to npm"
         run: |
           npm publish

.github/workflows/test.yml

@@ -25,10 +25,6 @@ jobs:
       - name: "Install wasm-pack"
         run: |
           curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -y
-      - name: "Run cargo clippy"
-        run: cd src/core && cargo clippy --all-targets --features=webgl2 -- -D warnings
-      - name: Format check
-        run: cd src/core && cargo fmt --all -- --check
       - name: "Install dependencies"
         run: |
           npm install

.gitignore

@@ -15,11 +15,9 @@ package-lock.json
 src/core/Cargo.lock
 src/core/target/
 
-# the tmp glsl files used when minifying the shaders into the wasm (build.rs)
-src/glsl/webgl2/**/*.min
-src/glsl/webgl2/**/*.tmp
-
-package/
+# this rust file is generated when compiling the code, so it is not
+# useful to put it on git
+src/core/src/shaders.rs
 
 ## python related
 # python environment

CHANGELOG.md

@@ -4,33 +4,11 @@
 
 ### What's Changed
 
+* [perf] perform CPU computations with Vec3 and Matrix3 and not 4 dimensions matrices/vectors
+* [feat] lockNorthUp Aladin object new option locking the north pole up to the view center
+
 ## Released
 
-### 3.7.0-beta
-
-#### What's Changed
-
-* [feat] flip longitude axis global method on Aladin by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/245>
-* [feat] add rotation event by [@ManonMarchand][ManonMarchand] in <https://github.com/cds-astro/aladin-lite/pull/283>
-* [docs] just fixing typo in image's doc by [@ManonMarchand][ManonMarchand] in <https://github.com/cds-astro/aladin-lite/pull/284>
-* [docs] change to an image with correct astrometry in example by [@ManonMarchand][ManonMarchand] in <https://github.com/cds-astro/aladin-lite/pull/290>
-* [docs] clarify use of precision in Coo by [@alexgoff][alexgoff] in <https://github.com/cds-astro/aladin-lite/pull/294>
-* [feat] allow setting HiPS CORS and credential options by [@pmatsson][pmatsson] in <https://github.com/cds-astro/aladin-lite/pull/281>
-* [feat] color picker and read pixel(s) API methods by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/280>
-* [fix] chandra hips display and akari by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/306>
-* [enhancement] update to the new version of fitsrs by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/310>
-* [fix] 26 channel color offset by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/320>
-* [fix] Circle intersectsBBox by [@emellega][emellega] in <https://github.com/cds-astro/aladin-lite/pull/309>
-* [feat] anti aliasing on lines plotted by the GPU by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/239>
-* [feat] source custom color and size from its data content by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/321>
-* [feat] catalog new select method by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/322>
-* [feat] HiPS 3D impl by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/314>
-* [feat] customize share URL function by [@tboch][tboch] in <https://github.com/cds-astro/aladin-lite/pull/327>
-* enhancement: use TAP entry point to query NED by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/257>
-* [perf] refac geometrical computations using Vec3/Mat3 instead of Vec4/Mat4 [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/276>
-* [fix] distortion at poles by [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/247>
-* [feat] new aladin option `lockNorthUp` to keep north pole up [@bmatthieu3][bmatthieu3] in <https://github.com/cds-astro/aladin-lite/pull/272>
-
 ### 3.6.3
 
 #### What's Changed

README.md

@@ -1,4 +1,4 @@
-# [Aladin Lite](https://aladin.cds.unistra.fr/AladinLite)
+# [Aladin Lite](https://aladin.u-strasbg.fr/AladinLite)
 
 **An astronomical HiPS visualizer in the browser** <img src="aladin-logo.png" alt="Aladin Lite logo" width="220">
 
@@ -8,20 +8,14 @@ See [A&A 578, A114 (2015)](https://arxiv.org/abs/1505.02291) and [IVOA HiPS Reco
 
 Aladin Lite is built to be easily embeddable in any web page. It powers astronomical portals like [ESASky](https://sky.esa.int/), [ESO Science Archive portal](http://archive.eso.org/scienceportal/) and [ALMA Portal](https://almascience.eso.org/asax/).
 
-More details on [Aladin Lite documentation page](http://aladin.cds.unistra.fr/AladinLite/doc/).
+More details on [Aladin Lite documentation page](http://aladin.u-strasbg.fr/AladinLite/doc/).
 A new [API technical documentation](https://cds-astro.github.io/aladin-lite/) is now available.
 
 [![Run tests](https://github.com/cds-astro/aladin-lite/actions/workflows/test.yml/badge.svg)](https://github.com/cds-astro/aladin-lite/actions/workflows/test.yml)
 [![API Documentation](https://img.shields.io/badge/API-documentation-blue.svg)](https://cds-astro.github.io/aladin-lite)
 [![Release page](https://img.shields.io/badge/Release-download-yellow.svg)](https://aladin.cds.unistra.fr/AladinLite/doc/release/)
 
-Try Aladin Lite [here](https://aladin.cds.unistra.fr/AladinLite).
-
-Aladin Lite is made possible thanks to pure Rust core libraries:
-* [cdshealpix](https://github.com/cds-astro/cds-healpix-rust) - for HEALPix projection and unprojection to/from sky coordinates 
-* [mapproj](https://github.com/cds-astro/cds-mapproj-rust) - for computing (un)projections described by a WCS
-* [fitsrs](https://github.com/cds-astro/fitsrs) - for reading and parsing FITS images
-* [moc](https://github.com/cds-astro/cds-moc-rust) - for parsing, manipulating, and serializing multi-order HEALPix coverage maps
+Aladin Lite is available [at this link](https://aladin.u-strasbg.fr/AladinLite).
 
 ## Running & editable JS examples
 
@@ -108,15 +102,14 @@ Aladin Lite can be imported with:
 * [X] FITS images support
 * [X] WCS parsing, displaying an (JPEG/PNG) image in aladin lite view
 * [X] Display customized shapes (e.g. proper motions) from astronomical catalog data
-* [X] AVM tags parsing support inside JPEG
+* [X] AVM tags parsing support
 * [X] Easy sharing of current « view »
 * [ ] All VOTable serializations
 * [ ] FITS tables
 * [X] Creating HiPS instance from an URL
 * [X] Local HiPS loading 
 * [X] Multiple mirrors handling for HiPS tile retrival
-* [X] HiPS cube
-* [ ] HiPS3D
+* [ ] HiPS cube
 
 ## Licence
 

assets/icons/color-picker.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-
-<rect x="0" fill="none" width="20" height="20"/>
-
-<g>

codemeta.json

@@ -8,8 +8,8 @@
     "dateModified": "2023-01-31",
     "issueTracker": "https://github.com/cds-astro/aladin-lite/issues",
     "name": "Aladin Lite",
-    "version": "3.7.2-beta",
-    "softwareVersion": "3.7.2-beta",
+    "version": "3.6.4",
+    "softwareVersion": "3.6.4",
     "description": "An astronomical HiPS visualizer in the browser.",
     "identifier": "10.5281/zenodo.7638833",
     "applicationCategory": "Astronomy, Visualization",

examples/al-adass2022.html

@@ -14,7 +14,7 @@
         aladin = A.aladin('#aladin-lite-div', {showSettingsControl: true, survey: "P/PanSTARRS/DR1/color-z-zg-g", showReticle: false, projection: "AIT", cooFrame: 'icrs', target: "stephan's quintet", fov: startFov, showGotoControl: false, showFrame: false, fullScreen: true, showLayersControl: true, showCooGridControl: false});
 
         const chft = aladin.createImageSurvey('CFHT', "CFHT deep view of NGC7331 and Stephan's quintet u+g+r", "https://cds.unistra.fr/~derriere/PR_HiPS/2022_Duc/", null, null, {imgFormat: 'png'});
-        const nircamJWST = aladin.createImageSurvey('Nircam', "Stephans Quintet NIRCam+MIRI", "https://alasky.cds.unistra.fr/JWST/CDS_P_JWST_Stephans-Quintet_NIRCam-MIRI/", null, null, {imgFormat: 'png', colormap: "viridis"});
+        const nircamJWST = aladin.createImageSurvey('Nircam', "Stephans Quintet NIRCam+MIRI", "http://alasky.cds.unistra.fr/JWST/CDS_P_JWST_Stephans-Quintet_NIRCam+MIRI/", null, null, {imgFormat: 'png', colormap: "viridis"});
         
         aladin.setOverlayImageLayer("CFHT", "CFHT");
         aladin.setOverlayImageLayer("Nircam", "Nircam");
@@ -30,7 +30,7 @@
                 fov *= 0.997;
                 rotation += 0.07;
 
-                aladin.setRotation(rotation)
+                aladin.setViewCenter2NorthPoleAngle(rotation)
                 aladin.setFoV(fov);
 
                 if (fov < 3 && fov > 0.5) {

examples/al-animation-CS-CDS-2022.html

@@ -201,7 +201,7 @@
 
         let stephansNIRCamMIRI
         async function s11() {
-            stephansNIRCamMIRI = aladin.createImageSurvey('CDS/P/JWST/Stephans-Quintet/NIRCam-MIRI', "stephansNircamMIRI", null, null, null)
+            stephansNIRCamMIRI = aladin.createImageSurvey('CDS/P/JWST/Stephans-Quintet/NIRCam+MIRI', "stephansMIRI", null, null, null)
             stephansNIRCamMIRI.setOpacity(0.0)
             aladin.setOverlayImageLayer(stephansNIRCamMIRI, 'stephansNIRCamMIRI')
 

examples/al-artifact.html

@@ -4,7 +4,7 @@
 </head>
 <body>
 
-<div id="aladin-lite-div" style="width: 1024px; height: 768px;"></div>
+<div id="aladin-lite-div" style="width: 1024px; height: 256px;"></div>
 
 <script type="module">
     import A from '../src/js/A.js';
@@ -13,14 +13,12 @@
         var aladin = A.aladin(
             '#aladin-lite-div',
             {
-                survey: 'data/hips/wcs', // set initial image survey
+                survey: 'https://alasky.cds.unistra.fr/Pan-STARRS/DR1/color-z-zg-g/', // set initial image survey
                 projection: 'SIN', // set a projection
-                fov: 80.0, // initial field of view in degrees
-                target: '96.5279427 -88.0037230', // initial target
-                cooFrame: 'galactic', // set galactic frame
-                showCooGrid: true, // set the grid,
-                fullScreen: true,
-                showSettingsControl: true,
+                fov: 114.19, // initial field of view in degrees
+                target: '19 24 51.556 +45 16 44.36', // initial target
+                cooFrame: 'equatorial', // set galactic frame
+                showCooGrid: true, // set the grid
             }
         );
     });

examples/al-cat-galaxy-shape.html

@@ -26,17 +26,8 @@
         limit: 1000,
         //orderBy: 'nb_ref',
         onClick: 'showTable',
-        onlyFootprints: false,
-        color: (s) => {
-          let coo = A.coo();
-          coo.parse(s.data['RAJ2000'] + ' ' + s.data['DEJ2000'])
-
-          let a = (0.1 * Math.pow(10, +s.data.logD25)) / 60;
-          let b = (1.0 / Math.pow(10, +s.data.logR25)) * a
-
-          return `rgb(${s.data["logR25"]*255.0}, ${s.data["logR25"]*255.0}, 255)`
-        },
-        hoverColor: 'red',
+        color: 'yellow',
+        hoverColor: 'blue',
         shape: (s) => {
           let coo = A.coo();
           coo.parse(s.data['RAJ2000'] + ' ' + s.data['DEJ2000'])

examples/al-cat-proper-motion.html

@@ -31,21 +31,15 @@
         hoverColor: 'yellow',
         selectionColor: 'white',
         // Footprint associated to sources
-        color: (s) => {
-          // discard drawing a vector for big pm
-          let totalPmSquared = s.data.pmra*s.data.pmra + s.data.pmdec*s.data.pmdec;
-          if (totalPmSquared > 6) {
-            return;
-          }
-
-          return rainbowColorMap((totalPmSquared - 2.5) / 2)
-        },
         shape: (s) => {
           // discard drawing a vector for big pm
           let totalPmSquared = s.data.pmra*s.data.pmra + s.data.pmdec*s.data.pmdec;
           if (totalPmSquared > 6) {
             return;
           }
+
+          let color = rainbowColorMap((totalPmSquared - 2.5) / 2)
+
           // Compute the mean of pm over the catalog sources
           if (!pmraMean || !pmdecMean) {
             pmraMean = 0, pmdecMean = 0;
@@ -68,24 +62,13 @@
             s.dec,
             s.ra + dra,
             s.dec + ddec,
+            {color}
           )
         }
-      },
-      () => {
-        aladin.addCatalog(pmCat);
-
-        pmCat.select((s) => {
-          let totalPmSquared = s.data.pmra*s.data.pmra + s.data.pmdec*s.data.pmdec;
-          if (totalPmSquared > 6) {
-            return false;
-          }
-          return totalPmSquared < 3.0;
-        });
       });
+      aladin.addCatalog(pmCat);
   });
 
-  
-
   function rainbowColorMap(value) {
     // Ensure value is within range [0, 1]
     value = Math.max(0, Math.min(1, value));

examples/al-coronelli.html

@@ -23,7 +23,6 @@
 <script src="https://code.jquery.com/jquery-1.10.1.min.js"></script>
 <script type="text/javascript">
     let aladin;
-    let longitudeReversed = false;
 </script>
 <div id="aladin-lite-div" style="width:100vw;height:100vh;">
     <div id="calibCircle" style="display: none;"></div>
@@ -38,8 +37,8 @@
     <!-- fin temporaire gestion cercle -->
 
 	<b>Orientation</b><br>
-              <button id="hips-coronelli" class="pure-button" name="ref-hips" onclick="longitudeReversed = false; aladin.reverseLongitude(longitudeReversed)">Normal</button><br>
-              <button id="hips-illenoroc" class="pure-button" name="ref-hips" onclick="longitudeReversed = true; aladin.reverseLongitude(longitudeReversed)">Inversé</button>
+              <button id="hips-coronelli" class="pure-button" name="ref-hips" onclick="aladin.setImageSurvey('Coronelli')">Normal</button><br>
+              <button id="hips-illenoroc" class="pure-button" name="ref-hips" onclick="aladin.setImageSurvey('illenoroC')">Inversé</button>
 	<br><br>
 
 	<b>Constellations</b>
@@ -233,7 +232,8 @@
     A.init.then(() => {
         var hipsDir="http://alasky.u-strasbg.fr/CDS_P_Coronelli";
         aladin = A.aladin("#aladin-lite-div", {showSimbadPointerControl: true, expandLayersControl: true, realFullscreen: true, fov: 100, allowFullZoomout: true, showReticle: false });
-        aladin.createImageSurvey('Coronelli', 'Coronelli', hipsDir, 'equatorial', 4, {imgFormat: 'jpg'});
+        aladin.createImageSurvey('illenoroC', 'illenoroC', hipsDir, 'equatorial', 4, {imgFormat: 'jpg', longitudeReversed: false});
+        aladin.createImageSurvey('Coronelli', 'Coronelli', hipsDir, 'equatorial', 4, {imgFormat: 'jpg', longitudeReversed: true});
         aladin.setImageSurvey('Coronelli');
 
         $('#layersControlLeft').show();

examples/al-customize-share-url-fn.html

@@ -1,22 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width, height=device-height, maximum-scale=1.0, initial-scale=1.0, user-scalable=no">
-</head>
-<body>
-<div id="aladin-lite-div" style="width: 500px; height: 500px"></div>
-
-<script type="text/javascript" src="./../dist/aladin.umd.cjs" charset="utf-8"></script>
-<script type="text/javascript">
-    var aladin;
-    A.init.then(() => {
-        aladin = A.aladin('#aladin-lite-div', {fullScreen: true, cooFrame: "ICRSd", showSimbadPointerControl: true, showShareControl: true, showShareControl: true, survey: 'https://alasky.cds.unistra.fr/DSS/DSSColor/', fov: 1.0, target: 'M 20', showContextMenu: true});
-
-        // customize share URL function
-        aladin.customizeShareURLFunction(() => {return 'https://sky.esa.int/esasky/?target=' + aladin.getRaDec()[0] + '%20' + aladin.getRaDec()[1] + '&fov=' + aladin.getFoV()[0]})
-
-    });
-</script>
-
-</body>
-</html>

examples/al-cuts-fits-hips.html

@@ -15,7 +15,7 @@
 
         aladin.setBaseImageLayer(dss);
 
-        dss.setCuts(2, 100, 'jpeg');
+        dss.setCuts(2, 10000);
 
 
     });

examples/al-displayFITS.html

@@ -11,12 +11,11 @@
     import A from '../src/js/A.js';
     let aladin;
     A.init.then(() => {
-        aladin = A.aladin('#aladin-lite-div', {cooFrame: "icrs", log: false, backgroundColor: 'rgba(0, 0, 0, 255)'});
+        aladin = A.aladin('#aladin-lite-div', {cooFrame: "icrs", log: false, backgroundColor: 'red'});
 
         aladin.displayFITS(
             //'https://fits.gsfc.nasa.gov/samples/FOCx38i0101t_c0f.fits', // url of the fits file
             'data/fits/panstarrs-g-m61.fits',
-            //'https://almascience.eso.org/dataPortal/member.uid___A001_X88f_X297.calibrated_final_cont_Sgr_B1off.pbcor.fits',
             {
                 name: 'm61',
                 colormap: 'viridis'

examples/al-displayJPG.html

@@ -39,7 +39,7 @@ Image Opacity: <br/> <input id="slider" type="range" value=1 min=0 max=1 step=0.
         //let fits = aladin.displayFITS('http://goldmine.mib.infn.it/data//B/fits/A04_VC1316_ooooog.fits', 'overlay');
         let jpg = aladin.displayJPG(
             // the JPG to transform to HiPS
-            'https://owncloud.tuebingen.mpg.de/index.php/s/sdxfNgcEaaXoBp7/download/nightskycam3_2025_08_07_05_17_30_healpix1024_red.fits',
+            'https://noirlab.edu/public/media/archives/images/large/noirlab1912a.jpg',
             // no options
             {
                 transparency: 1.0,

examples/al-event-listeners.html

@@ -64,10 +64,6 @@
             console.log(proj)
         });
 
-        aladin.on('positionChanged', function(pos) {
-            console.log(pos)
-        });
-
         aladin.on('layerChanged', function(imageLayer, layer, state){
             console.log(imageLayer, layer, state)
         });

examples/al-flip-longitude-axis.html

@@ -1,23 +0,0 @@
-<!doctype html>
-<html>
-<head>
-</head>
-<body>
-    <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
-<script type="module">
-import A from '../src/js/A.js';
-
-A.init.then(() => {
-    let aladin = A.aladin('#aladin-lite-div', {longitudeReversed: true, showCooGrid: true, cooFrame: 'galactic', target: '0 0', fov: 100});
-    //aladin.reverseLongitude(true)
-
-    setTimeout(
-        () => {
-            aladin.reverseLongitude(false)
-        },
-        5000
-    )
-});
-</script>
-</body>
-</html>

examples/al-footprints.html

@@ -11,9 +11,9 @@
     let aladin;
     A.init.then(() => {
         // Start up Aladin Lite
-        aladin = A.aladin('#aladin-lite-div', {target: 'M 1', fov: 0.2, showContextMenu: true, fullScreen: true});
-        var overlay = A.graphicOverlay({color: 'purple', lineWidth: 3, lineDash: [2, 2]});
-        aladin.addOverlay(overlay);
+        aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'M 1', fov: 0.2, showContextMenu: true, fullScreen: true});
+        var overlay = A.graphicOverlay({color: '#ee2345', lineWidth: 3, lineDash: [2, 2]});
+        /*aladin.addOverlay(overlay);
         overlay.addFootprints([
             A.polygon([[83.64287, 22.01713], [83.59872, 22.01692], [83.59852, 21.97629], [83.64295, 21.97629]], {hoverColor: 'green'}),
             A.polygon([[83.62807, 22.06330], [83.58397, 22.02280], [83.62792, 22.02258]]),
@@ -21,7 +21,7 @@
         ]);
         overlay.add(A.circle(83.66067, 22.03081, 0.04, {color: 'cyan'})); // radius in degrees
         overlay.add(A.vector(83.66067, 22.03081, 0.04, {color: 'cyan'})); // radius in degrees
-        
+        */
         aladin.on("footprintClicked", (footprint, xyMouseCoords) => {
             console.log("footprint clicked catched: ", footprint, "mouse coords xy: ", xyMouseCoords.x, xyMouseCoords.y);
         })
@@ -35,8 +35,8 @@
             console.log("Object hovered stopped: ", object, "mouse coords xy: ", xyMouseCoords.x, xyMouseCoords.y);
         })
 
-        //const cat = A.catalogFromVizieR('B/assocdata/obscore', 'M 1', 10, {onClick: 'showTable', selectionColor: "orange", hoverColor: 'red', limit: 10000});
-        //aladin.addCatalog(cat);
+        const cat = A.catalogFromVizieR('B/assocdata/obscore', 'M 1', 10, {onClick: 'showTable', selectionColor: "orange", hoverColor: 'red', limit: 10000});
+        aladin.addCatalog(cat);
     });
 </script>
 </body>

examples/al-fullscreen.html

@@ -5,16 +5,16 @@
 <body>
     <div>
 <div id="offset" style="display: inline-block; width: 200px; height: 100px"></div>
-<div id="aladin-lite-div" style="width: 500px; height: 500px"></div>
+<div id="aladin-lite-div" style="display: inline-block; width: 50%"></div>
 </div>
 <!--<script type="text/javascript" src="https://aladin.cds.unistra.fr/AladinLite/api/v3/latest/aladin.js" charset="utf-8"></script>-->
 
 
+<script>let aladin, hips</script>
 <script type="module">
     import A from '../src/js/A.js';
-    let aladin;
     A.init.then(() => {
-        aladin = A.aladin('#aladin-lite-div', {projection: 'TAN', cooFrame: 'galactic', showSettingsControl: true, showSimbadPointerControl: true, showContextMenu: true, target: 'galactic center'});
+        aladin = A.aladin('#aladin-lite-div', {projection: 'TAN', cooFrame: 'galactic', showSettingsControl: true, showSimbadPointerControl: true, showContextMenu: true, target: 'galactic center', survey: 'P/Finkbeiner'});
         // possible values are 'blues', 'cividis', 'cubehelix', 'eosb', 'grayscale', 'inferno', 'magma', 'native', 'parula', 'plasma', 'rainbow',
         // 'rdbu', 'rdylbu', 'redtemperature', 'sinebow', 'spectral', 'summer', 'viridis', 'ylgnbu' and 'ylorbr'
 

examples/al-hips-3D.html

@@ -1,62 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-    </head>
-<body>
-
-
-<div id="aladin-lite-div" style="width: 768px; height: 512px"></div>
-<script>let aladin; let hips;</script>
-<script type="module">
-    import A from '../src/js/A.js';
-    A.init.then(() => {
-        aladin = A.aladin(
-            '#aladin-lite-div',
-            {
-                showSimbadPointerControl: true,
-                projection: 'AIT', // set a projection
-                fov: 8.0, // initial field of view in degrees
-                target: '10.6875598 +41.1402170', // initial target
-                cooFrame: 'icrs', // set galactic frame
-                reticleColor: '#ff89ff', // change reticle color
-                showContextMenu: true,
-                showFrame: true,
-                showZoomControl:true,
-                showSettingsControl:true,
-                fullScreen: true,
-                samp: true,
-            }
-        );
-
-        hips = aladin.newImageSurvey("https://alasky.cds.unistra.fr/HIPS3D/LGLBSHI-test-compression/", {
-            successCallback: (hips) => {
-                //hips.setFrequency({value: 6.374279333565797E-7, unit: "m"}) // GALFA
-            }
-        });
-        // compressed https://alasky.cds.unistra.fr/test-compression-cubes/DHIGLS/
-        //hips = aladin.newImageSurvey("http://alasky.cds.unistra.fr/DHIGLS");
-        //hips = aladin.newImageSurvey("https://alasky.cds.unistra.fr/MUSE3D");
-        // http://alasky.cds.unistra.fr/LGLBSHI
-        aladin.setImageLayer(hips)
-
-        //hips.setFrequency({value: emMin + delta * i, unit: "m"})
-        //hips.setFrequency({value: 6.374279333565797E-7, unit: "m"}) // MUSE
-        //hips.setFrequency({value: 0.21101690259115785, unit: "m"}) // DGHILG
-
-        /*let id;
-        aladin.on("zoomChanged", () => {
-            if (id)
-                clearTimeout(id);
-            id = setTimeout(() => {
-                console.log("wheel stopped, new cone search here")
-            }, 500);
-        })*/
-    });
-</script>
-<style>
-    .aladin-cat-browser-box {
-        width: 600px;
-    }
-</style>
-</body>
-</html>

examples/al-hips-cube.html

@@ -30,14 +30,9 @@
             }
         );
 
-        hips = aladin.newImageSurvey("https://alasky.cds.unistra.fr/GALFAHI/GALFAHI-Narrow-DR2");
+        hips = aladin.newImageSurvey("https://alasky.cds.unistra.fr/GALFAHI/GALFAHI-Narrow-DR2/");
         aladin.setImageLayer(hips)
 
-        setTimeout(() => {
-            hips.setSliceNumber(100)
-
-        }, 1000)
-
         /*let id;
         aladin.on("zoomChanged", () => {
             if (id)

examples/al-hips-local.html

@@ -11,7 +11,7 @@
 
     let aladin;
     A.init.then(() => {
-        aladin = A.aladin('#aladin-lite-div', {survey: "./data/hips/CDS_P_DSS2_color", target: "05 40 59.12 -02 27 04.1", fov: 2, log: false});
+        aladin = A.aladin('#aladin-lite-div', {survey: "data/hips/CDS_P_DSS2_color", target: "05 40 59.12 -02 27 04.1", fov: 2, log: false});
     });
 </script>
 

examples/al-hips-order-list.html

@@ -10,7 +10,7 @@
     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/', showProjectionControl: true, showContextMenu: true, showStatusBar: true, fullScreen: true, target: 'galactic center', expandLayersControl: true});
+        aladin = A.aladin('#aladin-lite-div', {survey: 'http://alasky.cds.unistra.fr/ancillary/GaiaDR2/hips-density-map/', showProjectionControl: true, showContextMenu: true, showStatusBar: true, fullScreen: true, target: 'galactic center'});
 
         const fluxMap = aladin.createImageSurvey('gdr3-color-flux-map', 'Gaia DR3 flux map', 'https://alasky.u-strasbg.fr/ancillary/GaiaEDR3/color-Rp-G-Bp-flux-map', 'equatorial', 7);
         const densityMap = aladin.createImageSurvey('gdr3-density-map', 'Gaia DR3 density map', 'sdfsg', 'equatorial', 7, {formats: ['fits']});

examples/al-image-with-AVM-tags.html

@@ -7,12 +7,12 @@
     <script type="module">
         import A from '../src/js/A.js';
         A.init.then(() => {
-            let aladin = A.aladin('#aladin-lite-div', {fov: 30, target: "280 +0", projection: "AIT", showShareControl:true, showSettingsControl: true, showContextMenu:true});
-
+            let aladin = A.aladin('#aladin-lite-div', {fov: 30, survey: "CDS/P/DSS2/color", target: "280 +0", projection: "AIT", showShareControl:true, showSettingsControl: true, showContextMenu:true});
+            
             aladin.setOverlayImageLayer(A.image(
-                "https://www.virtualastronomy.org/files/avm_examples/spitzer/ssc2005-24a1.jpg",
+                "https://www.virtualastronomy.org/images/sig05-013.jpg",
                 {
-                    name: "spitzer-ssc2005-24a1",
+                    name: "sig05-017",
                     successCallback: (ra, dec, fov, image) => {
                         console.log(ra, dec)
                         aladin.gotoRaDec(ra, dec);

examples/al-image-with-WCS.html

@@ -7,55 +7,31 @@
     <script type="module">
         import A from '../src/js/A.js';
         A.init.then(() => {
-            let aladin = A.aladin('#aladin-lite-div', {fov: 30, target: "286.411023328 -37.3460065319", projection: "AIT", showShareControl:true, showSettingsControl: true, showContextMenu:true});
+            let aladin = A.aladin('#aladin-lite-div', {fov: 30, survey: "CDS/P/GALEXGR6/AIS/FUV", target: "280 +0", projection: "AIT", showShareControl:true, showSettingsControl: true, showContextMenu:true});
             
             aladin.setOverlayImageLayer(A.image(
-                "data/img/m82.png",
+                "https://nova.astrometry.net/image/25038473?filename=M61.jpg",
                 {
-                    name: "M82",
+                    name: "M61",
                     wcs: {
-                        NAXIS: 2, // number of axes
-                        NAXIS1: 3000, // image width
-                        NAXIS2: 1918, // image height
-                        CTYPE3: "RGB", // Tell Aladin this is RGB
-                        WCSAXES: 2, // no comment
-                        CTYPE1: "RA---TAN", // TAN (gnomic) projection + SIP distortions
-                        CTYPE2: "DEC--TAN", // TAN (gnomic) projection + SIP distortions
+                        NAXIS: 0, // Minimal header
+                        CTYPE1: 'RA---TAN', // TAN (gnomic) projection
+                        CTYPE2: 'DEC--TAN', // TAN (gnomic) projection
                         EQUINOX: 2000.0, // Equatorial coordinates definition (yr)
                         LONPOLE: 180.0, // no comment
                         LATPOLE: 0.0, // no comment
-                        CRVAL1: 286.411023328, // RA of reference point
-                        CRVAL2: -37.3460065319, // DEC of reference point
-                        CRPIX1: 2264.1858724, // X reference pixel
-                        CRPIX2: 583.14634196, // Y reference pixel
-                        CUNIT1: "deg", // X pixel scale units
-                        CUNIT2: "deg", // Y pixel scale units
-                        CD1_1: -0.00284225200648, // Transformation matrix
-                        CD1_2: 0.00145908284254, // no comment
-                        CD2_1: -0.00145832184852, // no comment
-                        CD2_2: -0.0028440175499, // no comment
-                        A_ORDER: 2, // Polynomial order, axis 1
-                        A_0_0: 0, A_0_1: 0, A_0_2: 1.97760279295e-7,
-                        A_1_0: 0, A_1_1: 5.32298396638e-7,
-                        A_2_0: -2.16045473726e-6,
-                        B_ORDER: 2, // Polynomial order, axis 2
-                        B_0_0: 0, B_0_1: 0, B_0_2: 3.97377848239e-7,
-                        B_1_0: 0, B_1_1: -2.25823401545e-6,
-                        B_2_0: -1.47800507759e-7,
-                        AP_ORDER: 2, // Inv polynomial order, axis 1
-                        AP_0_0: 0.00617616810622,
-                        AP_0_1: -1.68315582233e-6,
-                        AP_0_2: -1.96504899588e-7,
-                        AP_1_0: -5.8320637913e-6,
-                        AP_1_1: -5.26081207663e-7,
-                        AP_2_0: 2.13760782681e-6,
-                        BP_ORDER: 2, // Inv polynomial order, axis 2
-                        BP_0_0: -0.000681183014773,
-                        BP_0_1: -2.15389849968e-7,
-                        BP_0_2: -3.94508397022e-7,
-                        BP_1_0: 4.51837961352e-6,
-                        BP_1_1: 2.24050293101e-6,
-                        BP_2_0: 1.49195269783e-7
+                        CRVAL1: 185.445488837, // RA of reference point
+                        CRVAL2: 4.47896032431, // DEC of reference point
+                        CRPIX1: 588.995094299, // X reference pixel
+                        CRPIX2: 308.307905197, // Y reference pixel
+                        CUNIT1: 'deg', // X pixel scale units
+                        CUNIT2: 'deg', // Y pixel scale units
+                        CD1_1: -0.000223666022989, // Transformation matrix
+                        CD1_2: -0.000296578064584, // no comment
+                        CD2_1: -0.000296427555509, // no comment
+                        CD2_2: 0.000223774308964, // no comment
+                        NAXIS1: 1080, // Image width, in pixels.
+                        NAXIS2: 705 // Image height, in pixels.
                     },
                     successCallback: (ra, dec, fov, image) => {
                         aladin.gotoRaDec(ra, dec);

examples/al-init-custom-options.html

@@ -14,7 +14,7 @@
             '#aladin-lite-div',
             {
                 showSimbadPointerControl: true,
-                survey: 'https://skies.esac.esa.int/AKARI/color/', // set initial image survey
+                survey: 'P/allWISE/color', // set initial image survey
                 projection: 'AIT', // set a projection
                 fov: 360, // initial field of view in degrees
                 target: 'orion', // initial target
@@ -29,7 +29,6 @@
                 showCooGrid: true,
                 fullScreen: true,
                 samp: true,
-                realFullscreen: true,
                 lockNorthUp: true,
             }
         );

examples/al-moc-sdss9.html

@@ -12,7 +12,7 @@
     import A from '../src/js/A.js';
     let aladin;
     A.init.then(() => {
-        aladin = A.aladin('#aladin-lite-div', {inertia: true, target: '00 00 00 +07 00 00', fov: 130, survey: 'P/Mellinger/color', showContextMenu: true, fullScreen: true});
+        aladin = A.aladin('#aladin-lite-div', {inertia: false, target: '00 00 00 +07 00 00', fov: 130, survey: 'P/Mellinger/color', showContextMenu: true, fullScreen: true});
         var moc11 = A.MOCFromURL('http://skies.esac.esa.int/HST/NICMOS/Moc.fits', {color: '#84f', lineWidth: 3}, (moc) => {
             // moc is ready
             console.log(moc.contains(205.9019247, +2.4492764));

examples/al-multiple-surveys.html

@@ -8,7 +8,7 @@
 <script type="module">
     import A from '../src/js/A.js';
     A.init.then(() => {
-        aladin = A.aladin('#aladin-lite-div', {projection: 'MOL', lockNorthUp: true, fullScreen: true, fov: 360, survey: ['P/DM/vizMine', 'P/HST/GOODS/color', 'P/MATLAS/g'], target: '0 0', showProjectionControl: false, showSettingsControl: false, showLayersControl: true, showCooGrid: true, showFrame: false, showCooLocation: false});
+        aladin = A.aladin('#aladin-lite-div', {projection: 'MOL', fullScreen: true, fov: 360, survey: ['P/DM/vizMine', 'P/HST/GOODS/color', 'P/MATLAS/g'], target: '0 0', showProjectionControl: false, showSettingsControl: false, showLayersControl: false, showCooGrid: false, showFrame: false, showCooLocation: false});
     });
 </script>
 

examples/al-no-properties.html

@@ -10,6 +10,7 @@ A.init.then(() => {
     let aladin = A.aladin('#aladin-lite-div', {fov: 70,projection: "AIT"});
     
     aladin.setOverlayImageLayer(A.imageHiPS(
+        'Fermi',
         "https://alasky.cds.unistra.fr/Fermi/Color",
         {
             name: "Fermi color",

examples/al-obscore.html

@@ -17,8 +17,6 @@
         });
 
         aladin.addCatalog(A.catalogFromVizieR("B/assocdata/obscore", "0 +0", 20, {onClick: 'showTable', hoverColor: 'yellow', limit: 1000}))
-        aladin.addCatalog(A.catalogFromSKAORucio("0 +0", 70, {onClick: 'showTable', hoverColor: 'yellow', limit: 1000}))
-
     });
 </script>
 </body>

examples/al-polyline.html

@@ -13,15 +13,9 @@
     A.init.then(() => {
         aladin = A.aladin('#aladin-lite-div', {target: 'Gamma Cas', fov: 10, cooFrame: 'icrs'});
 
-        var overlay = A.graphicOverlay({color: 'green', lineWidth: 2});
+        var overlay = A.graphicOverlay({lineWidth: 2});
         aladin.addOverlay(overlay);
-        overlay.add(A.polyline([ [2.29452158, 59.14978110], [10.12683778, 56.53733116], [14.1772154, 60.7167403], [21.45396446, 60.23528403], [28.59885697, 63.67010079] ], {
-            opacity: 0.7
-        }));
-
-        aladin.on('rotationChanged', (rot) => {
-            aladin.setRotation(rot)
-        })
+        overlay.add(A.polyline([ [2.29452158, 59.14978110], [10.12683778, 56.53733116], [14.1772154, 60.7167403], [21.45396446, 60.23528403], [28.59885697, 63.67010079] ], {color: 'green'}));
     });
 </script>
 </body>

examples/al-read-pixel.html

@@ -1,123 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.js"></script>
-    </head>
-<body>
-    <div id="aladin-lite-div" style="width: 768px; height: 512px"></div>
-    <canvas id="myChart" style="width:100%;max-width:600px"></canvas>
-
-<script>let aladin;</script>
-<script type="module">
-    function getPixelsOnLine(startX, startY, endX, endY){
-        const pixelCols = [];
-
-        var x = Math.floor(startX);
-        var y = Math.floor(startY);
-        const xx = Math.floor(endX);
-        const yy = Math.floor(endY);
-        const dx = Math.abs(xx - x); 
-        const sx = x < xx ? 1 : -1;
-        const dy = -Math.abs(yy - y);
-        const sy = y < yy ? 1 : -1;
-        var err = dx + dy;
-        var e2;
-        var end = false;
-        while (!end) {
-            pixelCols.push([x,y]);
-            if ((x === xx && y === yy)) {
-                end = true;
-            } else {
-                e2 = 2 * err;
-                if (e2 >= dy) {
-                    err += dy;
-                    x += sx;
-                }
-                if (e2 <= dx) {
-                    err += dx;
-                    y += sy;
-                }
-            }
-        }
-        return pixelCols;
-    }
-
-    import A from '../src/js/A.js';
-    A.init.then(() => {
-        aladin = A.aladin(
-            '#aladin-lite-div',
-            {
-                showSimbadPointerControl: true,
-                survey: 'P/allWISE/color', // set initial image survey
-                projection: 'AIT', // set a projection
-                fov: 360, // initial field of view in degrees
-                target: 'orion', // initial target
-                cooFrame: 'icrs', // set galactic frame
-                reticleColor: '#ff89ff', // change reticle color
-                reticleSize: 64, // change reticle size
-                showContextMenu: true,
-                showShareControl: true,
-                showFrame: true,
-                showZoomControl:true,
-                showSettingsControl:true,
-                showColorPickerControl: true,
-                showCooGrid: true,
-                fullScreen: true,
-                samp: true,
-                realFullscreen: true,
-            }
-        );
-        
-        let base = aladin.getBaseImageLayer();
-
-        aladin.select('line', p => {
-                let xValues = [];
-                let rValues = [];
-                let gValues = [];
-                let bValues = [];
-
-                let i = 0;
-                for(var [r, g, b] of base.probePixels({type: 'line', x1: p.a.x, y1: p.a.y, x2: p.b.x, y2: p.b.y})) {
-                    xValues.push(i)
-                    rValues.push(r)
-                    gValues.push(g)
-                    bValues.push(b)
-                    i++;
-                }
-
-                new Chart("myChart", {
-                    type: "line",
-                    data: {
-                      labels: xValues,
-                      datasets: [{
-                        fill: false,
-                        lineTension: 0,
-                        backgroundColor: "rgba(255,0,0,1.0)",
-                        data: rValues
-                      },
-                      {
-                        fill: false,
-                        lineTension: 0,
-                        backgroundColor: "rgba(0,255,0,1.0)",
-                        data: gValues
-                      },
-                      {
-                        fill: false,
-                        lineTension: 0,
-                        backgroundColor: "rgba(0,0,255,1.0)",
-                        data: bValues
-                      }]
-                    },
-                    options: {
-                      legend: {display: false},
-                      scales: {
-                        yAxes: [{ticks: {min: 0, max:255}}],
-                      }
-                    }
-                  });
-            
-        })
-    });
-</script>
-</body>
-</html>

examples/al-save-colormap.html

@@ -15,17 +15,16 @@
         let survey1 = aladin.getBaseImageLayer();
         survey1.setColormap('magma', {stretch: 'linear'});
 
-        let survey2 = aladin.newImageSurvey("CSIRO/P/RACS/low/I", {name: 'racs low'});
-        survey2.setColormap('rdbu', {stretch: 'linear'});
-
+        let survey2 = aladin.newImageSurvey("CSIRO/P/RACS/low/I");
         aladin.setImageLayer(survey2)
-
+        survey2.setColormap('rdbu', {stretch: 'linear'});
 
         let survey3 = aladin.newImageSurvey("CSIRO/P/RACS/mid/I");
         aladin.setImageLayer(survey3)
         survey3.setColormap('cubehelix', {stretch: 'asinh'});
 
         aladin.setImageLayer(survey2);
+
         setTimeout(() => {
             aladin.removeHiPSFromFavorites(survey3)
         }, 5000);

examples/al-set-colormap.html

@@ -5,6 +5,7 @@
 <body>
 <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
 
+<div id='aladin-statsDiv'></div>
 <script>let aladin, hips</script>
 <script type="module">
     import A from '../src/js/A.js';

examples/al-simbad-filter.html

@@ -33,16 +33,10 @@ var myFilterFunction = function(source) {
     return color>colorThreshold;
 }
 
-    aladin = A.aladin('#aladin-lite-div', {target: 'M 81', fov: 0.5, survey: 'CDS/P/SDSS9/color'});
-    var cat = A.catalogFromSimbad('M 81', 0.25, {
-        shape: (s) => {
-            return A.circle(s.ra, s.dec, 0.003, {lineWidth: 3});
-        },
-        onClick: 'showTable', verbosity: 3, filter: myFilterFunction
+aladin = A.aladin('#aladin-lite-div', {target: 'M 81', fov: 0.5, survey: 'CDS/P/SDSS9/color'});
+var cat = A.catalogFromSimbad('M 81', 0.25, {onClick: 'showTable', verbosity: 3, filter: myFilterFunction});
+aladin.addCatalog(cat);
     });
-
-    aladin.addCatalog(cat);
-});
 </script>
 
 </body>

examples/al-zoomchanged.html

@@ -17,9 +17,6 @@
         aladin.on("zoomChanged", () => {
             console.log("zoomChanged")
         })
-        aladin.on("rotationChanged", (rotation) => {
-            console.log("Rotation just changed to ", rotation);
-        })
         aladin.on("positionChanged", ({ra, dec}) => {
             console.log('call to aladin', aladin.pix2world(300, 300))
             console.log('positionChanged in icrs', ra, dec)
@@ -28,7 +25,6 @@
         aladin.gotoRaDec(0, 20);
 
         aladin.on('rightClickMove', (x, y) => {
-            aladin.setRotation(aladin.getRotation() + 2)
             console.log("right click move", x, y)
         })
     });