background color set to (0.1, 0.1, 0.1)

jpeg HiPS that does not cover all the sky are plotted as black when data is missing. This allow to recognize the border of the projection

codemeta.json

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

package.json

@@ -2,7 +2,7 @@
   "homepage": "https://aladin.u-strasbg.fr/",
   "name": "aladin-lite",
   "type": "module",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "An astronomical HiPS visualizer in the browser",
   "author": "Thomas Boch and Matthieu Baumann",
   "license": "GPL-3",

src/core/Cargo.toml

@@ -3,7 +3,7 @@ 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.6.2"
+version = "3.6.3"
 authors = [ "baumannmatthieu0@gmail.com", "matthieu.baumann@astro.unistra.fr",]
 edition = "2018"
 

src/core/src/app.rs

@@ -1,6 +1,7 @@
 use crate::renderable::ImageLayer;
 use crate::tile_fetcher::HiPSLocalFiles;
 
+use crate::math::angle::ToAngle;
 use crate::renderable::hips::HiPS;
 use crate::{
     //async_task::{BuildCatalogIndex, ParseTableTask, TaskExecutor, TaskResult, TaskType},
@@ -21,7 +22,6 @@ use crate::{
     time::DeltaTime,
 };
 use al_api::moc::MOCOptions;
-use crate::math::angle::ToAngle;
 use wcs::WCS;
 
 use wasm_bindgen::prelude::*;
@@ -188,7 +188,7 @@ impl App {
         let request_for_new_tiles = true;
 
         let moc = MOCRenderer::new(&gl)?;
-        gl.clear_color(0.0, 0.0, 0.0, 1.0);
+        gl.clear_color(0.1, 0.1, 0.1, 1.0);
 
         let (img_send, img_recv) = async_channel::unbounded::<ImageLayer>();
         let (ack_img_send, ack_img_recv) = async_channel::unbounded::<ImageParams>();
@@ -714,8 +714,8 @@ impl App {
                                             )?,
                                         }
                                         self.time_start_blending = Time::now();
-                                    },
-                                    _ => ()
+                                    }
+                                    _ => (),
                                 };
                             }
                         }
