add test and documentation to query_region

Author: lvalerom

astroquery/esa/hsa/core.py

@@ -398,16 +398,7 @@ def query_observations(self, coordinate, radius, *, n_obs=10, **kwargs):
         -------
         A table object with the list of observations in the region
         """
-        r = radius
-        if not isinstance(radius, u.Quantity):
-            r = radius*u.deg
-        coord = commons.parse_coordinates(coordinate).icrs
-
-        query = (f"select top {n_obs} observation_id from hsa.v_active_observation "
-                 f"where contains("
-                 f"point('ICRS', hsa.v_active_observation.ra, hsa.v_active_observation.dec), "
-                 f"circle('ICRS', {coord.ra.degree},{coord.dec.degree},{r.to(u.deg).value}))=1")
-        return self.query_hsa_tap(query, **kwargs)
+        return self.query_region(coordinate, radius, n_obs=n_obs, columns="observation_id", **kwargs)
 
     def query_region(self, coordinate, radius, *, n_obs=10, columns='*', **kwargs):
         """

astroquery/esa/hsa/tests/test_hsa.py

@@ -57,3 +57,12 @@ def test_query_observations(self):
         hsa = HSAClass(self.get_dummy_tap_handler())
         hsa.query_observations(**parameters)
         dummyTapHandler.check_call("query_observations", parameters)
+
+    def test_query_region(self):
+        c = SkyCoord(ra=100.2417*u.degree, dec=9.895*u.degree, frame='icrs')
+        parameters = {'coordinate': c,
+                      'radius': 0.5}
+        dummyTapHandler = DummyHSATapHandler("query_region", parameters)
+        hsa = HSAClass(self.get_dummy_tap_handler())
+        hsa.query_region(**parameters)
+        dummyTapHandler.check_call("query_region", parameters)

docs/esa/hsa.rst

@@ -145,7 +145,31 @@ This will show the available tables in HSA TAP service in the Herschel Science A
 This will show the column details of the table 'hsa.v_active_observation' in HSA TAP service in the Herschel Science Archive.
 
 
-7. Query Observations
+7. Query Region
+---------------
+
+.. doctest-skip::
+
+  >>> from astroquery.esa.hsa import HSA
+  >>> from astropy.coordinates import SkyCoord
+  >>> from astropy import units as u
+  >>>
+  >>> c = SkyCoord(ra=100.2417*u.degree, dec=9.895*u.degree, frame='icrs')
+  >>> result = HSA.query_region(c, 0.5)
+  >>> result.pprint(max_width=100)
+                        aor                            bii         ...   target_name    urn_version
+                                                                ...                             
+  ------------------------------------------- ------------------ ... ---------------- -----------
+  KPOT_wlanger_1-HPoint-0007 - CII_G202.6+2.0 10.062774289985356 ... CII_G202.6+2.0-1      921022
+                                      n2264-o   9.45754288889945 ...          NGC2264      919399
+                                      n2264-n   9.45754288889945 ...          NGC2264      919398
+                                      n2264-n  9.450299102175919 ...          NGC2264      898497
+                                      n2264-o  9.450499719127244 ...          NGC2264      898535
+
+Retrieve a VOTable with the observations metadata of a given region
+
+
+8. Query Observations
 ---------------------
 
 .. doctest-skip::
@@ -169,7 +193,7 @@ This will show the column details of the table 'hsa.v_active_observation' in HSA
 Retrieve a VOTable with the observation IDs of a given region
 
 
-8. Procedure example
+9. Procedure example
 --------------------
 
 First retrieve the observation IDs based on a position on the sky. To achive this, query the TAP service.