Patch 1.6.2

app/run_snow_annual_map.py

@@ -87,6 +87,9 @@ def main(argv):
 
     processing_id = str(tile_id + "_" + datetime_to_str(date_start) + "_" + datetime_to_str(date_stop))
     path_out = op.join(output_dir, processing_id)
+    if not os.path.exists(path_out):
+        logging.info("Create directory {} ...".format(path_out))
+        os.makedirs(path_out)
     logging.debug("Path_out is: {}", path_out)
 
     path_tmp = str(params.get("path_tmp", os.path.join(path_out,"tmp")))
@@ -109,6 +112,9 @@ def main(argv):
     use_densification = params.get("use_densification", False)
     if use_densification:
         densification_path_list = params.get("densification_products_list", [])
+    else:
+        densification_path_list = []
+
 
     log = params.get("log", True)
     if log:
@@ -219,8 +225,6 @@ def main(argv):
     os.remove(smod_file)
     os.remove(sod_file)
 
-    logging.info("End run_snow_annual_map.py")
-
 
 def create_snow_annual_map_metadata(product_list, path_out):
     # Compute and create the content for the product metadata file.

python/s2snow/version.py

@@ -20,4 +20,4 @@
 # limitations under the License.
 #
 
-VERSION = "1.6"
+VERSION = "1.6.2"

test/CMakeLists.txt

@@ -186,6 +186,25 @@ 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_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
+  "T31TCH"
+  "[/work/OT/siaa/Theia/Neige/TEST/Data-LIS-1.6/Input-Data-Test/SNOW_PRODUCTS/SENTINEL2A_20180101-105435-457_L2A_T31TCH_D_V1-4,/work/OT/siaa/Theia/Neige/TEST/Data-LIS-1.6/Input-Data-Test/SNOW_PRODUCTS/SENTINEL2A_20180131-105416-437_L2A_T31TCH_D_V1-4]"
+  "${OUTPUT_TEST_SNOW_ANNUAL_MAP_WITHOUT_DENSIFICATION}"
+  "01/01/2018"
+  "31/01/2018"
+  "--date_margin=10"
+  "--nb_threads=8"
+  "--debug"
+  )
+
+add_test(NAME snow_annual_without_densification_map_test
+  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/app/run_snow_annual_map.py
+    "${OUTPUT_TEST_SNOW_ANNUAL_MAP_WITHOUT_DENSIFICATION}/snow_annual_map.json"
+     )
+  set_tests_properties(snow_annual_without_densification_map_test PROPERTIES DEPENDS snow_annual_without_densification_map_json_builder_test)
+
 # add_test(NAME compare_preprocessing_output_test
 #   COMMAND ${CMAKE_COMMAND} -E compare_files
 #   "${OUTPUT_TEST}/landsat_bassies_srtm.tif"