From d7f145e347fbe9e1c7aeb09e511e9d797898a2e3 Mon Sep 17 00:00:00 2001
From: bmatthieu3 <matthieu.baumann@astro.unistra.fr>
Date: Tue, 8 Apr 2025 18:03:55 +0200
Subject: [PATCH] Fix #278

When creating a new default survey the DSS2 survey is chosen. We use
the one cached instead of creating a plain new one.
---
 examples/al-footprints.html          |  2 +-
 examples/al-image-with-AVM-tags.html |  2 +-
 src/js/Aladin.js                     | 18 ++++++++----------
 src/js/gui/Box/StackBox.js           | 11 ++---------
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/examples/al-footprints.html b/examples/al-footprints.html
index 18c95090..7960a8c0 100644
--- a/examples/al-footprints.html
+++ b/examples/al-footprints.html
@@ -11,7 +11,7 @@
     let aladin;
     A.init.then(() => {
         // Start up Aladin Lite
-        aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'M 1', fov: 0.2, showContextMenu: true, fullScreen: true});
+        aladin = A.aladin('#aladin-lite-div', {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([
diff --git a/examples/al-image-with-AVM-tags.html b/examples/al-image-with-AVM-tags.html
index 287781ed..065c154f 100644
--- a/examples/al-image-with-AVM-tags.html
+++ b/examples/al-image-with-AVM-tags.html
@@ -7,7 +7,7 @@
     <script type="module">
         import A from '../src/js/A.js';
         A.init.then(() => {
-            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});
+            let aladin = A.aladin('#aladin-lite-div', {fov: 30, target: "280 +0", projection: "AIT", showShareControl:true, showSettingsControl: true, showContextMenu:true});
             
             aladin.setOverlayImageLayer(A.image(
                 "https://www.virtualastronomy.org/images/sig05-013.jpg",
diff --git a/src/js/Aladin.js b/src/js/Aladin.js
index 62467fb3..b0445657 100644
--- a/src/js/Aladin.js
+++ b/src/js/Aladin.js
@@ -426,6 +426,8 @@ export let Aladin = (function () {
             // Merge what is already in the cache for that HiPS with new properties
             // coming from the MOCServer
             this.hipsFavorites.push(hipsObj);
+            // Favorites are also directly pushed to the cache
+            this.hipsCache.append(hipsObj.id, hipsObj)
         }
 
         this._setupUI(options);
@@ -445,11 +447,7 @@ export let Aladin = (function () {
                 });
             } else if (options.survey === HiPS.DEFAULT_SURVEY_ID) {
                 // DSS is cached inside HiPS class, no need to provide any further information
-                const survey = this.createImageSurvey(
-                    HiPS.DEFAULT_SURVEY_ID
-                );
-
-                this.setBaseImageLayer(survey);
+                this.setBaseImageLayer(HiPS.DEFAULT_SURVEY_ID);
             } else {
                 this.setBaseImageLayer(options.survey);
             }
@@ -1566,10 +1564,8 @@ export let Aladin = (function () {
         let hipsOptions = { id, name, maxOrder, url, cooFrame, ...options };
         let hips = new HiPS(id, url || id, hipsOptions)
 
-        // This allows to retrieve the survey's options when it will be
-        // added later to the view.
-        if (this instanceof Aladin && !this.hipsCache.contains(hips.id)) {
-            // Add it to the cache as soon as possible if we have a reference to the aladin object
+        // A HiPS can be refered by its unique ID thus we add it to the cache (cf excample/al-cfht.html that refers to HiPS object just by their unique ID)
+        if (this instanceof Aladin) {
             this.hipsCache.append(hips.id, hipsOptions)
         }
 
@@ -1926,12 +1922,14 @@ export let Aladin = (function () {
         let imageLayer;
 
         let hipsCache = this.hipsCache;
+
         // 1. User gives an ID
         if (typeof urlOrHiPSOrFITS === "string") {
             const idOrUrl = urlOrHiPSOrFITS;
             // many cases here
             // 1/ It has been already added to the cache
             let cachedOptions = hipsCache.get(idOrUrl)
+
             if (cachedOptions) {
                 imageLayer = A.HiPS(idOrUrl, cachedOptions);
             } else {
@@ -1951,7 +1949,7 @@ export let Aladin = (function () {
                 if (!cachedLayerOptions) {
                     hipsCache.append(imageLayer.id, imageLayer.options)
                 } else {
-                    // set the options from what is in the cache
+                    // Set the options from what is in the cache
                     imageLayer.setOptions(cachedLayerOptions);
                 }
             }
diff --git a/src/js/gui/Box/StackBox.js b/src/js/gui/Box/StackBox.js
index 0fa8ea5d..2b5c3bc4 100644
--- a/src/js/gui/Box/StackBox.js
+++ b/src/js/gui/Box/StackBox.js
@@ -528,15 +528,7 @@ export class OverlayStackBox extends Box {
                                 position: self.position,
                             });*/
                             self.aladin.addNewImageLayer(
-                                A.imageHiPS('P/DSS2/color', {
-                                    errorCallback: (e) => {
-                                        aladin.addStatusBarMessage({
-                                            duration: 2000,
-                                            type: 'info',
-                                            message: 'DSS2 colored HiPS could not plot',
-                                        })
-                                    }
-                                })
+                                'P/DSS2/color'
                             );
                         },
                     },
@@ -940,6 +932,7 @@ export class OverlayStackBox extends Box {
                 options.push(value)
             }
 
+
             let HiPSSelector = Input.select({
                 value,
                 options,