From fc565ea53c1eb5fbefcb72715375155ab0a28af4 Mon Sep 17 00:00:00 2001
From: Hamed Elgizery <hamedashraf2004@gmail.com>
Date: Wed, 28 Aug 2024 23:01:35 +0300
Subject: [PATCH] i.sentinel.download: manual / options descriptions patch
 (#1191)

* Add missing closing tags

* Use &lt; instead of tags

* Update options descriptions

* Add footprint to searching by id

* Fix missing closing tag
---
 .../i.sentinel.download/i.sentinel.download.html         | 5 +++--
 .../i.sentinel.download/i.sentinel.download.py           | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.html b/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.html
index 15c732c443..579f27bd4b 100644
--- a/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.html
+++ b/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.html
@@ -197,7 +197,7 @@ <h3>List filtered products</h3>
 g.region n=42 w=12 s=41 e=13 res=0:01 -p
 i.sentinel.download -l settings=credentials.txt producttype=S2MSI2A start=2018-01-01 end=2018-12-31 clouds=1 footprints=s2_scenes_footprints
 
-Writing footprints into <s2_scenes_footprints>...
+Writing footprints into &lt;s2_scenes_footprints&lt;...
 197 scene(s) found.
 [...]
 S2B_MSIL2A_20180210T100139_N9999_R122_T32TQM_20221022T182154 2018-02-10T10:01:39   0% S2MSI2A 0.98 GB
@@ -207,6 +207,7 @@ <h3>List filtered products</h3>
 S2A_MSIL2A_20181023T100051_N9999_R122_T33TTG_20221023T032324 2018-10-23T10:00:51   0% S2MSI2A 0.99 GB
 S2A_MSIL2A_20181205T101401_N9999_R022_T32TQM_20221022T180259 2018-12-05T10:14:01   0% S2MSI2A 625.52 MB
 [...]
+</pre></div>
 <p>
 Find Sentinel-2 L1C products (S2MSI1C) of <b>last 60 days</b> (default) covering current computation region extent:
 
@@ -282,7 +283,7 @@ <h3>Download Sentinel products by ID</h3>
 
 <div class="code"><pre>
 i.sentinel.download settings=credentials.txt id=S2B_MSIL2A_20180210T100139_N9999_R122_T32TQM_20221022T182154 output=s2_data/
-<pre></div>
+</pre></div>
 
 <h2>REQUIREMENTS</h2>
 
diff --git a/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.py b/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.py
index 036c5f0244..1a954a6fa1 100755
--- a/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.py
+++ b/src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.py
@@ -39,7 +39,6 @@
 # %option G_OPT_V_OUTPUT
 # % key: footprints
 # % description: Name for output vector map with footprints
-# % label: Only supported for download from ESA_Copernicus Open Access Hub
 # % required: no
 # % guisection: Output
 # %end
@@ -53,7 +52,6 @@
 # % key: area_relation
 # % type: string
 # % description: Spatial relation of footprint to AOI
-# % label: ESA Copernicus Open Access Hub allows all three, USGS Earth Explorer only 'Intersects' option
 # % options: Intersects,Contains,IsWithin
 # % answer: Intersects
 # % required: no
@@ -70,7 +68,6 @@
 # % key: producttype
 # % type: string
 # % description: Sentinel product type to filter
-# % label: USGS Earth Explorer only supports S2MSI1C
 # % required: no
 # % options: SLC,GRD,OCN,S2MSI1C,S2MSI2A,S3OL1EFR,S3OL1ERR,S3OL1SPC,S3SL1RBT,S3OL2WFR,S3OL2WRR,S3OL2LFR,S3OL2LRR,S3SL2LST,S3SL2FRP,S3SY2SYN,S3SY2VGP,S3SY2VG1,S3SY2V10,S3SY2AOD,S3SR2LAN
 # % answer: S2MSI2A
@@ -98,7 +95,6 @@
 # % key: query
 # % type: string
 # % description: Extra search keywords to use in the query
-# % label: USGS Earth Explorer only supports query options "identifier", "filename" (in ESA name format) or "usgs_identifier" (in USGS name format)
 # % guisection: Filter
 # %end
 # %option
@@ -113,7 +109,6 @@
 # % type: integer
 # % multiple: yes
 # % description: Relative orbit number to download (Sentinel-1: from 1 to 175; Sentinel-2: from 1 to 143; Sentinel-3: from 1 to 385)
-# % label:_Only supported by ESA Copernicus Open Access Hub.
 # % guisection: Filter
 # %end
 # %option
@@ -174,7 +169,7 @@
 # %rules
 # % requires: -b,map
 # % required: output,-l,-p
-# % excludes: id,map,area_relation,clouds,producttype,start,end,limit,query,sort,order
+# % excludes: id,map,area_relation,clouds,start,end,limit,query,sort,order
 # % excludes: -p,-l
 # %end
 
@@ -429,6 +424,8 @@ def main():
                     id=options["id"],
                     output=outdir,
                     provider=eodag_provider,
+                    producttype=options["producttype"],
+                    footprints=options["footprints"],
                 )
             )
         except CalledModuleError: