simbad cone search requesting https://simbad.cds.unistra.fr/cone

.gitignore

@@ -0,0 +1,19 @@
+node_modules
+
+dist
+examples/.DS_Store
+examples/fits
+.DS_Store
+package-lock.json
+src/core/target/
+src/core/Cargo.lock
+
+aladin-lite*.tgz
+
+.vscode
+
+deploy.sh
+deploy-beta.sh
+
+# JsDoc generated files
+out/

README.md

@@ -14,11 +14,6 @@ More details on [Aladin Lite documentation page](http://aladin.u-strasbg.fr/Alad
 
 Aladin Lite v3 is out! Please play with [Aladin Lite v3 at this link](https://aladin.u-strasbg.fr/AladinLite).
 
-## Releases
-
-For integrating Aladin Lite into your personal website, please refer to this [release page](https://aladin.cds.unistra.fr/AladinLite/doc/release/#download).
-Always prefer using the latest version. If you want the new features without minding about the bugs coming with it, then the beta is the good way to go.
-
 ## Embed it into your projects
 
 You can embed Aladin Lite it into your webpages in two ways
@@ -165,4 +160,4 @@ To generate the Rust backend API documentation
 ```bash
 cd src/core
 cargo doc --no-deps --open
-```
+```

examples/index.html

@@ -10,7 +10,7 @@
 <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: 180, showContextMenu: true});
+        aladin = A.aladin('#aladin-lite-div', {fullScreen: true, cooFrame: "ICRSd", survey: 'https://alasky.cds.unistra.fr/DSS/DSSColor/', fov: 180, showContextMenu: true});
         // manage URL parameters
         const searchParams = new URL(document.location).searchParams;
         if (searchParams.has('baseImageLayer')) {

package.json

@@ -2,7 +2,7 @@
   "homepage": "https://aladin.u-strasbg.fr/",
   "name": "aladin-lite",
   "type": "module",
-  "version": "3.3.0",
+  "version": "3.2.1",
   "description": "An astronomical HiPS visualizer in the browser",
   "author": "Thomas Boch and Matthieu Baumann",
   "license": "GPL-3",
@@ -34,7 +34,8 @@
   "scripts": {
     "wasm": "wasm-pack build ./src/core --target web --release --out-name core -- --features webgl2 -Z build-std=panic_abort,std -Z build-std-features=panic_immediate_abort ",
     "predeploy": "npm run build && rm -rf aladin-lite.tgz && npm pack",
-    "deploy": "python3 version.py",
+    "deploy": "./deploy.sh",
+    "deploy:beta": "npm run predeploy && ./deploy-beta.sh",
     "build": "npm run wasm && vite build && cp examples/index.html dist/index.html",
     "dev": "npm run build && vite",
     "serve": "npm run dev",

src/core/Cargo.toml

@@ -3,89 +3,129 @@ name = "aladin-lite"
 description = "Aladin Lite v3 introduces a new graphical engine written in Rust with the use of WebGL"
 license = "BSD-3-Clause"
 repository = "https://github.com/cds-astro/aladin-lite"
-version = "3.3.0"
-authors = [ "baumannmatthieu0@gmail.com", "matthieu.baumann@astro.unistra.fr",]
+version = "3.2.0"
+authors = ["baumannmatthieu0@gmail.com", "matthieu.baumann@astro.unistra.fr"]
 edition = "2018"
 
 [workspace]
-members = [ "al-core", "al-api",]
+members = [
+    "al-core",
+    "al-api",
+    #"al-task-exec",
+]
 
 [lib]
-crate-type = [ "cdylib",]
+crate-type = ["cdylib"]
 
 [dependencies]
 futures = "0.3.12"
 js-sys = "0.3.47"
 wasm-bindgen-futures = "0.4.20"
 cgmath = "*"
+healpix = { package = "cdshealpix", git = "https://github.com/bmatthieu3/cds-healpix-rust", branch = "polygonIntersectVertices" }
+#moclib = { package = "moc", git = "https://github.com/cds-astro/cds-moc-rust", branch = "main" }
+moclib = { package = "moc", git = "https://github.com/bmatthieu3/cds-moc-rust", branch = "cellsWithUnidirectionalNeigs" }
+serde = { version = "^1.0.183", features = ["derive"] }
 url-lite = "0.1.0"
 serde_json = "1.0.104"
 serde-wasm-bindgen = "0.5"
+#console_error_panic_hook = "0.1.7"
 enum_dispatch = "0.3.8"
 wasm-bindgen = "0.2.79"
 wasm-streams = "0.3.0"
 async-channel = "1.8.0"
+al-core = { path = "./al-core" }
+#al-task-exec = { path = "./al-task-exec" }
+al-api = { path = "./al-api" }
 mapproj = "0.3.0"
 fitsrs = "0.2.9"
 wcs = "0.2.8"
 colorgrad = "0.6.2"
+#image-decoder = { package = "image", version = "0.24.2", default-features = false, features = ["jpeg", "png"] }
+#votable = { package = "votable", git = "https://github.com/cds-astro/cds-votable-rust", branch = "main"}
 lyon = "1.0.1"
 
 [features]
-webgl1 = [ "al-core/webgl1", "al-api/webgl1", "web-sys/WebGlRenderingContext", "web-sys/AngleInstancedArrays", "web-sys/ExtSRgb", "web-sys/OesTextureFloat",]
-webgl2 = [ "al-core/webgl2", "al-api/webgl2", "web-sys/WebGl2RenderingContext", "web-sys/WebGlVertexArrayObject", "web-sys/ExtColorBufferFloat",]
-
-[dev-dependencies]
-rand = "0.8"
-
-[dependencies.healpix]
-package = "cdshealpix"
-git = "https://github.com/bmatthieu3/cds-healpix-rust"
-branch = "polygonIntersectVertices"
-
-[dependencies.moclib]
-package = "moc"
-git = "https://github.com/bmatthieu3/cds-moc-rust"
-branch = "cellsWithUnidirectionalNeigs"
-
-[dependencies.serde]
-version = "^1.0.183"
-features = [ "derive",]
-
-[dependencies.al-core]
-path = "./al-core"
-
-[dependencies.al-api]
-path = "./al-api"
+webgl1 = [
+  "al-core/webgl1",
+  #"al-ui/webgl1",
+  "al-api/webgl1",
+  "web-sys/WebGlRenderingContext",
+  "web-sys/AngleInstancedArrays",   # Enabling instancing features
+  "web-sys/ExtSRgb",                # Enabling SRGB8_ALPHA8 internal format
+  "web-sys/OesTextureFloat"
+]
+webgl2 = [
+  "al-core/webgl2",
+  #"al-ui/webgl2",
+  "al-api/webgl2",
+  "web-sys/WebGl2RenderingContext",
+  "web-sys/WebGlVertexArrayObject",
+  "web-sys/ExtColorBufferFloat",
+]
 
 [dependencies.web-sys]
 version = "*"
-features = [ "console", "CssStyleDeclaration", "Document", "Element", "HtmlCollection", "HtmlElement", "HtmlImageElement", "HtmlCanvasElement", "Blob", "ImageBitmap", "ImageData", "CanvasRenderingContext2d", "WebGlBuffer", "WebGlContextAttributes", "WebGlFramebuffer", "WebGlProgram", "WebGlShader", "WebGlUniformLocation", "WebGlTexture", "WebGlActiveInfo", "Headers", "Window", "Request", "RequestInit", "RequestMode", "Response", "XmlHttpRequest", "XmlHttpRequestResponseType", "PerformanceTiming", "Performance", "Url", "ReadableStream",]
+features = [
+  'console',
+  'CssStyleDeclaration',
+  'Document',
+  'Element',
+  'HtmlCollection',
+  'HtmlElement',
+  'HtmlImageElement',
+  'HtmlCanvasElement',
+  'Blob',
+  'ImageBitmap',
+  'ImageData',
 
-[dev-dependencies.image-decoder]
-package = "image"
-version = "0.24.2"
-default-features = false
-features = [ "jpeg", "png",]
+  'CanvasRenderingContext2d',
+
+  'WebGlBuffer',
+  'WebGlContextAttributes',
+  'WebGlFramebuffer',
+  'WebGlProgram',
+  'WebGlShader',
+  'WebGlUniformLocation',
+  'WebGlTexture',
+  'WebGlActiveInfo',
+  'Headers',
+
+  'Window',
+  'Request',
+  'RequestInit',
+  'RequestMode',
+  'Response',
+  'XmlHttpRequest',
+  'XmlHttpRequestResponseType',
+  'PerformanceTiming',
+  'Performance',
+  'Url',
+  'ReadableStream',
+]
+
+[dev-dependencies]
+image-decoder = { package = "image", version = "0.24.2", default-features = false, features = ["jpeg", "png"] }
+rand = "0.8"
 
 [profile.dev]
-opt-level = "z"
+opt-level = 'z'
 debug = true
 debug-assertions = true
 overflow-checks = true
 lto = true
-panic = "unwind"
+panic = 'unwind'
 incremental = true
 codegen-units = 256
 rpath = false
 
 [profile.release]
-opt-level = "z"
+opt-level = 'z'
 debug = false
 debug-assertions = false
 overflow-checks = false
 lto = true
-panic = "abort"
+panic = 'abort'
 incremental = false
 codegen-units = 16
 rpath = false

src/js/Aladin.js

@@ -27,7 +27,7 @@
  * Author: Thomas Boch[CDS], Matthieu Baumann[CDS]
  *
  *****************************************************************************/
-import { version } from './../../package.json';
+
 import { View } from "./View.js";
 import { Utils } from "./Utils";
 import { Overlay } from "./Overlay.js";
@@ -87,8 +87,6 @@ import { ProjectionActionButton } from "./gui/Button/Projection.js";
  * @property {boolean} [showSettingsControl=true] - Whether to show the settings control toolbar.
  *
  * @property {boolean} [showShareControl=false] - Whether to show the share control toolbar.
- * @property {boolean} [showStatusBar=true] - Whether to show the status bar. Enabled by default.
-
  *
  * @property {boolean} [showFrame=true] - Whether to show the viewport frame.
  * @property {boolean} [showFov=true] - Whether to show the field of view indicator.
@@ -535,7 +533,7 @@ export let Aladin = (function () {
     }
 
     /**** CONSTANTS ****/
-    Aladin.VERSION = version;
+    Aladin.VERSION = "3.0-beta0";
 
     Aladin.JSONP_PROXY = "https://alaskybis.cds.unistra.fr/cgi/JSONProxy";
     //Aladin.JSONP_PROXY = "https://alaskybis.unistra.fr/cgi/JSONProxy";

src/js/PlanetaryFeaturesPointer.js

@@ -127,7 +127,7 @@ export let PlanetaryFeaturesPointer = (function() {
                     try {
                         const diameter = parseFloat(values[fields.indexOf('diameter')]);
                         if (body in PlanetaryFeaturesPointer.PLANETS_RADIUS) {
-                            const parallelLength = 2 * Math.PI * PlanetaryFeaturesPointer.PLANETS_RADIUS[body] * Math.cos(lat * Math.PI /  180.0);
+                            const parallelLength = 2 * Math.PI * PlanetaryFeaturesPointer.PLANETS_RADIUS[body] * Math.cos(lat * Math.PI /  8180.0);
                             const radiusRadians = 2 * Math.PI * (1000 * diameter / 2) / parallelLength;
                             radiusDeg = 180 * radiusRadians / Math.PI;
                         }
@@ -144,7 +144,6 @@ export let PlanetaryFeaturesPointer = (function() {
                 }
             })
             .catch((e) => {
-                //aladinInstance.view.setCursor('pointer');
                 aladinInstance.hidePopup();
             })
     };

src/js/URLBuilder.js

@@ -29,6 +29,7 @@
  *****************************************************************************/
 import { Coo } from './libs/astro/coo.js';
 import { Utils } from './Utils';
+import { Sesame } from './Sesame.js';
 
 export let URLBuilder = (function() {