TNO Intern

Skip to content
Commits on Source (2)
...@@ -333,3 +333,8 @@ Fixed creation of super-observations on local domain. ...@@ -333,3 +333,8 @@ Fixed creation of super-observations on local domain.
py/cso_superobs.py py/cso_superobs.py
v2.7.2
~~~~~~
Updated url of DataSpace OpenSearch API.
...@@ -34,7 +34,7 @@ cso.s5p.co.inquire-table-dataspace.timerange.start : ${my.full-timerange ...@@ -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} cso.s5p.co.inquire-table-dataspace.timerange.end : ${my.full-timerange.end}
! API url: ! 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: ! collection name:
cso.s5p.co.inquire-table-dataspace.collection : Sentinel5P cso.s5p.co.inquire-table-dataspace.collection : Sentinel5P
......
...@@ -34,7 +34,7 @@ cso.s5p.hcho.inquire-table-dataspace.timerange.start : ${my.full-timeran ...@@ -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} cso.s5p.hcho.inquire-table-dataspace.timerange.end : ${my.full-timerange.end}
! API url: ! 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: ! collection name:
cso.s5p.hcho.inquire-table-dataspace.collection : Sentinel5P cso.s5p.hcho.inquire-table-dataspace.collection : Sentinel5P
......
...@@ -34,7 +34,7 @@ cso.s5p.no2.inquire-table-dataspace.timerange.start : ${my.full-timerang ...@@ -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} cso.s5p.no2.inquire-table-dataspace.timerange.end : ${my.full-timerange.end}
! API url: ! 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: ! collection name:
cso.s5p.no2.inquire-table-dataspace.collection : Sentinel5P cso.s5p.no2.inquire-table-dataspace.collection : Sentinel5P
......
...@@ -34,7 +34,7 @@ cso.s5p.so2.inquire-table-dataspace.timerange.start : ${my.full-timerang ...@@ -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} cso.s5p.so2.inquire-table-dataspace.timerange.end : ${my.full-timerange.end}
! API url: ! 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: ! collection name:
cso.s5p.so2.inquire-table-dataspace.collection : Sentinel5P cso.s5p.so2.inquire-table-dataspace.collection : Sentinel5P
......
...@@ -295,7 +295,7 @@ cso.tutorial.inquire-table-dataspace.timerange.start : 2018-01-01 00:00: ...@@ -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 cso.tutorial.inquire-table-dataspace.timerange.end : 2024-01-01 00:00:00
! API url: ! 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: ! collection name:
cso.tutorial.inquire-table-dataspace.collection : Sentinel5P cso.tutorial.inquire-table-dataspace.collection : Sentinel5P
......
...@@ -23,7 +23,7 @@ copyright = "2020-2024, Arjo Segers" ...@@ -23,7 +23,7 @@ copyright = "2020-2024, Arjo Segers"
author = "Arjo Segers" author = "Arjo Segers"
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = "v2.7.1" release = "v2.7.2"
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
# 2024-01, Arjo Segers # 2024-01, Arjo Segers
# Fixed error trap on corrupted zip file. # 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): ...@@ -127,6 +132,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
is used as that was the first that worked as needed; 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>`_ in future, the `STAC product catalog <https://documentation.dataspace.copernicus.eu/APIs/STAC.html>`_
might be used. 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 A query is sent to search for products that are available
for a certain time and overlap with a specified region. for a certain time and overlap with a specified region.
...@@ -139,7 +146,7 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc): ...@@ -139,7 +146,7 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
Specify the base url of the API:: 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:: Define the collection name with::
...@@ -219,6 +226,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc): ...@@ -219,6 +226,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
# combine into search url: # combine into search url:
search_url = f"{api_url}/collections/{collection}/search.json" search_url = f"{api_url}/collections/{collection}/search.json"
# info ...
logging.info(f"{indent}search url : {search_url}")
# time range: # time range:
t1 = self.GetSetting("timerange.start", totype="datetime") t1 = self.GetSetting("timerange.start", totype="datetime")
...@@ -245,7 +254,7 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc): ...@@ -245,7 +254,7 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
f"{indent}area : [{west:.2f},{east:.2f}] x [{south:.2f},{north:.2f}]" f"{indent}area : [{west:.2f},{east:.2f}] x [{south:.2f},{north:.2f}]"
) )
# box parameter: # box parameter:
box = f"{west},{east},{south},{north}" box = f"{west},{south},{east},{north}"
else: else:
# info ... # info ...
logging.info(f"{indent}area : no") logging.info(f"{indent}area : no")
...@@ -472,6 +481,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc): ...@@ -472,6 +481,8 @@ class CSO_DataSpace_Inquire(utopya.UtopyaRc):
os.makedirs(dirname) os.makedirs(dirname)
# endif # endif
# endif # endif
# sort columns by orbit number:
output_df.sort_values("orbit")
# write: # write:
output_df.to_csv(output_file, sep=";", index=False) output_df.to_csv(output_file, sep=";", index=False)
......