From 2a617849d276b3fcafff0cc048e3a9bea2ed860d Mon Sep 17 00:00:00 2001 From: Matthieu BAUMANN Date: Fri, 5 May 2023 13:06:42 +0200 Subject: [PATCH] fix case where base layer is an ImageFITS. It was entering planet case because isPlanetaryBody is undefined which is !== false --- src/js/GenericPointer.js | 2 +- src/js/ImageFITS.js | 5 +++++ src/js/ImageSurvey.js | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/js/GenericPointer.js b/src/js/GenericPointer.js index aff20559..a13c3ee6 100644 --- a/src/js/GenericPointer.js +++ b/src/js/GenericPointer.js @@ -14,7 +14,7 @@ export let GenericPointer = (function (view, e) { let radec = view.wasm.screenToWorld(xymouse.x, xymouse.y); if (radec) { // sky case - if (view.aladin.getBaseImageLayer().properties.isPlanetaryBody === false) { + if (view.aladin.getBaseImageLayer().isPlanetaryBody() === false) { const queryRadius = Math.min(1, 15 * view.fov / view.largestDim); console.log('queryRadius "generic pointer": ', queryRadius); SimbadPointer.query(radec[0], radec[1], queryRadius, view.aladin); diff --git a/src/js/ImageFITS.js b/src/js/ImageFITS.js index 716950b0..8e2a78e2 100644 --- a/src/js/ImageFITS.js +++ b/src/js/ImageFITS.js @@ -242,6 +242,11 @@ export let ImageFITS = (function () { } }; + // FITS images does not mean to be used for storing planetary data + ImageFITS.prototype.isPlanetaryBody = function() { + return false; + } + // @api ImageFITS.prototype.focusOn = function () { // ensure the fits have been parsed diff --git a/src/js/ImageSurvey.js b/src/js/ImageSurvey.js index 16ae989b..e6f65c70 100644 --- a/src/js/ImageSurvey.js +++ b/src/js/ImageSurvey.js @@ -370,6 +370,10 @@ export let ImageSurvey = (function () { } } + ImageSurvey.prototype.isPlanetaryBody = function() { + return this.properties.isPlanetaryBody; + } + // @api // TODO: include imgFormat inside the ImageSurvey's meta attribute ImageSurvey.prototype.setImageFormat = function (format) {