Commit 06a09dcd authored by Lozac'h Loic's avatar Lozac'h Loic
Browse files

Update Dataspace Copernicus Download

No related merge requests found
Showing with 19 additions and 35 deletions
+19 -35
...@@ -13,9 +13,5 @@ source <(cat ${CONF} | sed -e '/^#/d;/^\s*$/d' -e "s/'/'\\\''/g" -e "s/=\(.*\)/ ...@@ -13,9 +13,5 @@ source <(cat ${CONF} | sed -e '/^#/d;/^\s*$/d' -e "s/'/'\\\''/g" -e "s/=\(.*\)/
sed -i "s|SCIHUB_LOGIN|${SCIHUB_LOGIN}|" ${EOYML} sed -i "s|SCIHUB_LOGIN|${SCIHUB_LOGIN}|" ${EOYML}
sed -i "s|SCIHUB_PASSWD|${SCIHUB_PASSWD}|" ${EOYML} sed -i "s|SCIHUB_PASSWD|${SCIHUB_PASSWD}|" ${EOYML}
sed -i "s|PEPS_LOGIN|${PEPS_LOGIN}|" ${EOYML}
sed -i "s|PEPS_PASSWD|${PEPS_PASSWD}|" ${EOYML}
sed -i "s|THEIA_LOGIN|${THEIA_LOGIN}|" ${EOYML} sed -i "s|THEIA_LOGIN|${THEIA_LOGIN}|" ${EOYML}
sed -i "s|THEIA_PASSWD|${THEIA_PASSWD}|" ${EOYML} sed -i "s|THEIA_PASSWD|${THEIA_PASSWD}|" ${EOYML}
# sed -i "sµUSGS_LOGINµ${USGS_LOGIN}µ" ${EOYML} \ No newline at end of file
# sed -i "sµUSGS_PASSWDµ${USGS_PASSWD}µ" ${EOYML}
\ No newline at end of file
...@@ -3,14 +3,10 @@ DATAPATH= ...@@ -3,14 +3,10 @@ DATAPATH=
#directory to save database #directory to save database
DBPATH= DBPATH=
#SCIHUB credentials #Copernicus Dataspace credentials
SCIHUB_LOGIN= SCIHUB_LOGIN=
SCIHUB_PASSWD= SCIHUB_PASSWD=
#PEPS credentials
PEPS_LOGIN=
PEPS_PASSWD=
#THEIA credentials #THEIA credentials
THEIA_LOGIN= THEIA_LOGIN=
THEIA_PASSWD= THEIA_PASSWD=
...@@ -29,8 +29,7 @@ user@machine:~/theiacesprod$ git clone https://gitlab.irstea.fr/loic.lozach/thei ...@@ -29,8 +29,7 @@ user@machine:~/theiacesprod$ git clone https://gitlab.irstea.fr/loic.lozach/thei
user@machine:~/theiacesprod$ gedit config.ini user@machine:~/theiacesprod$ gedit config.ini
``` ```
Dans le dossier projet, ouvrir le fichier config.ini et modifier les valeurs des variables DATAPATH et DBPATH, pour le dossier d'accès à vos données et le dossier de sauvegarde de la base de données, ainsi que les logins et mots de passe de vos comptes sur les sites distributeurs des images SENTINEL: Dans le dossier projet, ouvrir le fichier config.ini et modifier les valeurs des variables DATAPATH et DBPATH, pour le dossier d'accès à vos données et le dossier de sauvegarde de la base de données, ainsi que les logins et mots de passe de vos comptes sur les sites distributeurs des images SENTINEL:
- SCIHUB : [Copernicus Open Access Hub](https://scihub.copernicus.eu/dhus/#/home) - SCIHUB : [The Copernicus Data Space ](https://dataspace.copernicus.eu/)
- PEPS : [Plateforme d'Exploitation des Produits Sentinel](https://peps.cnes.fr/rocket/#/home)
- THEIA : [Produits à valeur ajoutée et algorithmes pour les surfaces continentales](https://theia.cnes.fr/atdistrib/rocket/#/home) - THEIA : [Produits à valeur ajoutée et algorithmes pour les surfaces continentales](https://theia.cnes.fr/atdistrib/rocket/#/home)
A l’intérieur de l’image docker, votre répertoire de données DATAPATH sera accessible dans /data. A l’intérieur de l’image docker, votre répertoire de données DATAPATH sera accessible dans /data.
...@@ -196,37 +195,36 @@ usage: download_service.py [-h] {eodag,cds} ... ...@@ -196,37 +195,36 @@ usage: download_service.py [-h] {eodag,cds} ...
Download services Download services
positional arguments: positional arguments:
{eodag,cds} Choose server {eodag,dataspace} Choose server
eodag Download Sentinel 1 and 2 through Eodag API eodag Download Sentinel2-L3A (over FRANCE) through Eodag API with Theia provider
cds Download ERA5 temperature image file according to S1 dates dataspace Download Sentinel1-GRD and Sentinel2-L2A with Copernicus Dataspace SentinelHub
``` ```
Eodag is an API to wrap multiple imagery provider. Eodag is an API to wrap multiple imagery provider.
``` ```
otbuser@39a616d684e8:/data$ download_service.py eodag -h otbuser@39a616d684e8:/data$ download_service.py eodag -h
usage: download_service.py eodag [-h] -downdir DOWNDIR [-prod {0,1,2}] -tile TILE -sd SD -ed ED usage: download_service.py eodag [-h] -downdir DOWNDIR -tile TILE -sd SD -ed ED
optional arguments: optional arguments:
-h, --help show this help message and exit -h, --help show this help message and exit
-downdir DOWNDIR Download directory -downdir DOWNDIR Download directory
-prod {0,1,2} Product type to download, choices 0=S1-GRD,1=S2-L2A,2=S2-L3A (FRANCE)
-tile TILE S2 Tile name, ex. T30UVU -tile TILE S2 Tile name, ex. T30UVU
-sd SD Starting date S1, ex. 2020-08-31 -sd SD Starting date S1, ex. 2020-08-31
-ed ED Ending date S1, ex. 2020-09-31 -ed ED Ending date S1, ex. 2020-09-31
``` ```
CDS (Climate Data Store) is used for Freeze Detection processes Copernicus Dataspace
``` ```
otbuser@39a616d684e8:/data$ download_service.py cds -h otbuser@39a616d684e8:/data$ download_service.py dataspace -h
usage: download_service.py cds [-h] -s1orthodir S1ORTHODIR [-gap {3m,6d}] -outdir OUTDIR usage: download_service.py dataspace [-h] -downdir DOWNDIR [-prod {s1,s2}] -tile TILE -sd SD -ed ED
optional arguments: optional arguments:
-h, --help show this help message and exit -h, --help show this help message and exit
-s1orthodir S1ORTHODIR -downdir DOWNDIR Download directory
Orthorectified Sentinel1 directory -prod {s1,s2} Product type to download, choices s1=S1-GRD, s2=S2-L2A
-gap {3m,6d} [Optional] Query ERA5-Land reanalysis collection with 3 month gap (default -tile TILE S2 Tile name, ex. T30UVU
'3m') OR ERA5 basic reanalysis collection with 6 days gap ('6d') -sd SD Starting date S1, ex. 2020-08-31
-outdir OUTDIR Output directory -ed ED Ending date S1, ex. 2020-09-31
``` ```
## Calibration Service ## Calibration Service
......
...@@ -41,9 +41,9 @@ class SentinelEodag(): ...@@ -41,9 +41,9 @@ class SentinelEodag():
if yaml_content["scihub"]["api"]["credentials"]["username"] == "": if yaml_content["scihub"]["api"]["credentials"]["username"] == "":
logger.error(f"Credentials not set for scihub provider in resources/user_conf.yml") logger.error(f"Credentials not set for scihub provider in resources/user_conf.yml")
raise raise
if yaml_content["peps"]["auth"]["credentials"]["username"] == "": # if yaml_content["peps"]["auth"]["credentials"]["username"] == "":
logger.error(f"Credentials not set for peps provider in resources/user_conf.yml") # logger.error(f"Credentials not set for peps provider in resources/user_conf.yml")
raise # raise
if yaml_content["theia"]["auth"]["credentials"]["ident"] == "": if yaml_content["theia"]["auth"]["credentials"]["ident"] == "":
logger.error(f"Credentials not set for theia provider in resources/user_conf.yml") logger.error(f"Credentials not set for theia provider in resources/user_conf.yml")
raise raise
......
...@@ -23,12 +23,6 @@ scihub: ...@@ -23,12 +23,6 @@ scihub:
password: 'SCIHUB_PASSWD' password: 'SCIHUB_PASSWD'
endpoint: https://apihub.copernicus.eu/apihub/ endpoint: https://apihub.copernicus.eu/apihub/
extract: False extract: False
peps:
priority: 1
auth:
credentials:
username: PEPS_LOGIN
password: 'PEPS_PASSWD'
theia: theia:
priority: 1 priority: 1
auth: auth:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment