Skip to content

Commit dc8dc87

Browse files
telespazio-timtelespazio-tim
committed
Fix url parameters for search on creodias
1 parent a8f068c commit dc8dc87

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

‎sen2like/conf/config.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ url_parameters_pattern_Landsat9 = {base_url}/{mission}/{path}/{row}
4141
; location_Landsat8 = path={path}&row={row}&productType=L1TP
4242
; location_Landsat9 = path={path}&row={row}&productType=L1TP
4343
; location_Sentinel2 = productIdentifier=%25T{tile}%25
44-
; url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=1000&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
44+
; url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=1000&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
4545
; thumbnail_property = properties/productIdentifier
4646
; cloud_cover_property = properties/cloudCover
4747
; gml_geometry_property = properties/gmlgeometry
@@ -56,7 +56,7 @@ url_parameters_pattern_Landsat9 = {base_url}/{mission}/{path}/{row}
5656
# remote S2 part
5757
;base_url_s2 = https://datahub.creodias.eu/resto/api/collections
5858
;location_Sentinel2 = productIdentifier=%25T{tile}%25
59-
;url_parameters_pattern = {base_url_s2}/{mission}/search.json?maxRecords=1000&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
59+
;url_parameters_pattern = {base_url_s2}/{mission}/search.json?maxRecords=1000&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
6060
;thumbnail_property = properties/productIdentifier
6161
;cloud_cover_property = properties/cloudCover
6262
;gml_geometry_property = properties/gmlgeometry
@@ -71,7 +71,7 @@ url_parameters_pattern_Landsat9 = {base_url}/{mission}/{path}/{row}
7171
;base_url_landsat = https://datahub.creodias.eu/resto/api/collections
7272
;location_Landsat8 = path={path}&row={row}&productType=L1TP
7373
;location_Landsat9 = path={path}&row={row}&productType=L1TP
74-
;url_parameters_pattern = {base_url_landsat}/{mission}/search.json?maxRecords=1000&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
74+
;url_parameters_pattern = {base_url_landsat}/{mission}/search.json?maxRecords=1000&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
7575
;thumbnail_property = properties/productIdentifier
7676
;cloud_cover_property = properties/cloudCover
7777
;gml_geometry_property = properties/gmlgeometry
@@ -150,4 +150,4 @@ json_metadata = True
150150

151151
[RunTime]
152152
dx = 0
153-
dy = 0
153+
dy = 0

‎sen2like/conf/config.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<!-- <location_Landsat8>path={path}&amp;row={row}&amp;productType=L1TP</location_Landsat8>-->
3838
<!-- <location_Landsat9>path={path}&amp;row={row}&amp;productType=L1TP</location_Landsat9>-->
3939
<!-- <location_Sentinel2>productIdentifier=%25T{tile}%25</location_Sentinel2>-->
40-
<!-- <url_parameters_pattern>{base_url}/{mission}/search.json?maxRecords=100&amp;_pretty=true&amp;cloudCover=%5B0%2C{cloud_cover}%5D&amp;startDate={start_date}&amp;completionDate={end_date}&amp;sortParam=startDate&amp;sortOrder=ascending&amp;status=all&amp;{location}&amp;dataset=ESA-DATASET</url_parameters_pattern>-->
40+
<!-- <url_parameters_pattern>{base_url}/{mission}/search.json?maxRecords=100&amp;cloudCover=%5B0%2C{cloud_cover}%5D&amp;startDate={start_date}&amp;completionDate={end_date}&amp;sortParam=startDate&amp;sortOrder=ascending&amp;status=all&amp;{location}&amp;dataset=ESA-DATASET</url_parameters_pattern>-->
4141
<!-- <thumbnail_property>properties/productIdentifier</thumbnail_property>-->
4242
<!-- <cloud_cover_property>properties/cloudCover</cloud_cover_property>-->
4343
<!-- <gml_geometry_property>properties/gmlgeometry</gml_geometry_property>-->
@@ -48,7 +48,7 @@
4848
<!-- <location_Sentinel2>productIdentifier=%25T{tile}%25</location_Sentinel2>-->
4949
<!-- <url_parameters_pattern_Landsat8>{base_url_landsat}/{mission}/{path}/{row}</url_parameters_pattern_Landsat8>-->
5050
<!-- <url_parameters_pattern_Landsat9>{base_url_landsat}/{mission}/{path}/{row}</url_parameters_pattern_Landsat9>-->
51-
<!-- <url_parameters_pattern>{base_url_s2}/{mission}/search.json?maxRecords=100&amp;_pretty=true&amp;cloudCover=%5B0%2C{cloud_cover}%5D&amp;startDate={start_date}&amp;completionDate={end_date}&amp;sortParam=startDate&amp;sortOrder=ascending&amp;status=all&amp;{location}&amp;dataset=ESA-DATASET</url_parameters_pattern>-->
51+
<!-- <url_parameters_pattern>{base_url_s2}/{mission}/search.json?maxRecords=100&amp;cloudCover=%5B0%2C{cloud_cover}%5D&amp;startDate={start_date}&amp;completionDate={end_date}&amp;sortParam=startDate&amp;sortOrder=ascending&amp;status=all&amp;{location}&amp;dataset=ESA-DATASET</url_parameters_pattern>-->
5252
<!-- <thumbnail_property>properties/productIdentifier</thumbnail_property>-->
5353
<!-- <cloud_cover_property>properties/cloudCover</cloud_cover_property>-->
5454
<!-- <gml_geometry_property>properties/gmlgeometry</gml_geometry_property>-->
@@ -60,7 +60,7 @@
6060
<!-- <url_parameters_pattern_Sentinel2>{base_url_s2}/{mission}/{tile}</url_parameters_pattern_Sentinel2>-->
6161
<!-- <location_Landsat8>path={path}&amp;row={row}&amp;productType=L1TP</location_Landsat8>-->
6262
<!-- <location_Landsat9>path={path}&amp;row={row}&amp;productType=L1TP</location_Landsat9>-->
63-
<!-- <url_parameters_pattern>{base_url_landsat}/{mission}/search.json?maxRecords=100&amp;_pretty=true&amp;cloudCover=%5B0%2C{cloud_cover}%5D&amp;startDate={start_date}&amp;completionDate={end_date}&amp;sortParam=startDate&amp;sortOrder=ascending&amp;status=all&amp;{location}&amp;dataset=ESA-DATASET</url_parameters_pattern>-->
63+
<!-- <url_parameters_pattern>{base_url_landsat}/{mission}/search.json?maxRecords=100&amp;cloudCover=%5B0%2C{cloud_cover}%5D&amp;startDate={start_date}&amp;completionDate={end_date}&amp;sortParam=startDate&amp;sortOrder=ascending&amp;status=all&amp;{location}&amp;dataset=ESA-DATASET</url_parameters_pattern>-->
6464
<!-- <thumbnail_property>properties/productIdentifier</thumbnail_property>-->
6565
<!-- <cloud_cover_property>properties/cloudCover</cloud_cover_property>-->
6666
<!-- <gml_geometry_property>properties/gmlgeometry</gml_geometry_property>-->

