Skip to content

Refines Aladin component parameters for better clarity and adds defau… #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2025
Merged

Refines Aladin component parameters for better clarity and adds defau… #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions backend/config/settings/production.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,10 @@
"url": "https://www.linea.org.br/static/metadata/satosa-dev-frontend-rubin.xml",
"cert": None,
},
{
"url": "https://www.linea.org.br/static/metadata/satosa-prod-frontend-rubin.xml",
"cert": None,
},
],
},
# Configurado como 1 para fornecer informações de debug
Expand Down
9 changes: 4 additions & 5 deletions compose/production/env_template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ POSTGRES_PASSWORD=<POSTGRES_PASSWORD>

# General
# ------------------------------------------------------------------------------
DJANGO_DEBUG=False
DJANGO_LOG_LEVEL=INFO
DJANGO_SETTINGS_MODULE=config.settings.production
DJANGO_SECRET_KEY=hIIbCQezMLys5Ya2Flyx2NDdrs4ZG6DA2pLDu8kKPgtjP7xx6D1m8yccSD6zX6Br
DJANGO_ALLOWED_HOSTS=.skyviewer.linea.org.br
Expand Down Expand Up @@ -45,8 +47,5 @@ BASE_HOST=https://skyviewer.linea.org.br
#SAML2
# ------------------------------------------------------------------------------
# SATOSA PRODUCTION
#LINEA_LOGIN_URL=$BASE_HOST/saml2/login/?idp=https://satosa.linea.org.br/linea/proxy/aHR0cHM6Ly9jaWxvZ29uLm9yZw==
# SATOSA DEVELOPMENT
LINEA_LOGIN_URL=$BASE_HOST/saml2/login/?idp=https://satosa-dev.linea.org.br/linea_saml_mirror/proxy/aHR0cHM6Ly9jaWxvZ29uLm9yZw==

RUBIN_LOGIN_URL=$BASE_HOST/saml2/login/?idp=https://satosa-dev.linea.org.br/linea_saml_mirror/proxy/aHR0cHM6Ly9kYXRhLmxzc3QuY2xvdWQ=&next=/
LINEA_LOGIN_URL=$BASE_HOST/saml2/login/?idp=https://satosa.linea.org.br/linea/proxy/aHR0cHM6Ly9jaWxvZ29uLm9yZw==
RUBIN_LOGIN_URL=$BASE_HOST/saml2/login/?idp=https://satosa.linea.org.br/linea/proxy/aHR0cHM6Ly9kYXRhLmxzc3QuY2xvdWQv&next=/
2 changes: 1 addition & 1 deletion frontend/components/Aladin/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function Aladin({ userGroups = [] }) {
aladinParams={{
fov: 1.5,
// target: "04 08 35.53 -37 06 27.6", // Coordenadas DES.
target: "12 26 53.27 +08 56 49.0",
// target: "12 26 53.27 +08 56 49.0",
projection: "AIT",
showGotoControl: true,
showFullscreenControl: true,
Expand Down
36 changes: 21 additions & 15 deletions frontend/components/Aladin/useAladin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,11 @@ export function useAladin(aladinParams = {}, userGroups = []) {
name: "DES DR2 IRG at LIneA",
url: "https://datasets.linea.org.br/data/releases/des/dr2/images/hips/",
cooFrame: "equatorial",
// HipsOptions: https://cds-astro.github.io/aladin-lite/global.html#HiPSOptions
options: {
requestCredentials: 'include',
requestMode: 'cors',
}
},
// Rubin First Look (pública)
{
id: "RUBIN_FIRST_LOOK_UGRI",
name: "RUBIN FIRST LOOK",
url: "https://images.rubinobservatory.org/hips/asteroids/color_ugri/",
cooFrame: "equatorial",
options: {}
},
},
// Adiciona imagem do LSST DP0.2 (privada, requer grupo 'dp02')
{
Expand All @@ -44,6 +37,14 @@ export function useAladin(aladinParams = {}, userGroups = []) {
requestMode: 'cors',
},
requireGroup: 'dp02', // Grupo necessário para acesso
},
// Rubin First Look (pública)
{
id: "RUBIN_FIRST_LOOK_UGRI",
name: "RUBIN FIRST LOOK",
url: "https://images.rubinobservatory.org/hips/asteroids/color_ugri/",
cooFrame: "equatorial",
options: {},
}]

// catálogos HiPScat
Expand Down Expand Up @@ -86,6 +87,12 @@ export function useAladin(aladinParams = {}, userGroups = []) {
}
]

const defaultTargets = {
"DES_DR2_IRG_LIneA": "02 32 44.09 -35 57 39.5",
"RUBIN_FIRST_LOOK_UGRI": "12 26 53.27 +08 56 49.0",
"LSST_DP02_IRG_LIneA": "04 08 29.07 -37 02 47.9"
}

useEffect(() => {
let isCancelled = false;

Expand All @@ -109,6 +116,11 @@ export function useAladin(aladinParams = {}, userGroups = []) {
const currentSurvey = aladinRef.current.getBaseImageLayer();
if (currentSurvey) {
setCurrentSurveyId(currentSurvey.id);
const target = defaultTargets[currentSurvey.id];
if (target) {
// Goto the target of the current survey
aladinRef.current.gotoObject(target);
}
}
});

Expand Down Expand Up @@ -149,12 +161,6 @@ export function useAladin(aladinParams = {}, userGroups = []) {
})
});

console.log(aladinRef)





return () => {
isCancelled = true;
if (containerRef.current) {
Expand Down
Loading