Utils method to parse coordinates

Author: snbianco

astroquery/mast/collections.py

@@ -19,7 +19,7 @@
 
 from astropy.table import Table, Row
 
-from ..utils import commons, async_to_sync
+from ..utils import async_to_sync
 from ..utils.class_or_instance import class_or_instance
 from ..exceptions import InvalidQueryError, MaxResultsWarning, InputWarning
 
@@ -204,7 +204,7 @@ def query_region_async(self, coordinates, *, radius=0.2*u.deg, catalog="Hsc",
         """
 
         # Put coordinates and radius into consistent format
-        coordinates = commons.parse_coordinates(coordinates)
+        coordinates = utils.parse_coordinates(coordinates)
 
         # if radius is just a number we assume degrees
         radius = coord.Angle(radius, u.deg)

astroquery/mast/missions.py

@@ -219,7 +219,7 @@ def query_region_async(self, coordinates, *, radius=3*u.arcmin, limit=5000, offs
         self._validate_criteria(**criteria)
 
         # Put coordinates and radius into consistent format
-        coordinates = commons.parse_coordinates(coordinates)
+        coordinates = utils.parse_coordinates(coordinates)
 
         # If radius is just a number, assume arcminutes
         radius = coord.Angle(radius, u.arcmin)

astroquery/mast/observations.py

@@ -23,7 +23,7 @@
 from astroquery import log
 from astroquery.mast.cloud import CloudAccess
 
-from ..utils import commons, async_to_sync
+from ..utils import async_to_sync
 from ..utils.class_or_instance import class_or_instance
 from ..exceptions import (InvalidQueryError, RemoteServiceError,
                           NoResultsWarning, InputWarning)
@@ -234,7 +234,7 @@ def query_region_async(self, coordinates, *, radius=0.2*u.deg, pagesize=None, pa
         """
 
         # Put coordinates and radius into consistent format
-        coordinates = commons.parse_coordinates(coordinates)
+        coordinates = utils.parse_coordinates(coordinates)
 
         # if radius is just a number we assume degrees
         radius = coord.Angle(radius, u.deg)
@@ -363,7 +363,7 @@ def query_region_count(self, coordinates, *, radius=0.2*u.deg, pagesize=None, pa
         """
 
         # build the coordinates string needed by ObservationsClass._caom_filtered_position
-        coordinates = commons.parse_coordinates(coordinates)
+        coordinates = utils.parse_coordinates(coordinates)
 
         # if radius is just a number we assume degrees
         radius = coord.Angle(radius, u.deg)

astroquery/mast/tests/test_mast.py

@@ -1197,37 +1197,3 @@ def test_zcut_get_cutouts(patch_post, tmpdir):
     assert isinstance(cutout_list, list)
     assert len(cutout_list) == 1
     assert isinstance(cutout_list[0], fits.HDUList)
-
-
-################
-# Utils tests #
-################
-
-
-def test_parse_input_location(patch_post):
-    # Test with coordinates
-    coord = SkyCoord(23.34086, 60.658, unit="deg")
-    loc = mast.utils.parse_input_location(coordinates=coord)
-    assert isinstance(loc, SkyCoord)
-    assert loc.ra == coord.ra
-    assert loc.dec == coord.dec
-
-    # Test with object name
-    obj_coord = SkyCoord(124.531756290083, -68.3129998725044, unit="deg")
-    loc = mast.utils.parse_input_location(objectname="TIC 307210830")
-    assert isinstance(loc, SkyCoord)
-    assert loc.ra == obj_coord.ra
-    assert loc.dec == obj_coord.dec
-
-    # Error if both coordinates and object name are provided
-    with pytest.raises(InvalidQueryError, match="Only one of objectname and coordinates may be specified"):
-        mast.utils.parse_input_location(coordinates=coord, objectname="M101")
-
-    # Error if neither coordinates nor object name is provided
-    with pytest.raises(InvalidQueryError, match="One of objectname and coordinates must be specified"):
-        mast.utils.parse_input_location()
-
-    # Warn if resolver is specified without an object name
-    with pytest.warns(InputWarning, match="Resolver is only used when resolving object names"):
-        loc = mast.utils.parse_input_location(coordinates=coord, resolver="SIMBAD")
-        assert isinstance(loc, SkyCoord)

astroquery/mast/utils.py

@@ -216,7 +216,8 @@ def parse_input_location(*, coordinates=None, objectname=None, resolver=None):
     Returns
     -------
     response : `~astropy.coordinates.SkyCoord`
-        The given coordinates, or object's location as an `~astropy.coordinates.SkyCoord` object.
+        The given coordinates, or object's location as an `~astropy.coordinates.SkyCoord` object
+        in the ICRS frame.
     """
 
     # Checking for valid input
@@ -232,6 +233,7 @@ def parse_input_location(*, coordinates=None, objectname=None, resolver=None):
     if objectname:
         obj_coord = resolve_object(objectname, resolver=resolver)
 
+    # Parse coordinates, if given
     if coordinates:
         obj_coord = commons.parse_coordinates(coordinates)