Commit 67bf1696 authored by Aurore Dupuis's avatar Aurore Dupuis

Merge branch 'release-1.6' into 'master'

Release 1.6.3

See merge request !48
parents dae76deb 814ad696
......@@ -115,11 +115,15 @@ class snow_product:
if sub_file.upper().endswith("_SNW_R2.TIF"):
self.is_extracted = True
self.snow_mask = op.join(absoluteFilename, sub_file)
if sub_file.upper().endswith("_SNW_XS.TIF"):
self.is_extracted = True
self.snow_mask = op.join(absoluteFilename, sub_file)
if sub_file.upper() == "LIS_PRODUCTS":
self.is_extracted = True
self.extracted_product = op.join(absoluteFilename, sub_file)
self.snow_mask = op.join(self.extracted_product, "LIS_SEB.TIF")
self.metadata_file = op.join(absoluteFilename,
self.product_name + "_MTD_ALL.xml")
......
......@@ -20,4 +20,4 @@
# limitations under the License.
#
VERSION = "1.6.2"
VERSION = "1.6.3"
......@@ -186,6 +186,28 @@ add_test(NAME snow_annual_map_compare_smod_test
)
set_tests_properties(snow_annual_map_compare_smod_test PROPERTIES DEPENDS snow_annual_map_test)
set(OUTPUT_TEST_SNOW_ANNUAL_MAP_MUSCATE ${OUTPUT_TEST}/SNOW_ANNUAL_MAP_MUSCATE)
add_test(NAME snow_annual_map_muscate_json_builder_test
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/build_snow_annual_map_json.py
"T31TDJ"
"[/work/OT/siaa/Theia/Neige/TEST/Data-LIS-1.6/Input-Data-Test/SNOW_PRODUCTS/SENTINEL2A_20200410-105852-276_L2B-SNOW_T31TDJ_C_V1-7]"
"${OUTPUT_TEST_SNOW_ANNUAL_MAP_MUSCATE}"
"01/09/2019"
"31/08/2020"
"--date_margin=0"
"--nb_threads=8"
"--use_densification"
"--densification_products_list=[/work/OT/siaa/Theia/Neige/TEST/Data-LIS-1.6/Input-Data-Test/SNOW_PRODUCTS/LANDSAT8-OLITIRS-XS_20200410-103540-665_L2B-SNOW_T31TDJ_C_V1-7]"
"--debug"
)
add_test(NAME snow_annual_map_muscate_test
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/run_snow_annual_map.py
"${OUTPUT_TEST_SNOW_ANNUAL_MAP_MUSCATE}/snow_annual_map.json"
)
set_tests_properties(snow_annual_map_muscate_test PROPERTIES DEPENDS snow_annual_map_muscate_json_builder_test)
set_tests_properties(snow_annual_map_muscate_test PROPERTIES TIMEOUT 3000)
set(OUTPUT_TEST_SNOW_ANNUAL_MAP_WITHOUT_DENSIFICATION ${OUTPUT_TEST}/SNOW_ANNUAL_MAP_WITHOUT_DENSIFICATION)
add_test(NAME snow_annual_without_densification_map_json_builder_test
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/build_snow_annual_map_json.py
......
Markdown is supported
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