Merge pull request #753 from segasai/fix_simbad_radius1

fix parsing of radius option in Simbad queries.

Author: keflavich

astroquery/simbad/core.py

@@ -811,13 +811,11 @@ def _parse_radius(radius):
             index = 2  # use arcseconds when radius smaller than 1 arcsecond
         unit = ('d', 'm', 's')[index]
         if unit == 'd':
-            return str(int(angle.degree)) + unit
+            return str(angle.degree) + unit
         if unit == 'm':
-            sec_to_min = abs(angle.dms[2]) * u.arcsec.to(u.arcmin)
-            total_min = abs(angle.dms[1]) + sec_to_min
-            return str(total_min) + unit
+            return str(angle.arcmin) + unit
         if unit == 's':
-            return str(abs(angle.dms[2])) + unit
+            return str(angle.arcsec) + unit
     except (coord.errors.UnitsError, AttributeError):
         raise ValueError("Radius specified incorrectly")
 

astroquery/simbad/tests/test_simbad.py

@@ -69,12 +69,13 @@ def post_mockreturn(url, data, timeout, **kwargs):
 
 
 @pytest.mark.parametrize(('radius', 'expected_radius'),
-                         [('5d0m0s', '5d'),
-                          ('5d', '5d'),
-                          ('5.0d', '5d'),
-                          (5 * u.deg, '5d'),
-                          (5.0 * u.deg, '5d'),
-                          (0.432 * u.deg, '25.92m'),
+                         [('5d0m0s', '5.0d'),
+                          ('5d', '5.0d'),
+                          ('5.0d', '5.0d'),
+                          (5 * u.deg, '5.0d'),
+                          (5.0 * u.deg, '5.0d'),
+                          (1.2 * u.deg, '1.2d'),
+                          (0.5 * u.deg, '30.0m'),
                           ('0d1m12s', '1.2m'),
                           (0.003 * u.deg, '10.8s'),
                           ('0d0m15s', '15.0s')
@@ -135,7 +136,7 @@ def test_parse_result():
                            ("\nvotable {" + votable_fields + "}\n"
                             "votable open\n"
                             "query coo  5:35:17.3 -80:52:00 "
-                            "radius=5d frame=ICRS equi=2000.0 epoch=J2000 \n"
+                            "radius=5.0d frame=ICRS equi=2000.0 epoch=J2000 \n"
                             "votable close")),
                           (["m [0-9]"], dict(wildcard=True,
                                              caller='query_object_async'),