BUG: Fix string radius/width case

Author: bsipocz

astroquery/ipac/irsa/core.py

@@ -8,7 +8,7 @@
 """
 
 import warnings
-from astropy.coordinates import SkyCoord
+from astropy.coordinates import SkyCoord, Angle
 from astropy import units as u
 from astropy.utils.decorators import deprecated_renamed_argument
 from pyvo.dal import TAPService
@@ -131,10 +131,15 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
         else:
             coords_icrs = parse_coordinates(coordinates).icrs
             ra, dec = coords_icrs.ra.deg, coords_icrs.dec.deg
+
             if spatial == 'Cone':
+                if isinstance(radius, str):
+                    radius = Angle(radius)
                 where = (" WHERE CONTAINS(POINT('ICRS',ra,dec),"
                          f"CIRCLE('ICRS',{ra},{dec},{radius.to(u.deg).value}))=1")
             elif spatial == 'Box':
+                if isinstance(width, str):
+                    width = Angle(width)
                 where = (" WHERE CONTAINS(POINT('ICRS',ra,dec),"
                          f"BOX('ICRS',{ra},{dec},{width.to(u.deg).value},{width.to(u.deg).value}))=1")
             else:

astroquery/ipac/irsa/tests/test_irsa.py

@@ -2,7 +2,6 @@
 
 import pytest
 from astropy.coordinates import SkyCoord
-from astropy.table import Table
 import astropy.units as u
 
 from astroquery.ipac.irsa import Irsa
@@ -11,10 +10,13 @@
 OBJ_LIST = ["00h42m44.330s +41d16m07.50s",
             SkyCoord(l=121.1743 * u.deg, b=-21.5733 * u.deg, frame="galactic")]
 
+SIZE_LIST = [2 * u.arcmin, '0d2m0s']
 
-@pytest.mark.parametrize(("coordinates"), OBJ_LIST)
-def test_query_region_cone(coordinates):
-    query = Irsa.query_region(coordinates, catalog='fp_psc', spatial='Cone', radius=2 * u.arcmin,
+
+@pytest.mark.parametrize("coordinates", OBJ_LIST)
+@pytest.mark.parametrize("radius", SIZE_LIST)
+def test_query_region_cone(coordinates, radius):
+    query = Irsa.query_region(coordinates, catalog='fp_psc', spatial='Cone', radius=radius,
                               get_query_payload=True)
 
     # We don't fully float compare in this string, there are slight differences due to the name-coordinate
@@ -24,13 +26,15 @@ def test_query_region_cone(coordinates):
     assert ",0.0333" in query
 
 
-@pytest.mark.skip("Upstream TAP doesn't support Box geometry yet")
 @pytest.mark.parametrize("coordinates", OBJ_LIST)
-def test_query_region_box(coordinates):
-    result = Irsa.query_region(
-        coordinates, catalog='fp_psc', spatial='Box', width=2 * u.arcmin)
+@pytest.mark.parametrize("width", SIZE_LIST)
+def test_query_region_box(coordinates, width):
+    query = Irsa.query_region(coordinates, catalog='fp_psc', spatial='Box', width=2 * u.arcmin,
+                              get_query_payload=True)
 
-    assert isinstance(result, Table)
+    assert "SELECT * FROM fp_psc WHERE CONTAINS(POINT('ICRS',ra,dec),BOX('ICRS',10.68" in query
+    assert ",41.26" in query
+    assert ",0.0333" in query
 
 
 poly1 = [SkyCoord(ra=10.1 * u.deg, dec=10.1 * u.deg),