#1221 - Added the following catalogs: GAIA DR2, SDSS12 and PS1 (#1222)

* #1221 - Added the following catalogs: GAIA DR2, SDSS12 and PS1 * #1221 - Added the following catalogs: PS1, 2MASS 6X, HSC2 * Removing unecessary console.log Co-authored-by: Glauber Costa Vila-Verde <[email protected]>
linea-it · Feb 13, 2020 · c7a3e50 · c7a3e50
1 parent 7def51f
commit c7a3e50
Show file tree

Hide file tree

Showing 3 changed files with 216 additions and 23 deletions.
diff --git a/api/product/viziercds.py b/api/product/viziercds.py
@@ -30,20 +30,62 @@ def get_available_catalogs(self):
                 "iconCls": "no-icon",
                 "leaf": True,
             }),
-            # SDSS release 9
+            # 2MASS 6X
             dict({
-                "id": "vizier_sdss",
+                "id": "vizier_2mass_6x",
                 "external_catalog": True,
-                "prd_name": "SDSS9",
-                "prd_display_name": "SDSS release 9",
+                "prd_name": "2MASS6X",
+                "prd_display_name": "2MASS 6X",
+                "cds_source": "II/281",
+                "cds_fieldnames": ",".join(["2MASS", "RAJ2000", "DEJ2000", "Jmag", "e_Jmag", "Hmag", "e_Hmag", "Kmag", "e_Kmag", "Bmag", "Rmag"]),
+                "ctl_num_objects": 24023702,
+                "description": "2MASS 6X Point Source Working Database / Catalog (Cutri+ 2006)",
+                "owner": "Vizier",
+                "pcl_is_system": False,
+                "is_owner": False,
+                "text": "2MASS 6X",
+                "bookmark": None,
+                "tableExist": True,
+                "editable": False,
+                "markable": False,
+                "iconCls": "no-icon",
+                "leaf": True,
+            }),
+            # SDSS Release 9
+            dict({
+                "id": "vizier_sdss9",
+                "external_catalog": True,
+                "prd_name": "SDSS_9",
+                "prd_display_name": "SDSS Release 9",
                 "cds_source": "V/139",
-                "cds_fieldnames": ",".join(["SDSS9", "RAJ2000", "DEJ2000", "umag", "gmag", "rmag", "imag", "zmag"]),
+                "cds_fieldnames": ",".join(["SDSS9", "RA_ICRS", "DE_ICRS", "umag", "gmag", "rmag", "imag", "zmag"]),
                 "ctl_num_objects": 0,
                 "description": "SDSS Photometric Catalog, Release 9 (Adelman-McCarthy et al. 2012)",
                 "owner": "Vizier",
                 "pcl_is_system": False,
                 "is_owner": False,
-                "text": "SDSS release 9",
+                "text": "SDSS Release 9",
+                "bookmark": None,
+                "tableExist": True,
+                "editable": False,
+                "markable": False,
+                "iconCls": "no-icon",
+                "leaf": True,
+            }),
+            # SDSS Release 12
+            dict({
+                "id": "vizier_sdss12",
+                "external_catalog": True,
+                "prd_name": "SDSS_12",
+                "prd_display_name": "SDSS Release 12",
+                "cds_source": "V/147",
+                "cds_fieldnames": ",".join(["SDSS12", "RA_ICRS", "DE_ICRS", "umag", "e_umag", "gmag", "e_gmag", "rmag", "e_rmag", "imag", "e_imag", "zmag", "e_zmag", "zsp", "e_zsp"]),
+                "ctl_num_objects": 0,
+                "description": "SDSS Photometric Catalogue, Release 12 (Alam+, 2015)",
+                "owner": "Vizier",
+                "pcl_is_system": False,
+                "is_owner": False,
+                "text": "SDSS Release 12",
                 "bookmark": None,
                 "tableExist": True,
                 "editable": False,
@@ -185,7 +227,7 @@ def get_available_catalogs(self):
                 "prd_name": "visier_gaia_dr1",
                 "prd_display_name": "GAIA DR1",
                 "cds_source": "I/337",
-                "cds_fieldnames": ",".join(["Source", "RA_ICRS", "DE_ICRS", "<Gmag>", "pmRA", "pmDE"]),
+                "cds_fieldnames": ",".join(["Source", "RA_ICRS", "DE_ICRS", "Plx", "e_Plx", "pmRA", "e_pmRA", "pmDE", "e_pmDE", "<Gmag>", "BPmag", "e_BPmag", "RPmag", "e_RPmag", "RV", "e_RV"]),
                 "ctl_num_objects": 0,
                 "description": "First Gaia Data Release (2016)",
                 "owner": "Vizier",
@@ -199,6 +241,27 @@ def get_available_catalogs(self):
                 "iconCls": "no-icon",
                 "leaf": True,
             }),