@@ -1277,8 +1277,7 @@ impl App {
         // Set the new meta
         // keep the old meta data
         let new_img_ext = meta.img_format;
-        self.layers
-            .set_layer_cfg(layer.clone(), meta)?;
+        self.layers.set_layer_cfg(layer.clone(), meta)?;
 
         if old_meta.img_format != new_img_ext {
             // The image format has been changed

src/core/src/camera/viewport.rs

@@ -5,8 +5,8 @@ pub enum UserAction {
     Moving = 3,
     Starting = 4,
 }
-use web_sys::WebGl2RenderingContext;
 
+use web_sys::WebGl2RenderingContext;
 // Longitude reversed identity matrix
 const ID_R: &Matrix4<f64> = &Matrix4::new(
     -1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
@@ -488,11 +488,11 @@ impl CameraViewPort {
     pub fn set_center(&mut self, lonlat: &LonLatT<f64>, proj: &ProjectionType) {
         let icrs_pos: Vector4<_> = lonlat.vector();
 
-        let view_pos = CooSystem::ICRS.to(self.get_coo_system()) * icrs_pos;
-        let rot_to_center = Rotation::from_sky_position(&view_pos);
+        let center = (CooSystem::ICRS.to(self.get_coo_system()) * icrs_pos).truncate();
+        let rot_to_center = Rotation::from_sky_position(&center);
 
         let phi = self.get_center_pos_angle();
-        let third_euler_rot = Rotation::from_axis_angle(&view_pos.truncate(), phi);
+        let third_euler_rot = Rotation::from_axis_angle(&center, phi);
 
         let rot = third_euler_rot * rot_to_center;
 
@@ -502,8 +502,9 @@ impl CameraViewPort {
     }
 
     pub fn set_center_pos_angle(&mut self, phi: Angle<f64>, proj: &ProjectionType) {
-        let rot_to_center = Rotation::from_sky_position(&self.center);
-        let third_euler_rot = Rotation::from_axis_angle(&self.center.truncate(), phi);
+        let c = self.center.truncate();
+        let rot_to_center = Rotation::from_sky_position(&c);
+        let third_euler_rot = Rotation::from_axis_angle(&c, phi);
 
         let total_rot = third_euler_rot * rot_to_center;
         self.set_rotation(&total_rot, proj);
@@ -523,7 +524,7 @@ impl CameraViewPort {
         // Compute the center position according to the new coordinate frame system
         let new_center = coosys::apply_coo_system(self.coo_sys, new_coo_sys, &self.center);
         // Create a rotation object from that position
-        let new_rotation = Rotation::from_sky_position(&new_center);
+        let new_rotation = Rotation::from_sky_position(&new_center.truncate());
         // Apply it to the center of the view
         self.set_rotation(&new_rotation, proj);
 

src/core/src/lib.rs

@@ -523,7 +523,7 @@ impl WebClient {
 
     /// Get if the longitude axis is reversed
     #[wasm_bindgen(js_name = getLongitudeReversed)]
-    pub fn get_longitude_reversed(&mut self) -> bool {
+    pub fn get_longitude_reversed(&self) -> bool {
         self.app.get_longitude_reversed()
     }
 

src/core/src/math/rotation.rs

@@ -1,8 +1,8 @@
 use crate::math;
+use crate::math::angle::ToAngle;
 use cgmath::{BaseFloat, InnerSpace};
 use cgmath::{Euler, Quaternion};
 use cgmath::{Vector3, Vector4};
-use crate::math::angle::ToAngle;
 
 #[derive(Clone, Copy, Debug)]
 // Internal structure of a rotation, a quaternion
@@ -109,13 +109,13 @@ where
     // Define a rotation from an axis and a angle
     pub fn from_axis_angle(axis: &Vector3<S>, angle: Angle<S>) -> Rotation<S> {
         let angle: Rad<S> = angle.into();
-        let mat4 = Matrix4::from_axis_angle(*axis, angle);
+        let mat4 = Matrix4::from_axis_angle(axis.normalize(), angle);
         (&mat4).into()
     }
 
     // Define a rotation from a normalized vector
-    pub fn from_sky_position(pos: &Vector4<S>) -> Rotation<S> {
-        let (lon, lat) = math::lonlat::xyzw_to_radec(&pos.normalize());
+    pub fn from_sky_position(pos: &Vector3<S>) -> Rotation<S> {
+        let (lon, lat) = math::lonlat::xyz_to_radec(&pos);
 
         let rot_y = Matrix4::from_angle_y(lon);
         let rot_x = Matrix4::from_angle_x(-lat);

src/js/DefaultActionsForContextMenu.js

@@ -35,6 +35,7 @@ import cameraIconUrl from '../../assets/icons/camera.svg'
 import targetIconUrl from '../../assets/icons/target.svg';
 import uploadIconUrl from '../../assets/icons/upload.svg';
 import selectIconUrl from '../../assets/icons/select.svg';
+import { Utils } from "./Utils";
 
 export let DefaultActionsForContextMenu = (function () {
 
@@ -55,7 +56,7 @@ export let DefaultActionsForContextMenu = (function () {
                         return false;
                     }
 
-                    navigator.clipboard.writeText(text)
+                    Utils.copy2Clipboard(text)
                         .then(() => {
                             msg = 'successful'
                             if (aladinInstance.statusBar) {

src/js/HiPS.js

@@ -30,6 +30,8 @@ import { ColorCfg } from "./ColorCfg.js";
 import { HiPSProperties } from "./HiPSProperties.js";
 import { Aladin } from "./Aladin.js"; 
 import { CooFrameEnum } from "./CooFrameEnum.js";
+import { Utils } from "./Utils"
+
 let PropertyParser = {};
 // Utilitary functions for parsing the properties and giving default values
 /// Mandatory tileSize property
@@ -860,9 +862,8 @@ export let HiPS = (function () {
 
         let isIncompleteOptions = true;
 
-        // This is very dirty but it allows me to differentiate the location from whether it is an ID or a plain url
-        let isID = this.url.includes("P/") || this.url.includes("C/")
-        
+        let isID = Utils.isUrl(this.url) === undefined;
+
         if (this.imgFormat === "fits") {
             // a fits is given
             isIncompleteOptions = !(
@@ -887,7 +888,6 @@ export let HiPS = (function () {
             if (isIncompleteOptions) {
                 // ID typed url
                 if (self.startUrl && isID) {
-
                     // First download the properties from the start url
                     await HiPSProperties.fetchFromUrl(self.startUrl)
                         .then((p) => {
@@ -909,9 +909,16 @@ export let HiPS = (function () {
 
                                 HiPSProperties.fetchFromID(id)
                                     .then((p) => {
-                                        //self.url = self.startUrl;
                                         self._fetchFasterUrlFromProperties(p);
                                     })
+                                    .catch(() => {
+                                        // If no ID has been found then it may actually be a path
+                                        // url pointing to a local HiPS
+                                        return HiPSProperties.fetchFromUrl(id)
+                                            .then((p) => {
+                                                self._parseProperties(p);
+                                            })
+                                    })
                             },
                             1000
                         );
@@ -932,6 +939,14 @@ export let HiPS = (function () {
                                 self._parseProperties(p);
                                 self._fetchFasterUrlFromProperties(p);
                             })
+                            .catch(() => {
+                                // If no ID has been found then it may actually be a path
+                                // url pointing to a local HiPS
+                                return HiPSProperties.fetchFromUrl(id)
+                                    .then((p) => {
+                                        self._parseProperties(p);
+                                    })
+                                })
                     } catch (e) {
                         throw e;
                     }

src/js/HiPSProperties.js

@@ -38,7 +38,7 @@ HiPSProperties.fetchFromID = async function(ID) {
     const params = {
         get: "record",
         fmt: "json",
-        ID: "*" + ID + "*",
+        ID: "*" + decodeURI(ID) + "*",
     };
 
     let metadata = await Utils.loadFromUrls(MocServer.MIRRORS_HTTPS, {

src/js/View.js

@@ -926,9 +926,10 @@ export let View = (function () {
                 xy: xymouse,
             });
 
-            let dist = (() => {
-                return (xymouse.x - xystart.x)*(xymouse.x - xystart.x) + (xymouse.y - xystart.y)*(xymouse.y - xystart.y)
-            })();
+            let dist;
+            if (xystart) {
+                dist = (xymouse.x - xystart.x)*(xymouse.x - xystart.x) + (xymouse.y - xystart.y)*(xymouse.y - xystart.y);
+            }
 
             if (e.type === 'touchmove' && xystart) {
                 if (longTouchTimer && dist > 100) {

src/js/gui/Button/ShareView.js

@@ -22,7 +22,7 @@ import shareIconUrl from '../../../../assets/icons/share.svg';
 import cameraIconUrl from '../../../../assets/icons/camera.svg';
 import linkIconUrl from '../../../../assets/icons/link.svg';
 import jupyterIconUrl from '../../../../assets/icons/jupyter.svg';
-
+import { Utils } from "../../Utils";
 /******************************************************************************
  * Aladin Lite project
  *
@@ -62,15 +62,16 @@ import jupyterIconUrl from '../../../../assets/icons/jupyter.svg';
                 },
                 action(o) {
                     var url = aladin.getShareURL();
-                    navigator.clipboard.writeText(url);
-
-                    if (aladin.statusBar) {
-                        aladin.statusBar.appendMessage({
-                            message: 'View URL saved into your clipboard!',
-                            duration: 2000,
-                            type: 'info'
+                    Utils.copy2Clipboard(url)
+                        .then(() => {
+                            if (aladin.statusBar) {
+                                aladin.statusBar.appendMessage({
+                                    message: 'View URL saved into your clipboard!',
+                                    duration: 2000,
+                                    type: 'info'
+                                })
+                            }
                         })
-                    }
                 }
             },
             {