add/update tests

Author: m-stclair

astroquery/jplhorizons/core.py

@@ -1170,7 +1170,7 @@ def _location_to_params(loc_dict):
             "CENTER": f"coord@{loc_dict['body']}",
             "COORD_TYPE": "GEODETIC",
             "SITE_COORD": ",".join(
-                str(float(loc_dict[k])) for k in ['lat', 'lon', 'elevation']
+                str(float(loc_dict[k])) for k in ['lon', 'lat', 'elevation']
             )
         }
         loc_dict["SITE_COORD"] = f"'{loc_dict['SITE_COORD']}'"

astroquery/jplhorizons/tests/test_jplhorizons.py

@@ -83,7 +83,7 @@ def test_ephemerides_query(patch_request):
     assert res['targetname'] == "1 Ceres (A801 AA)"
     assert res['datetime_str'] == "2000-Jan-01 00:00:00.000"
     assert res['solar_presence'] == ""
-    assert res['flags'] == ""
+    assert res['lunar_presence'] == ""
     assert res['elongFlag'] == '/L'
     assert res['airmass'] == 999
 
@@ -256,22 +256,23 @@ def test_vectors_query_payload():
     res = jplhorizons.Horizons(id='Ceres', location='500@10',
                                epochs=2451544.5).vectors(
                                    get_query_payload=True)
-
     assert res == OrderedDict([
-        ('format', 'text'),
-        ('EPHEM_TYPE', 'VECTORS'),
-        ('OUT_UNITS', 'AU-D'),
-        ('COMMAND', '"Ceres"'),
-        ('CENTER', "'500@10'"),
-        ('CSV_FORMAT', '"YES"'),
-        ('REF_PLANE', 'ECLIPTIC'),
-        ('REF_SYSTEM', 'ICRF'),
-        ('TP_TYPE', 'ABSOLUTE'),
-        ('VEC_LABELS', 'YES'),
-        ('VEC_CORR', '"NONE"'),
-        ('VEC_DELTA_T', 'NO'),
-        ('OBJ_DATA', 'YES'),
-        ('TLIST', '2451544.5')])
+            ('format', 'text'),
+            ('EPHEM_TYPE', 'VECTORS'),
+            ('OUT_UNITS', 'AU-D'),
+            ('COMMAND', '"Ceres"'),
+            ('CSV_FORMAT', '"YES"'),
+            ('REF_PLANE', 'ECLIPTIC'),
+            ('REF_SYSTEM', 'ICRF'),
+            ('TP_TYPE', 'ABSOLUTE'),
+            ('VEC_LABELS', 'YES'),
+            ('VEC_CORR', '"NONE"'),
+            ('VEC_DELTA_T', 'NO'),
+            ('OBJ_DATA', 'YES'),
+            ('CENTER', "'500@10'"),
+            ('TLIST', '2451544.5')
+        ])
+
 
 
 def test_no_H(patch_request):

astroquery/jplhorizons/tests/test_jplhorizons_remote.py

@@ -1,10 +1,14 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import random
 
-import pytest
 from numpy.ma import is_masked
+import numpy as np
+import pytest
 
+from astropy.coordinates import spherical_to_cartesian
 from astropy.tests.helper import assert_quantity_allclose
+import astropy.units as u
 from astropy.utils.exceptions import AstropyDeprecationWarning
 
 from ... import jplhorizons
@@ -23,7 +27,7 @@ def test_ephemerides_query(self):
         assert res['targetname'] == "1 Ceres (A801 AA)"
         assert res['datetime_str'] == "2000-Jan-01 00:00:00.000"
         assert res['solar_presence'] == ""
-        assert res['flags'] == ""
+        assert res['lunar_presence'] == ""
         assert res['elongFlag'] == '/L'
         assert res['airmass'] == 999
 
@@ -75,7 +79,7 @@ def test_ephemerides_query_two(self):
         assert res['targetname'] == "1P/Halley"
         assert res['datetime_str'] == "2080-Jan-11 09:00"
         assert res['solar_presence'] == ""
