CHANGELOG

@@ -333,3 +333,8 @@ Fixed creation of super-observations on local domain.
   py/cso_superobs.py
 
 
+v2.7.2
+~~~~~~
+
+Updated url of DataSpace OpenSearch API.
+

config/Copernicus/cso-s5p-co.rc

@@ -34,7 +34,7 @@ cso.s5p.co.inquire-table-dataspace.timerange.start        :  ${my.full-timerange
 cso.s5p.co.inquire-table-dataspace.timerange.end          :  ${my.full-timerange.end}
 
 ! API url:
-cso.s5p.co.inquire-table-dataspace.url                    :  https://finder.creodias.eu/resto/api
+cso.s5p.co.inquire-table-dataspace.url                    :  https://catalogue.dataspace.copernicus.eu/resto/api
 
 ! collection name:
 cso.s5p.co.inquire-table-dataspace.collection             :  Sentinel5P

config/Copernicus/cso-s5p-hcho.rc

@@ -34,7 +34,7 @@ cso.s5p.hcho.inquire-table-dataspace.timerange.start        :  ${my.full-timeran
 cso.s5p.hcho.inquire-table-dataspace.timerange.end          :  ${my.full-timerange.end}
 
 ! API url:
-cso.s5p.hcho.inquire-table-dataspace.url                    :  https://finder.creodias.eu/resto/api
+cso.s5p.hcho.inquire-table-dataspace.url                    :  https://catalogue.dataspace.copernicus.eu/resto/api
 
 ! collection name:
 cso.s5p.hcho.inquire-table-dataspace.collection             :  Sentinel5P

config/Copernicus/cso-s5p-no2.rc

@@ -34,7 +34,7 @@ cso.s5p.no2.inquire-table-dataspace.timerange.start        :  ${my.full-timerang
 cso.s5p.no2.inquire-table-dataspace.timerange.end          :  ${my.full-timerange.end}
 
 ! API url:
-cso.s5p.no2.inquire-table-dataspace.url                    :  https://finder.creodias.eu/resto/api
+cso.s5p.no2.inquire-table-dataspace.url                    :  https://catalogue.dataspace.copernicus.eu/resto/api
 
 ! collection name:
 cso.s5p.no2.inquire-table-dataspace.collection             :  Sentinel5P

config/Copernicus/cso-s5p-so2.rc

@@ -34,7 +34,7 @@ cso.s5p.so2.inquire-table-dataspace.timerange.start        :  ${my.full-timerang
 cso.s5p.so2.inquire-table-dataspace.timerange.end          :  ${my.full-timerange.end}
 
 ! API url:
-cso.s5p.so2.inquire-table-dataspace.url                    :  https://finder.creodias.eu/resto/api
+cso.s5p.so2.inquire-table-dataspace.url                    :  https://catalogue.dataspace.copernicus.eu/resto/api
 
 ! collection name:
 cso.s5p.so2.inquire-table-dataspace.collection             :  Sentinel5P

config/tutorial/tutorial.rc

@@ -295,7 +295,7 @@ cso.tutorial.inquire-table-dataspace.timerange.start        :  2018-01-01 00:00:
 cso.tutorial.inquire-table-dataspace.timerange.end          :  2024-01-01 00:00:00
 
 ! API url:
-cso.tutorial.inquire-table-dataspace.url                    :  https://finder.creodias.eu/resto/api
+cso.tutorial.inquire-table-dataspace.url                    :  https://catalogue.dataspace.copernicus.eu/resto/api
 
 ! collection name:
 cso.tutorial.inquire-table-dataspace.collection             :  Sentinel5P

doc/source/conf.py

@@ -23,7 +23,7 @@ copyright = "2020-2024, Arjo Segers"
 author = "Arjo Segers"
 
 # The full version, including alpha/beta/rc tags
-release = "v2.7.1"
+release = "v2.7.2"
 
 
 # -- General configuration ---------------------------------------------------

py/cso_dataspace.py

@@ -15,6 +15,11 @@
 # 2024-01, Arjo Segers
 #   Fixed error trap on corrupted zip file.
 #
+# 2024-04, Arjo Segers
+#   Updated comment on default DataSpace OpenSearch ur.
+#   Changed order of east/south in box selection.
+#   Sort inquiry table by orbit number.
+#
 
 ########################################################################
 ###
@@ -127,6 +132,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
     is used as that was the first that worked as needed;
     in future, the `STAC product catalog <https://documentation.dataspace.copernicus.eu/APIs/STAC.html>`_
     might be used.
+    See also the `OpenSearch Description <https://catalogue.dataspace.copernicus.eu/resto/api/collections/Sentinel5P/describe.xml>`_
+    for the various parameters that the API accepts.
 
     A query is sent to search for products that are available
     for a certain time and overlap with a specified region.
@@ -139,7 +146,7 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
 
     Specify the base url of the API::
 
-      <rcbase>.url              :  https://finder.creodias.eu/resto/api
+      <rcbase>.url              :  https://catalogue.dataspace.copernicus.eu/resto/api
 
     Define the collection name with::
 
@@ -219,6 +226,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
 
         # combine into search url:
         search_url = f"{api_url}/collections/{collection}/search.json"
+        # info ...
+        logging.info(f"{indent}search url   : {search_url}")
 
         # time range:
         t1 = self.GetSetting("timerange.start", totype="datetime")
@@ -245,7 +254,7 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
                 f"{indent}area         : [{west:.2f},{east:.2f}] x [{south:.2f},{north:.2f}]"
             )
             # box parameter:
-            box = f"{west},{east},{south},{north}"
+            box = f"{west},{south},{east},{north}"
         else:
             # info ...
             logging.info(f"{indent}area         : no")
@@ -472,6 +481,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
                 os.makedirs(dirname)
             # endif
         # endif
+        # sort columns by orbit number:
+        output_df.sort_values("orbit")
         # write:
         output_df.to_csv(output_file, sep=";", index=False)