more tests of rectangle

Author: weaverba137

astroquery/sdss/core.py

@@ -126,22 +126,20 @@ def query_crossid_async(self, coordinates, *, radius=5. * u.arcsec, timeout=TIME
         cache : bool, optional
             If ``True`` use the request caching mechanism.
 
+        Raises
+        ------
+        TypeError
+            If the `radius` keyword could not be parsed as an angle.
+        ValueError
+            If the `radius` exceeds 3 arcmin, or if the sizes of
+            `coordinates` and `obj_names` do not match.
+
         Returns
         -------
         result : `~astropy.table.Table`
             The result of the query as a `~astropy.table.Table` object.
 
         """
-        # Move Raises section here, since async_to_sync does not appear to like it.
-        #
-        # Raises
-        # ------
-        # TypeError
-        #     If the `radius` keyword could not be parsed as an angle.
-        # ValueError
-        #     If the `radius` exceeds 3 arcmin, or if the sizes of
-        #     `coordinates` and `obj_names` do not match.
-
         if isinstance(radius, Angle):
             radius = radius.to_value(u.arcmin)
         else:
@@ -1314,6 +1312,8 @@ def _rectangle_sql(self, ra, dec, width, height=None, cosdec=False):
         d1 = dec + dd
         if d1 > 90.0:
             d1 = 90.0
+        if d1 < d0:
+            d0, d1 = d1, d0
         ra_wrap = False
         r0 = ra - dr
         if r0 < 0:

astroquery/sdss/tests/test_sdss.py

@@ -602,3 +602,11 @@ def test_rectangle_sql():
     assert sql == '(((p.ra >= 357.5) OR (p.ra <= 0.5)) AND (p.dec BETWEEN -0.5 AND 0.5))'
     sql = sdss.SDSS._rectangle_sql(5, 0, 1)
     assert sql == '((p.ra BETWEEN 4.5 AND 5.5) AND (p.dec BETWEEN -0.5 AND 0.5))'
+    sql = sdss.SDSS._rectangle_sql(5, 89.75, 1)
+    assert sql == '((p.ra BETWEEN 4.5 AND 5.5) AND (p.dec BETWEEN 89.25 AND 90))'
+    sql = sdss.SDSS._rectangle_sql(5, -89.75, 1)
+    assert sql == '((p.ra BETWEEN 4.5 AND 5.5) AND (p.dec BETWEEN -90 AND -89.25))'
+    sql = sdss.SDSS._rectangle_sql(5, 5, 1, height=2)
+    assert sql == '((p.ra BETWEEN 4.5 AND 5.5) AND (p.dec BETWEEN 4 AND 6))'
+    sql = sdss.SDSS._rectangle_sql(5, -5, 1, height=2)
+    assert sql == '((p.ra BETWEEN 4.5 AND 5.5) AND (p.dec BETWEEN -6 AND -4))'