-        assert res['flags'] == "m"
+        assert res['lunar_presence'] == "m"
         assert res['elongFlag'] == '/L'
 
         for value in ['H', 'G']:
@@ -98,7 +102,7 @@ def test_ephemerides_query_three(self):
         assert res['targetname'] == "73P/Schwassmann-Wachmann 3"
         assert res['datetime_str'] == "2080-Jan-01 00:00"
         assert res['solar_presence'] == "*"
-        assert res['flags'] == "m"
+        assert res['lunar_presence'] == "m"
         assert res['elongFlag'] == '/L'
 
         for value in ['H', 'G']:
@@ -123,7 +127,7 @@ def test_ephemerides_query_four(self):
         assert res['targetname'] == "167P/CINEOS"
         assert res['datetime_str'] == "2080-Jan-01 00:00"
         assert res['solar_presence'] == "*"
-        assert res['flags'] == "m"
+        assert res['lunar_presence'] == "m"
         assert res['elongFlag'] == '/T'
 
         for value in ['H', 'G', 'M1', 'k1']:
@@ -150,7 +154,7 @@ def test_ephemerides_query_five(self):
         assert res['targetname'] == "12P/Pons-Brooks"
         assert res['datetime_str'] == "2080-Jan-01 00:00"
         assert res['solar_presence'] == "*"
-        assert res['flags'] == "m"
+        assert res['lunar_presence'] == "m"
         assert res['elongFlag'] == '/L'
 
         for value in ['H', 'G', 'phasecoeff']:
@@ -405,3 +409,51 @@ def test_ephemerides_extraprecision(self):
         vec_highprec = obj.ephemerides(extra_precision=True)
 
         assert (vec_simple['RA'][0]-vec_highprec['RA'][0]) > 1e-7
+
+    def test_geodetic_queries(self):
+        """
+        black-box test for observer and vectors queries with geodetic
+        coordinates. checks spatial sensibility.
+        """
+        phobos = {
+            'body': 401,
+            'lon': random.randint(-150, -1),
+            'lat': random.randint(-80, 80),
+            'elevation': 0
+        }
+        deimos = {
+            'body': 402,
+            'lon': random.randint(-150, -1),
+            'lat': random.randint(-80, 80),
+            'elevation': 0
+        }
+        epochs = [random.randint(int(2.3e6), int(2.5e6))]
+        deimos_phobos = jplhorizons.Horizons(
+            phobos, location=deimos, epochs=epochs
+        )
+        phobos_deimos = jplhorizons.Horizons(
+            deimos, location=phobos, epochs=epochs
+        )
+        pd_eph = phobos_deimos.ephemerides()
+        dp_eph = deimos_phobos.ephemerides()
+        dp_xyz = spherical_to_cartesian(
+            dp_eph['delta'], dp_eph['DEC'], dp_eph['RA']
+        )
+        pd_xyz = spherical_to_cartesian(
+            pd_eph['delta'], pd_eph['DEC'], pd_eph['RA']
+        )
+        elementwise = [(dp_el + pd_el) for dp_el, pd_el in zip(dp_xyz, pd_xyz)]
+        eph_offset = (sum([off ** 2 for off in elementwise]) ** 0.5).to(u.km)
+        # horizons can do better than this, but we'd have to go to a little
+        # more trouble than is necessary for a software test...
+        assert eph_offset < 10 * u.km
+        # ...and vectors queries are really what you're meant to use for
+        # this sort of thing.
+        pd_vec, dp_vec = phobos_deimos.vectors(), deimos_phobos.vectors()
+        vec_offset = np.sum(
+            (
+                pd_vec.as_array(names=('x', 'y', 'z')).view('f8')
+                + dp_vec.as_array(names=('x', 'y', 'z')).view('f8')
+            ) ** 2
+        )
+        assert (vec_offset * u.au.to(u.km)) < 1