Merge pull request #787 from j3r3m1/reorganizeWorkflowGeoindic

Reorganize module WorkflowGeoIndicators.groovy
orbisgis · Dec 2, 2022 · 6994297 · 6994297
2 parents 02421e1 + 215d07b
commit 6994297
Show file tree

Hide file tree

Showing 2 changed files with 562 additions and 671 deletions.
diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy
@@ -316,13 +316,11 @@ class WorkflowBDTopo_V2Test extends WorkflowAbstractTest {
     @Test
     void runBDTopoWorkflowWithSRID() {
         def inseeCode = communeToTest
-        def defaultParameters = [distance      : 0, distance_buffer: 0, prefixName: "",
-                                 rsu_indicators: [
-                                         indicatorUse : ["LCZ", "UTRF"],
-                                         svfSimplified: true,
-                                         mapOfWeights : ["sky_view_factor"             : 2, "aspect_ratio": 1, "building_surface_fraction": 4,
-                                                         "impervious_surface_fraction" : 0, "pervious_surface_fraction": 0,
-                                                         "height_of_roughness_elements": 3, "terrain_roughness_length": 1]]]
+        def defaultParameters = BDTopo_V2.WorkflowBDTopo_V2.extractProcessingParameters()
+
+        // Only download the data if no "indicator_use"
+        defaultParameters["rsu_indicators"]["indicatorUse"] = ["UTRF", "LCZ"]                                                       
+
         H2GIS h2GISDatabase = loadFiles(folder.absolutePath + File.separator + "roadTrafficFromBDTopoTest;AUTO_SERVER=TRUE")
         def tablesToSave = [
                 "rsu_lcz",]