Update Miriade url and upstream and making relevant changes that parses the different response format

Author: bsipocz

astroquery/imcce/__init__.py

@@ -18,7 +18,7 @@ class Conf(_config.ConfigNamespace):
 
     # server settings
     ephemcc_server = _config.ConfigItem(
-        'http://vo.imcce.fr/webservices/miriade/ephemcc_query.php',
+        'https://ssp.imcce.fr/webservices/miriade/api/ephemcc.php',
         'IMCCE/Miriade.ephemcc base server')
     skybot_server = _config.ConfigItem(
         ['https://ssp.imcce.fr/webservices/skybot/api/conesearch.php'],

astroquery/imcce/core.py

@@ -23,7 +23,7 @@
 class MiriadeClass(BaseQuery):
     """
     A class for querying the
-    `IMCCE/Miriade <http://vo.imcce.fr/webservices/miriade/>`_ service.
+    `IMCCE/Miriade <https://ssp.imcce.fr/webservices/miriade/>`_ service.
     """
 
     _query_uri = None  # uri used in query
@@ -49,8 +49,8 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid',
                               get_raw_response=False, cache=True):
         """
         Query the
-        `IMCCE Miriade <http://vo.imcce.fr/webservices/miriade/>`_
-        `ephemcc <http://vo.imcce.fr/webservices/miriade/?ephemcc>`_
+        `IMCCE Miriade <https://ssp.imcce.fr/webservices/miriade/>`_
+        `ephemcc <https://ssp.imcce.fr/webservices/miriade/api/ephemcc>`_
         service.
 
 
@@ -85,7 +85,7 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid',
         location : str, optional
             Location of the observer on Earth as a code or a set of
             coordinates. See the
-            `Miriade manual <http://vo.imcce.fr/webservices/miriade/?documentation#field_7>`_
+            `Miriade manual <https://ssp.imcce.fr/webservices/miriade/?documentation#field_7>`_
             for details. Default: geocentric location (``'500'``)
 
         coordtype : int, optional
@@ -299,17 +299,27 @@ def _parse_result(self, response, *, verbose=None):
         votable = parse(voraw)
         data = votable.get_first_table().to_table()
 
-        # modify table columns
+        # modify table columns. This is an ugly hack as astropy's votable parser
+        # is not yet capable of parsing some of these properly.
+        # Also, not clear why some of the columns are now parsed as object as
+        # opposed to strings, workaround here is to do .astype()
+
+        data['date'] = Time(data['date'].astype('str'), format='isot')
+
+        # Adding for backwards compatibility
+        data['epoch'] = data['date'].jd
         data['epoch'].unit = u.d
 
-        if 'ra' in data.columns:
-            data['ra'] = Angle(data['ra'], unit=u.hourangle).deg*u.deg
-            data.rename_column('ra', 'RA')
+        if 'RA' in data.columns:
+            data['RA'] = Angle(data['RA'].astype('str'), unit=u.hourangle).deg*u.deg
+
+        if 'DEC' in data.columns:
+            data['DEC'] = Angle(data['DEC'], unit=u.deg).deg*u.deg
 
         if 'dec' in data.columns:
-            data['dec'] = Angle(data['dec'], unit=u.deg).deg*u.deg
             data.rename_column('dec', 'DEC')
 
+        # These don't seem to be returned with the new API/url, as of 2025-04-07
         if 'raJ2000' in data.columns and 'decJ2000' in data.columns:
             data['raJ2000'] = Angle(
                 data['raJ2000'], unit=u.hourangle).deg*u.deg

astroquery/imcce/tests/test_miriade_remote.py

@@ -4,7 +4,7 @@
 import numpy.testing as npt
 import pytest
 
-from .. import core
+from astroquery.imcce import Miriade
 
 
 @pytest.mark.remote_data
@@ -13,10 +13,8 @@ class TestMiriadeClass:
     def test_ephemerides(self):
         # check values of Ceres for a given epoch
         # orbital uncertainty of Ceres is basically zero
-        res = core.Miriade.get_ephemerides('Ceres', location='500',
-                                           epoch=2451544.5)
-
-        assert res['target'] == "Ceres"
+        res = Miriade.get_ephemerides('Ceres', location='500',
+                                      epoch=2451544.5)
 
         npt.assert_allclose(
             [2451544.5, 188.70280, 9.09829],

docs/imcce/imcce.rst

@@ -205,7 +205,7 @@ Pallas over an entire year with a time step of 1 day:
 The observer location is defined through the ``location`` keyword,
 expecting a string containing the official IAU observatory code, a
 spacecraft name, or a set of coordinates (see the `Miriade manual
-<http://vo.imcce.fr/webservices/miriade/?documentation#field_7>`_ for
+<https://ssp.imcce.fr/webservices/miriade/?documentation#field_7>`_ for
 details).
 
 
@@ -219,7 +219,7 @@ query, the coordinate type in
 `~astroquery.imcce.MiriadeClass.get_ephemerides` is defined through
 an integer value. For a full discussion of the different coordinate
 types we refer to `this section
-<http://vo.imcce.fr/webservices/miriade/?ephemcc#outputparam>`_ of the
+<https://ssp.imcce.fr/webservices/miriade/?ephemcc#outputparam>`_ of the
 Miriade website. The keyword ``coordtype`` controls which set of
 coordinates and properties are queried.