TNO Intern

Commit 38eaff06 authored by Arjo Segers's avatar Arjo Segers
Browse files

Merge branch 'update-api' into 'master' 

Update api

See merge request !22
parents aba71ba5 6dbec3e4

CHANGELOG

+22 −0
Original line number Diff line number Diff line
@@ -549,3 +549,25 @@ Plot pixels als polygons in case track information is not present. 
  src/cso/cso_plot.py





v2.15

-----



Updates for access to Copernicus DataSpace: use STAC API to inquire, and download from S3 buckets.

	src/cso/cso_dataspace.py

	src/cso/cso_s5p.py

	config/tutorial/tutorial.rc

	pyproject.toml



Updated documentation.

	doc/source/s5p-no2.rst

	src/cso/cso_colocate.py

	src/cso/cso_file.py

	src/cso/cso_gridded.py

	src/cso/cso_mapping.py

	src/cso/cso_pal.py

	src/cso/cso_regions.py

	src/cso/cso_superobs.py

	src/cso/cso_tools.py

	src/cso/cso_viirs.py

	src/rc.py

	src/utopya/utopya_tools.py

config/tutorial/tutorial.rc

+5 −16
Original line number Diff line number Diff line
@@ -301,21 +301,13 @@ VIRTUAL_ENV : 
! full time range:

cso.tutorial.inquire-table-dataspace.timerange.start        :  2018-01-01 00:00:00

cso.tutorial.inquire-table-dataspace.timerange.end          :  2025-01-01 00:00:00

!! ... testing ...

!cso.tutorial.inquire-table-dataspace.timerange.start        :  2018-06-01 00:00:00

!cso.tutorial.inquire-table-dataspace.timerange.end          :  2018-07-01 00:00:00



! API url:

cso.tutorial.inquire-table-dataspace.url                    :  https://catalogue.dataspace.copernicus.eu/resto/api

cso.tutorial.inquire-table-dataspace.url                    :  https://stac.dataspace.copernicus.eu/v1



! collection name:

cso.tutorial.inquire-table-dataspace.collection             :  Sentinel5P



! product type, always 10 characters!

!   L2__NO2___

!   L2__CO____

!   ...

cso.tutorial.inquire-table-dataspace.producttype            :  L2__NO2___

cso.tutorial.inquire-table-dataspace.collections             :  sentinel-5p-l2-no2-rpro \

                                                                sentinel-5p-l2-no2-offl



! target area;

!!~ empty for no limitation:
@@ -323,9 +315,6 @@ cso.tutorial.inquire-table-dataspace.producttype : L2__NO2___ 
!~ domain specified as:  west,south,east,north

cso.tutorial.inquire-table-dataspace.area                   :  ${my.region.west},${my.region.south},${my.region.east},${my.region.north}



! template for download url given "{product_id}":

cso.tutorial.inquire-table-dataspace.download_url           :  https://zipper.dataspace.copernicus.eu/odata/v1/Products({product_id})/$value



! output table, date of today:

cso.tutorial.inquire-table-dataspace.output.file            :  ${my.work}/Copernicus/Copernicus_S5p_NO2_dataspace__%Y-%m-%d.csv
@@ -339,7 +328,7 @@ cso.tutorial.inquire-plot.renew : True 
cso.tutorial.inquire-plot.file                     :  ${cso.tutorial.inquire-table-dataspace.output.file}

!!~ specify dates ("yyyy-mm-dd") to use historic tables,

!!  default is table of today:

!cso.tutorial.inquire-plot.filedate                 :  2022-01-18

!cso.tutorial.inquire-plot.filedate                 :  2026-03-11



! annote:

cso.tutorial.inquire-plot.title                    :  S5p/NO2 %Y-%m-%d
@@ -371,7 +360,7 @@ cso.tutorial.convert.timerange.end : ${my.timerange.end} 
! listing of available source files,  created by 'inquire' job:

cso.tutorial.convert.inquire.file                   :  ${my.work}/Copernicus/Copernicus_S5p_NO2_dataspace__%Y-%m-%d.csv

!!~ historic inquire ...

!cso.tutorial.convert.inquire.filedate               :  2024-01-18

!cso.tutorial.convert.inquire.filedate               :  2026-03-25



! selection keyword:

my.tutorial.selection                                :  C03

doc/source/history.rst

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ A summary of the versions and changes. 
* | *v2.14*

  | Plot pixels als polygons in case track information is not present.

  

* | *v2.15*

  | Updates for access to Copernicus DataSpace: use STAC API to inquire, and download from S3 buckets.





To be done

==========

doc/source/s5p-no2.rst

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ This is used to obtain the alternative retrieval and tropospheric averaging kern 
scalled versions of the original variables:



.. math::

    :nowrap:



     \begin{eqnarray}

       \hat{\mathbf{y}}_r(\hat{\mathbf{x}}_a)      &=& \frac{M^{trop}}{\hat{M}^{trop}(\hat{\mathbf{x}}_a)}\ \mathbf{y}_r \\

       \hat{\mathbf{A}}^{trop}(\hat{\mathbf{x}}_a) &=& \frac{M^{trop}}{\hat{M}^{trop}(\hat{\mathbf{x}}_a)}\ \mathbf{A}^{trop} \\
@@ -121,6 +123,8 @@ scalled versions of the original variables: 
A simulation of the retrieval from the same model concentrations becomes:



.. math::

    :nowrap:



    \begin{eqnarray}

      \hat{\mathbf{y}}_s(\hat{\mathbf{x}}_a)

        &=& \hat{\mathbf{A}}^{trop}(\hat{\mathbf{x}}_a)\ \mathbf{V}\mathbf{G}\ \hat{\mathbf{x}}_a \\

pyproject.toml

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" 


[project]

name = "cso"

version = "2.14"

version = "2.15"

authors = [

    { name = "Arjo Segers" },

    { name = "Lewis Blake" },
@@ -38,6 +38,9 @@ dependencies = [ 
    "scipy >=1.1.0",

    "earthaccess",

    "requests",

    "pystac",

    "pystac_client",

    "boto3",

    "typer",

    "python-magic",

]