+            # GAIA_DR2
+            dict({
+                "id": "vizier_gaia_dr2",
+                "external_catalog": True,
+                "prd_name": "visier_gaia_dr2",
+                "prd_display_name": "GAIA DR2",
+                "cds_source": "I/345",
+                "cds_fieldnames": ",".join(["Source", "RA_ICRS", "DE_ICRS", "Plx", "e_Plx", "pmRA", "e_pmRA", "pmDE", "e_pmDE", "Gmag", "e_Gmag", "BPmag", "e_BPmag", "RPmag", "e_RPmag", "RV", "e_RV"]),
+                "ctl_num_objects": 0,
+                "description": "Second Gaia Data Release (2018)",
+                "owner": "Vizier",
+                "pcl_is_system": False,
+                "is_owner": False,
+                "text": "GAIA DR2",
+                "bookmark": None,
+                "tableExist": True,
+                "editable": False,
+                "markable": False,
+                "iconCls": "no-icon",
+                "leaf": True,
+            }),
             # URAT1
             dict({
                 "id": "vizier_urat1",
@@ -220,6 +283,48 @@ def get_available_catalogs(self):
                 "iconCls": "no-icon",
                 "leaf": True,
             }),
+            # PS1
+            dict({
+                "id": "vizier_ps1",
+                "external_catalog": True,
+                "prd_name": "visier_ps1",
+                "prd_display_name": "PS1",
+                "cds_source": "II/349",
+                "cds_fieldnames": ",".join(["objID", "RAJ2000", "DEJ2000", "gmag", "e_gmag", "rmag", "e_rmag", "imag", "e_imag", "zmag", "e_zmag", "ymag_e_ymag", "gKmag", "e_gKmag", "rKmag", "e_rKmag", "iKmag", "e_iKmag", "zKmag", "e_zKmag", "yKmag", "e_yKmag"]),
+                "ctl_num_objects": 0,
+                "description": "The Pan-STARRS release 1 (PS1) Survey - DR1 (Chambers+, 2016)",
+                "owner": "Vizier",
+                "pcl_is_system": False,
+                "is_owner": False,
+                "text": "PS1",
+                "bookmark": None,
+                "tableExist": True,
+                "editable": False,
+                "markable": False,
+                "iconCls": "no-icon",
+                "leaf": True,
+            }),
+            # HSC2
+            dict({
+                "id": "vizier_hsc2",
+                "external_catalog": True,
+                "prd_name": "visier_hsc2",
+                "prd_display_name": "HSC2",
+                "cds_source": "II/342",
+                "cds_fieldnames": ",".join(["Source", "RAJ2000", "DEJ2000", "Filter", "magAper2", "magAuto"]),
+                "ctl_num_objects": 0,
+                "description": "Hubble Source Catalog (V1 and V2) (Whitmore+, 2016)",
+                "owner": "Vizier",
+                "pcl_is_system": False,
+                "is_owner": False,
+                "text": "HSC2",
+                "bookmark": None,
+                "tableExist": True,
+                "editable": False,
+                "markable": False,
+                "iconCls": "no-icon",
+                "leaf": True,
+            }),
         ])
 
     def get_objects(self, source, fieldnames, coordinates, bounds):

