Merge pull request #3139 from cds-astro/mocserver

Partial rewrite of the MOCServer module

Author: bsipocz

CHANGES.rst

@@ -19,10 +19,42 @@ jplspec
 
 - minor improvement to lookuptable behavior [#3173,#2901]
 
+mocserver
+^^^^^^^^^
+
+- Switch to https instead of http for the default url (allows pyodide to use the
+  module) [#3139]
+
+- Add ``TimeMOC`` and ``STMOC`` as possible entries in ``MOCServer.query_region`` to
+  allow temporal and space-time searches [#3139]
+
+- ``return_moc`` now allows to ask for a Time-MOC or a Space-Time MOC rather than only
+  Space-MOCs [#3139]
+
+- Fix query by MOC that would write a file ``moc.fits`` where the method was executed in
+  overwriting mode (potentially deleting data if there was a conflicting file) [#3139]
+
+- [:warning: BREAKING] Returned tables now have a default list of fields instead of the
+  > 130 columns returned previously. The full list of fields can be displayed with the
+  new method ``MOCServer.list_fields`` [#3139]
+
+- Add ``casesensitive`` parameter in the queries (previously, this was hardcoded
+  to ``True``) [#3139]
+
+- Add ``coordinate_system`` parameter to the queries to allow to filter on the different
+  bodies or frames. The list of available space systems can be printed with the new
+  method ``MOCServer.list_coordinates_systems`` [#3139]
+
+- Add ``query_hips`` method, which is convenient to filter only Hierarchical progressive
+  surveys [#3139]
+
+- New parameter ``criteria`` in ``query_region`` and ``query_hips`` that has the same
+  use than ``meta_data`` in the deprecated method ``find_datasets`` [#3139]
+
 simbad
 ^^^^^^
 
-- Fixed adding a list of fluxes with the deprecated notation 
+- Fixed adding a list of fluxes with the deprecated notation
   ``Simbad.add_votable_fields("flux(U)", "flux(J)")`` [#3186]
 
 - Support more of the 0.4.7 votable fields. Raise more significant error messages
@@ -32,6 +64,7 @@ simbad
 
 - Fixed non existing flux filters as votable fields would fail silently [#3186]
 
+
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------
 

astroquery/mocserver/__init__.py

@@ -1,7 +1,6 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-"""
-CDS MOCServer Query Tool
-------------------------
+"""CDS MOCServer Query Tool.
+----------------------------
 
 :Author: Matthieu Baumann ([email protected])
 
@@ -13,8 +12,9 @@
 Note: If the access to MOCs with the MOCServer tool was helpful for your research,
 the following acknowledgment would be appreciated::
 
-  This research has made use of the MOCServer, a tool developed at CDS, Strasbourg, France aiming at retrieving
-  MOCs/meta-data from known data-sets. MOC is an IVOA standard described in the following paper :
+  This research has made use of the MOCServer, a tool developed at CDS, Strasbourg,
+  France aiming at retrieving MOCs/meta-data from known data-sets. MOC is an IVOA
+  standard described in :
   http://www.ivoa.net/documents/MOC/20140602/REC-MOC-1.0-20140602.pdf
 """
 
@@ -24,14 +24,12 @@
 
 
 class Conf(_config.ConfigNamespace):
-    """
-    Configuration parameters for ``astroquery.template_module``.
-    """
+    """Configuration parameters for ``astroquery.template_module``."""
 
     server = _config.ConfigItem(
         [
-            "http://alasky.unistra.fr/MocServer/query",
-            "http://alaskybis.unistra.fr/MocServer/query",
+            "https://alasky.unistra.fr/MocServer/query",
+            "https://alaskybis.unistra.fr/MocServer/query",
         ],
         "Name of the template_module server to use.",
     )
@@ -40,6 +38,16 @@ class Conf(_config.ConfigNamespace):
         30, "Time limit for connecting to template_module server."
     )
 
+    default_fields = [
+        "ID",
+        "obs_title",
+        "obs_description",
+        "nb_rows",
+        "obs_regime",
+        "bib_reference",
+        "dataproduct_type",
+    ]
+
 
 conf = Conf()