‎sen2like/release-notes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Instructions to retrieve sen2cor3 software and associated documentation availabl
99
### Fix
1010

1111
* Force operational-mode parameter as first command line argument
12+
* Remove `_pretty=` parameter in the creodias catalogue URL in the default configuration as it is no more supported by datahub catalogue.
1213
* Update miniconda in [Dockerfile-base](Dockerfile-base)
1314
* Typos in sen2like project [README.md](../README.md)
1415

‎sen2like/tests/core/config.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ base_url = /data/PRODUCTS
3030
# cloud_cover = 100
3131
# location_Landsat8 = path={path}&row={row}&productType=L1TP
3232
# location_Sentinel2 = processingLevel=LEVEL1C&productIdentifier=%25{tile}%25
33-
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
33+
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
3434
# thumbnail_property = properties/productIdentifier
3535
# cloud_cover_property = properties/cloudCover
3636

‎sen2like/tests/core/downloader/config.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ base_url = https://datahub.creodias.eu/resto/api/collections
2828
cloud_cover = 100
2929
location_Landsat8 = path={path}&row={row}&productType=L1TP
3030
location_Sentinel2 = processingLevel=LEVEL1C&productIdentifier=%25{tile}%25
31-
url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
31+
url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
3232
thumbnail_property = properties/productIdentifier
3333
cloud_cover_property = properties/cloudCover
3434

‎sen2like/tests/core/file_extractor/config.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ base_url = /data/PRODUCTS
2828
# cloud_cover = 100
2929
# location_Landsat8 = path={path}&row={row}&productType=L1TP
3030
# location_Sentinel2 = processingLevel=LEVEL1C&productIdentifier=%25{tile}%25
31-
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
31+
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
3232
# thumbnail_property = properties/productIdentifier
3333
# cloud_cover_property = properties/cloudCover
3434

‎sen2like/tests/core/products/config.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ base_url = /data/PRODUCTS
3030
# cloud_cover = 100
3131
# location_Landsat8 = path={path}&row={row}&productType=L1TP
3232
# location_Sentinel2 = processingLevel=LEVEL1C&productIdentifier=%25{tile}%25
33-
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
33+
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
3434
# thumbnail_property = properties/productIdentifier
3535
# cloud_cover_property = properties/cloudCover
3636

‎sen2like/tests/s2l_processes/config.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ base_url = /data/PRODUCTS
2929
# cloud_cover = 100
3030
# location_Landsat8 = path={path}&row={row}&productType=L1TP
3131
# location_Sentinel2 = processingLevel=LEVEL1C&productIdentifier=%25{tile}%25
32-
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&_pretty=true&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
32+
# url_parameters_pattern = {base_url}/{mission}/search.json?maxRecords=100&cloudCover=%5B0%2C{cloud_cover}%5D&startDate={start_date}&completionDate={end_date}&sortParam=startDate&sortOrder=ascending&status=all&{location}&dataset=ESA-DATASET
3333
# thumbnail_property = properties/productIdentifier
3434
# cloud_cover_property = properties/cloudCover
3535

0 commit comments

Comments
 (0)