diff --git a/frontend/packages/local/visiomatic/src/Visiomatic.js b/frontend/packages/local/visiomatic/src/Visiomatic.js
@@ -53,13 +53,18 @@ Ext.define('visiomatic.Visiomatic', {
         availableCatalogs: [
             'GALEX_AIS',
             '2MASS',
+            '2MASS6X',
             'AllWISE',
             'SDSS',
+            'SDSS12',
             'PPMXL',
             'Abell',
             'NVSS',
             'FIRST',
-            'GAIA_DR1'
+            'GAIA_DR1',
+            'GAIA_DR2',
+            'PS1',
+            'HSC2'
         ],
 
         enableMiniMap: false,
@@ -1194,15 +1199,14 @@ Ext.define('visiomatic.Visiomatic', {
         var feature = layer.feature,
             properties = feature.properties,
             mags = ['_meta_mag_auto_g', '_meta_mag_auto_r', '_meta_mag_auto_i',
-                '_meta_mag_auto_z', '_meta_mag_auto_y'],
+                '_meta_mag_auto_z', '_meta_mag_auto_y',],
             tag_mags = [],
             tag_properties = [],
             tag_id = feature.properties._meta_id,
-            excludeProperties = ['RAJ2000', 'DEJ2000'],
+            excludeProperties = ['RAJ2000', 'DEJ2000', 'RA_ICRS', 'DE_ICRS', 'Source'],
             allProps = [],
             popup;
 
-
         Ext.each(mags, function (mag) {
             try {
                 mag_name = mag.slice(-1);
@@ -1264,12 +1268,15 @@ Ext.define('visiomatic.Visiomatic', {
                     }
                 }
 
+
                 if (allProps.length <= 15) {
                     for (key in allProps.sort()) {
                         property = allProps[key];
 
+                        var _property = allProps[key] == '<Gmag>' ? 'Gmag' : allProps[key];
+
                         tag_properties.push(
-                            '<TR><TD><spam>' + property + '</spam>: </TD>' +
+                            '<TR><TD><spam>' + _property + '</spam>: </TD>' +
                             '<TD>' + feature.properties[property] + '</td></tr>');
                     }
                 }
@@ -1523,7 +1530,7 @@ Ext.define('visiomatic.Visiomatic', {
             me._winContrast = null;
         }
 
-        // TODO: verificar se o valor de currentContrast esta disponivel na lista de Contrasts disponiveis. 
+        // TODO: verificar se o valor de currentContrast esta disponivel na lista de Contrasts disponiveis.
         if (currentContrast !== null) {
 
             win = Ext.create('visiomatic.contrast.ContrastWindow', {

diff --git a/frontend/packages/local/visiomatic/src/visiomatic/src/Catalog.js b/frontend/packages/local/visiomatic/src/visiomatic/src/Catalog.js
@@ -119,20 +119,53 @@ L.Catalog['2MASS'] = L.extend({}, L.Catalog, {
 	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=II/246&-c={ra},{dec},eq=J2000&-c.rs=0.01'
 });
 
-L.Catalog.SDSS = L.extend({}, L.Catalog, {
+L.Catalog['2MASS6X'] = L.extend({}, L.Catalog, {
 	service: 'Vizier@CDS',
-	name: 'SDSS release 12',
+	name: '2MASS 6X',
 	className: 'logo-catalog-vizier',
-	attribution: 'SDSS Photometric Catalog, Release 9 (Alam et al. 2015)',
+	attribution: '2MASS 6X Point Source Working Database / Catalog (Cutri+ 2006)',
+	color: 'red',
+	maglim: 24.0,
+	regionType: 'box',
+	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=II/281/2mass6x&' +
+	 '-out=2MASS,RAJ2000,DEJ2000,Jmag,e_Jmag,Hmag,e_Hmag,Kmag,e_Kmag,Bmag,Rmag&-out.meta=&' +
+	 '-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&' +
+	 '-out.max={nmax}&-sort=Jmag',
+	properties: ['', '', '', '', '', '', '', ''],
+	units: ['', '', '', '', '', '', '', ''],
+	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=II/281/2mass6x&-c={ra},{dec},eq=J2000&-c.rs=0.01'
+});
+
+L.Catalog.SDSS9 = L.extend({}, L.Catalog, {
+	service: 'Vizier@CDS',
+	name: 'SDSS Release 9',
+	className: 'logo-catalog-vizier',
+	attribution: 'SDSS Photometric Catalog, Release 9 (Adelman-McCarthy+, 2012)',
 	color: 'yellow',
 	maglim: 25.0,
 	regionType: 'box',
-	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=V/147&' +
-	 '-out=SDSS12,RA_ICRS,DE_ICRS,umag,gmag,rmag,imag,zmag&-out.meta=&' +
+	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=V/139&' +
+	 '-out=SDSS9,RA_ICRS,DE_ICRS,umag,gmag,rmag,imag,zmag&-out.meta=&' +
 	 '-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=rmag',
 	properties: ['u', 'g', 'r', 'i', 'z'],
 	units: ['', '', '', '', ''],
-	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=V/147/sdss12&-c={ra},{dec},eq=J2000&-c.rs=0.01'
+	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=V/139&-c={ra},{dec},eq=J2000&-c.rs=0.01'
+});
+
+L.Catalog.SDSS12 = L.extend({}, L.Catalog, {
+	service: 'Vizier@CDS',
+	name: 'SDSS Release 12',
+	className: 'logo-catalog-vizier',
+	attribution: 'SDSS Photometric Catalogue, Release 12 (Alam+, 2015)',
+	color: 'pink',
+	maglim: 25.0,
+	regionType: 'box',
+	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=V/147&' +
+	 '-out=SDSS12,RA_ICRS,DE_ICRS,umag,e_umag,gmag,e_gmag,rmag,e_rmag,imag,e_imag,zmag,e_zmag,zsp,e_zsp&-out.meta=&' +
+	 '-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=gmag',
+	properties: ['u', 'g', 'r', 'i', 'z'],
+	units: ['', '', '', '', ''],
+	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=V/147&-c={ra},{dec},eq=J2000&-c.rs=0.01'
 });
 
 L.Catalog.PPMXL = L.extend({}, L.Catalog, {
@@ -257,13 +290,29 @@ L.Catalog.GAIA_DR1 = L.extend({}, L.Catalog, {
 	maglim: 20.0,
 	regionType: 'box',
 	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=I/337&' +
-	 '-out=Source,RA_ICRS,DE_ICRS,<Gmag>,pmRA,pmDE&-out.meta=&' +
-	 '-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=<Gmag>',
+	 '-out=Source,RA_ICRS,DE_ICRS,Plx,e_Plx,pmRA,e_pmRA,pmDE,e_pmDE,<Gmag>,BPmag,e_BPmag,RPmag,e_RPmag,RV,e_RV&-out.meta=&' +
+	 '-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=Gmag',
 	properties: ['G', '&#956;<sub>&#593;</sub> cos &#948;', '&#956;<sub>&#948;</sub>'],
 	units: ['', 'mas/yr', 'mas/yr'],
 	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=I/337&-c={ra},{dec},eq=J2000&-c.rs=0.01'
 });
 
+L.Catalog.GAIA_DR2 = L.extend({}, L.Catalog, {
+	service: 'Vizier@CDS',
+	name: 'Gaia DR2',
+	className: 'logo-catalog-vizier',
+	attribution: 'Second Gaia Data Release (2018)',
+	color: 'purple',
+	maglim: 20.0,
+	regionType: 'box',
+	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=I/345&' +
+		'-out=Source,RA_ICRS,DE_ICRS,Plx,e_Plx,pmRA,e_pmRA,pmDE,e_pmDE,Gmag,e_Gmag,BPmag,e_BPmag,RPmag,e_RPmag,RV,e_RV&-out.meta=&' +
+		'-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=Gmag',
+	properties: ['G', '&#956;<sub>&#593;</sub> cos &#948;', '&#956;<sub>&#948;</sub>'],
+	units: ['', 'mas/yr', 'mas/yr'],
+	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=I/345&-c={ra},{dec},eq=J2000&-c.rs=0.01'
+});
+
 L.Catalog.URAT_1 = L.extend({}, L.Catalog, {
 	service: 'Vizier@CDS',
 	name: 'URAT1',
@@ -323,7 +372,7 @@ L.Catalog.GLEAM = L.extend({}, L.Catalog, {
 	 '-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=-Fintwide',
 	properties: ['F<sub>int</sub>(170-231MHz)', 'Major axis FWHM', 'Minor axis FWHM', 'Position angle'],
 	units: ['Jy', '&#8243;', '&#8243;', '&#176;'],
-	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=-source=VIII/100/gleamegc&-c={ra},{dec},eq=J2000&-c.rs=0.2',
+	objurl: L.Catalog.vizierURL + '/VizieR-5?-source=VIII/100/gleamegc&-c={ra},{dec},eq=J2000&-c.rs=0.2',
 	draw: function (feature, latlng) {
 		return L.ellipse(latlng, {
 			majAxis: feature.properties.items[1] / 3600.0,
@@ -346,7 +395,7 @@ L.Catalog.TGSS = L.extend({}, L.Catalog, {
 	 '-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=-Stotal',
 	properties: ['F<sub>peak</sub>(150MHz)', 'Major axis FWHM', 'Minor axis FWHM', 'Position angle'],
 	units: ['mJy', '&#8243;', '&#8243;', '&#176;'],
-	objurl: L.Catalog.vizierURL + '/VizieR-3?-source=-source=J/A%2bA/598/A78/table3&-c={ra},{dec},eq=J2000&-c.rs=0.2',
+	objurl: L.Catalog.vizierURL + '/VizieR-3?-source=J/A%2bA/598/A78/table3&-c={ra},{dec},eq=J2000&-c.rs=0.2',
 	draw: function (feature, latlng) {
 		return L.ellipse(latlng, {
 			majAxis: feature.properties.items[1] / 7200.0,
@@ -355,3 +404,35 @@ L.Catalog.TGSS = L.extend({}, L.Catalog, {
 		});
 	}
 });
+
+L.Catalog.PS1 = L.extend({}, L.Catalog, {
+	service: 'Vizier@CDS',
+	name: 'PS1',
+	className: 'logo-catalog-vizier',
+	attribution: 'The Pan-STARRS release 1 (PS1) Survey - DR1 (Chambers+, 2016)',
+	color: 'blue',
+	maglim: 30.0,
+	regionType: 'box',
+	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=II/349&' +
+		'-out=objID,RAJ2000,DEJ2000,gmag,e_gmag,rmag,e_rmag,imag,e_imag,zmag,e_zmag,ymag_e_ymag,gKmag,e_gKmag,rKmag,e_rKmag,iKmag,e_iKmag,zKmag,e_zKmag,yKmag,e_yKmag&-out.meta=&' +
+		'-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=-gmag',
+	properties: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''],
+	units: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''],
+	objurl: L.Catalog.vizierURL + '/VizieR-3?-source=II/349&-c={ra},{dec},eq=J2000&-c.rs=0.2',
+});
+
+L.Catalog.HSC2 = L.extend({}, L.Catalog, {
+	service: 'Vizier@CDS',
+	name: 'HSC2',
+	className: 'logo-catalog-vizier',
+	attribution: 'Hubble Source Catalog (V1 and V2) (Whitmore+, 2016)',
+	color: 'blue',
+	maglim: 30.0,
+	regionType: 'box',
+	url: L.Catalog.vizierURL + '/asu-tsv?&-mime=csv&-source=II/342/hsc2&' +
+		'-out=Source,RAJ2000,DEJ2000,Filter,magAper2,magAuto&-out.meta=&' +
+		'-c.eq={sys}&-c={lng},{lat}&-c.bd={dlng},{dlat}&-out.max={nmax}&-sort=-magAuto',
+	properties: ['', '', '',],
+	units: ['', '', ''],
+	objurl: L.Catalog.vizierURL + '/VizieR-3?-source=II/342/hsc2&-c={ra},{dec},eq=J2000&-c.rs=0.2',
+});