Merge pull request #175 from Deltares/clean_aggregation_area_examples…

…_folder Clean aggregation area examples folder
Deltares · Oct 16, 2023 · d808ff7 · d808ff7
2 parents 1befd34 + e5cea56
commit d808ff7
Show file tree

Hide file tree

Showing 29 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -122,3 +122,5 @@ cache
 /examples/FIAT_database
 hydromt_fiat/data/damage_functions/flooding/AllDDF_HAZUS_fractions.xlsx
 hydromt_fiat/data/damage_functions/flooding/~$AllDDF_HAZUS_fractions.xlsx
+examples/data/aggregation_zones_example/aggregation_test_1_output
+examples/data/aggregation_zones_example/aggregation_test_2_output
diff --git a/.../Aggregation_zones/accomodation_type.gpkg → .../aggregation_zones/accomodation_type.gpkg b/.../Aggregation_zones/accomodation_type.gpkg → .../aggregation_zones/accomodation_type.gpkg
diff --git a/...example/Aggregation_zones/base_zones.gpkg → ...n_zones/aggregation_zones/base_zones.gpkg b/...example/Aggregation_zones/base_zones.gpkg → ...n_zones/aggregation_zones/base_zones.gpkg
diff --git a/...es_example/Aggregation_zones/council.gpkg → ...tion_zones/aggregation_zones/council.gpkg b/...es_example/Aggregation_zones/council.gpkg → ...tion_zones/aggregation_zones/council.gpkg
diff --git a/...s_example/Aggregation_zones/land_use.gpkg → ...ion_zones/aggregation_zones/land_use.gpkg b/...s_example/Aggregation_zones/land_use.gpkg → ...ion_zones/aggregation_zones/land_use.gpkg
diff --git a/...tion_zones_example/config_aggregation.yml → .../aggregation_zones/config_aggregation.yml b/...tion_zones_example/config_aggregation.yml → .../aggregation_zones/config_aggregation.yml
diff --git a/...xample/fiat_model/exposure/buildings.gpkg → ..._zones/fiat_model/exposure/buildings.gpkg b/...xample/fiat_model/exposure/buildings.gpkg → ..._zones/fiat_model/exposure/buildings.gpkg
diff --git a/..._example/fiat_model/exposure/exposure.csv → ...on_zones/fiat_model/exposure/exposure.csv b/..._example/fiat_model/exposure/exposure.csv → ...on_zones/fiat_model/exposure/exposure.csv
diff --git a/...s_example/fiat_model/exposure/region.gpkg → ...ion_zones/fiat_model/exposure/region.gpkg b/...s_example/fiat_model/exposure/region.gpkg → ...ion_zones/fiat_model/exposure/region.gpkg
diff --git a/...ation_zones_test1/exposure/buildings.gpkg → ...ation_zones_test1/exposure/buildings.gpkg b/...ation_zones_test1/exposure/buildings.gpkg → ...ation_zones_test1/exposure/buildings.gpkg
diff --git a/...egation_zones_test1/exposure/exposure.csv → ...egation_zones_test1/exposure/exposure.csv b/...egation_zones_test1/exposure/exposure.csv → ...egation_zones_test1/exposure/exposure.csv
diff --git a/...e/aggregation_test_1_output/settings.toml → ...put/aggregation_zones_test1/settings.toml b/...e/aggregation_test_1_output/settings.toml → ...put/aggregation_zones_test1/settings.toml
diff --git a/...ut/vulnerability/vulnerability_curves.csv → ...t1/vulnerability/vulnerability_curves.csv b/...ut/vulnerability/vulnerability_curves.csv → ...t1/vulnerability/vulnerability_curves.csv
diff --git a/...ation_zones_test2/exposure/buildings.gpkg → ...ation_zones_test2/exposure/buildings.gpkg b/...ation_zones_test2/exposure/buildings.gpkg → ...ation_zones_test2/exposure/buildings.gpkg
diff --git a/...egation_zones_test2/exposure/exposure.csv → ...egation_zones_test2/exposure/exposure.csv b/...egation_zones_test2/exposure/exposure.csv → ...egation_zones_test2/exposure/exposure.csv
diff --git a/...put/aggregation_zones_test1/settings.toml → ...put/aggregation_zones_test2/settings.toml b/...put/aggregation_zones_test1/settings.toml → ...put/aggregation_zones_test2/settings.toml
diff --git a/...t1/vulnerability/vulnerability_curves.csv → ...t2/vulnerability/vulnerability_curves.csv b/...t1/vulnerability/vulnerability_curves.csv → ...t2/vulnerability/vulnerability_curves.csv
diff --git a/...put/aggregation_zones_test2/settings.toml → ...ggregation_zones/fiat_model/settings.toml b/...put/aggregation_zones_test2/settings.toml → ...ggregation_zones/fiat_model/settings.toml
diff --git a/...t2/vulnerability/vulnerability_curves.csv → ...el/vulnerability/vulnerability_curves.csv b/...t2/vulnerability/vulnerability_curves.csv → ...el/vulnerability/vulnerability_curves.csv
diff --git a/...lnerability/vulnerability_identifiers.csv → ...lnerability/vulnerability_identifiers.csv b/...lnerability/vulnerability_identifiers.csv → ...lnerability/vulnerability_identifiers.csv
diff --git a/...ion_test_1_output/exposure/buildings.gpkg → ...odel_aggregation1/exposure/buildings.gpkg b/...ion_test_1_output/exposure/buildings.gpkg → ...odel_aggregation1/exposure/buildings.gpkg
diff --git a/...ation_test_1_output/exposure/exposure.csv → ..._model_aggregation1/exposure/exposure.csv b/...ation_test_1_output/exposure/exposure.csv → ..._model_aggregation1/exposure/exposure.csv
diff --git a/...on_zones_example/fiat_model/settings.toml → ...nes/fiat_model_aggregation1/settings.toml b/...on_zones_example/fiat_model/settings.toml → ...nes/fiat_model_aggregation1/settings.toml
diff --git a/...el/vulnerability/vulnerability_curves.csv → ...n1/vulnerability/vulnerability_curves.csv b/...el/vulnerability/vulnerability_curves.csv → ...n1/vulnerability/vulnerability_curves.csv
diff --git a/...mple/test2_output/exposure/buildings.gpkg → ...odel_aggregation2/exposure/buildings.gpkg b/...mple/test2_output/exposure/buildings.gpkg → ...odel_aggregation2/exposure/buildings.gpkg
diff --git a/...xample/test2_output/exposure/exposure.csv → ..._model_aggregation2/exposure/exposure.csv b/...xample/test2_output/exposure/exposure.csv → ..._model_aggregation2/exposure/exposure.csv
diff --git a/..._zones_example/test2_output/settings.toml → ...nes/fiat_model_aggregation2/settings.toml b/..._zones_example/test2_output/settings.toml → ...nes/fiat_model_aggregation2/settings.toml
diff --git a/...ut/vulnerability/vulnerability_curves.csv → ...n2/vulnerability/vulnerability_curves.csv b/...ut/vulnerability/vulnerability_curves.csv → ...n2/vulnerability/vulnerability_curves.csv
diff --git a/tests/test_aggregation_areas.py b/tests/test_aggregation_areas.py
@@ -11,11 +11,11 @@
 from hydromt_fiat.workflows.vulnerability import Vulnerability
 
 # Load Data
-EXAMPLEDIR = Path().resolve() / "examples" / "data" / "aggregation_zones_example"
+EXAMPLEDIR = Path().resolve() / "examples" / "data" / "aggregation_zones"
 
 _cases = {
     "aggregation_test_1": {
-        "new_root": EXAMPLEDIR / "aggregation_test_1_output",
+        "new_root": EXAMPLEDIR / "fiat_model_aggregation1",
         "configuration": {
             "setup_aggregation_areas": {
                 "aggregation_area_fn": EXAMPLEDIR / "aggregation_zones" / "base_zones.gpkg",
@@ -25,7 +25,7 @@
         },
     },
     "aggregation_test_2": {
-        "new_root": EXAMPLEDIR / "aggregation_test_2_output",
+        "new_root": EXAMPLEDIR / "fiat_model_aggregation2",
         "configuration": {
             "setup_aggregation_areas": {
                 "aggregation_area_fn": [