From a66d0313022a3be37edb77e6cb145efb85ef0d60 Mon Sep 17 00:00:00 2001 From: Frederique Date: Mon, 16 Oct 2023 11:45:41 +0200 Subject: [PATCH 1/2] Added to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2ea28d92..1692d0be 100644 --- 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 From e5cea56da80d5f0d1e051fea90e01c42dff99ea2 Mon Sep 17 00:00:00 2001 From: Frederique Date: Mon, 16 Oct 2023 11:48:36 +0200 Subject: [PATCH 2/2] Cleaned folder structure --- .../aggregation_zones}/accomodation_type.gpkg | Bin .../aggregation_zones}/base_zones.gpkg | Bin .../aggregation_zones}/council.gpkg | Bin .../aggregation_zones}/land_use.gpkg | Bin .../config_aggregation.yml | 0 .../fiat_model/exposure/buildings.gpkg | Bin .../fiat_model/exposure/exposure.csv | 0 .../fiat_model/exposure/region.gpkg | Bin .../exposure/buildings.gpkg | Bin .../exposure/exposure.csv | 0 .../aggregation_zones_test1}/settings.toml | 0 .../vulnerability/vulnerability_curves.csv | 0 .../exposure/buildings.gpkg | Bin .../exposure/exposure.csv | 0 .../aggregation_zones_test2}/settings.toml | 0 .../vulnerability/vulnerability_curves.csv | 0 .../fiat_model}/settings.toml | 0 .../vulnerability/vulnerability_curves.csv | 0 .../vulnerability_identifiers.csv | 0 .../exposure/buildings.gpkg | Bin 385024 -> 385024 bytes .../exposure/exposure.csv | 0 .../fiat_model_aggregation1}/settings.toml | 0 .../vulnerability/vulnerability_curves.csv | 0 .../exposure/buildings.gpkg | Bin 385024 -> 385024 bytes .../exposure/exposure.csv | 0 .../fiat_model_aggregation2}/settings.toml | 0 .../vulnerability/vulnerability_curves.csv | 0 tests/test_aggregation_areas.py | 6 +++--- 28 files changed, 3 insertions(+), 3 deletions(-) rename examples/data/{aggregation_zones_example/Aggregation_zones => aggregation_zones/aggregation_zones}/accomodation_type.gpkg (100%) rename examples/data/{aggregation_zones_example/Aggregation_zones => aggregation_zones/aggregation_zones}/base_zones.gpkg (100%) rename examples/data/{aggregation_zones_example/Aggregation_zones => aggregation_zones/aggregation_zones}/council.gpkg (100%) rename examples/data/{aggregation_zones_example/Aggregation_zones => aggregation_zones/aggregation_zones}/land_use.gpkg (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/config_aggregation.yml (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/exposure/buildings.gpkg (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/exposure/exposure.csv (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/exposure/region.gpkg (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/output/aggregation_zones_test1/exposure/buildings.gpkg (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/output/aggregation_zones_test1/exposure/exposure.csv (100%) rename examples/data/{aggregation_zones_example/aggregation_test_1_output => aggregation_zones/fiat_model/output/aggregation_zones_test1}/settings.toml (100%) rename examples/data/{aggregation_zones_example/aggregation_test_1_output => aggregation_zones/fiat_model/output/aggregation_zones_test1}/vulnerability/vulnerability_curves.csv (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/output/aggregation_zones_test2/exposure/buildings.gpkg (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/output/aggregation_zones_test2/exposure/exposure.csv (100%) rename examples/data/{aggregation_zones_example/fiat_model/output/aggregation_zones_test1 => aggregation_zones/fiat_model/output/aggregation_zones_test2}/settings.toml (100%) rename examples/data/{aggregation_zones_example/fiat_model/output/aggregation_zones_test1 => aggregation_zones/fiat_model/output/aggregation_zones_test2}/vulnerability/vulnerability_curves.csv (100%) rename examples/data/{aggregation_zones_example/fiat_model/output/aggregation_zones_test2 => aggregation_zones/fiat_model}/settings.toml (100%) rename examples/data/{aggregation_zones_example/fiat_model/output/aggregation_zones_test2 => aggregation_zones/fiat_model}/vulnerability/vulnerability_curves.csv (100%) rename examples/data/{aggregation_zones_example => aggregation_zones}/fiat_model/vulnerability/vulnerability_identifiers.csv (100%) rename examples/data/{aggregation_zones_example/aggregation_test_1_output => aggregation_zones/fiat_model_aggregation1}/exposure/buildings.gpkg (99%) rename examples/data/{aggregation_zones_example/aggregation_test_1_output => aggregation_zones/fiat_model_aggregation1}/exposure/exposure.csv (100%) rename examples/data/{aggregation_zones_example/fiat_model => aggregation_zones/fiat_model_aggregation1}/settings.toml (100%) rename examples/data/{aggregation_zones_example/fiat_model => aggregation_zones/fiat_model_aggregation1}/vulnerability/vulnerability_curves.csv (100%) rename examples/data/{aggregation_zones_example/test2_output => aggregation_zones/fiat_model_aggregation2}/exposure/buildings.gpkg (97%) rename examples/data/{aggregation_zones_example/test2_output => aggregation_zones/fiat_model_aggregation2}/exposure/exposure.csv (100%) rename examples/data/{aggregation_zones_example/test2_output => aggregation_zones/fiat_model_aggregation2}/settings.toml (100%) rename examples/data/{aggregation_zones_example/test2_output => aggregation_zones/fiat_model_aggregation2}/vulnerability/vulnerability_curves.csv (100%) diff --git a/examples/data/aggregation_zones_example/Aggregation_zones/accomodation_type.gpkg b/examples/data/aggregation_zones/aggregation_zones/accomodation_type.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/Aggregation_zones/accomodation_type.gpkg rename to examples/data/aggregation_zones/aggregation_zones/accomodation_type.gpkg diff --git a/examples/data/aggregation_zones_example/Aggregation_zones/base_zones.gpkg b/examples/data/aggregation_zones/aggregation_zones/base_zones.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/Aggregation_zones/base_zones.gpkg rename to examples/data/aggregation_zones/aggregation_zones/base_zones.gpkg diff --git a/examples/data/aggregation_zones_example/Aggregation_zones/council.gpkg b/examples/data/aggregation_zones/aggregation_zones/council.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/Aggregation_zones/council.gpkg rename to examples/data/aggregation_zones/aggregation_zones/council.gpkg diff --git a/examples/data/aggregation_zones_example/Aggregation_zones/land_use.gpkg b/examples/data/aggregation_zones/aggregation_zones/land_use.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/Aggregation_zones/land_use.gpkg rename to examples/data/aggregation_zones/aggregation_zones/land_use.gpkg diff --git a/examples/data/aggregation_zones_example/config_aggregation.yml b/examples/data/aggregation_zones/config_aggregation.yml similarity index 100% rename from examples/data/aggregation_zones_example/config_aggregation.yml rename to examples/data/aggregation_zones/config_aggregation.yml diff --git a/examples/data/aggregation_zones_example/fiat_model/exposure/buildings.gpkg b/examples/data/aggregation_zones/fiat_model/exposure/buildings.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/exposure/buildings.gpkg rename to examples/data/aggregation_zones/fiat_model/exposure/buildings.gpkg diff --git a/examples/data/aggregation_zones_example/fiat_model/exposure/exposure.csv b/examples/data/aggregation_zones/fiat_model/exposure/exposure.csv similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/exposure/exposure.csv rename to examples/data/aggregation_zones/fiat_model/exposure/exposure.csv diff --git a/examples/data/aggregation_zones_example/fiat_model/exposure/region.gpkg b/examples/data/aggregation_zones/fiat_model/exposure/region.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/exposure/region.gpkg rename to examples/data/aggregation_zones/fiat_model/exposure/region.gpkg diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/exposure/buildings.gpkg b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/exposure/buildings.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/exposure/buildings.gpkg rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/exposure/buildings.gpkg diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/exposure/exposure.csv b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/exposure/exposure.csv similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/exposure/exposure.csv rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/exposure/exposure.csv diff --git a/examples/data/aggregation_zones_example/aggregation_test_1_output/settings.toml b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/settings.toml similarity index 100% rename from examples/data/aggregation_zones_example/aggregation_test_1_output/settings.toml rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/settings.toml diff --git a/examples/data/aggregation_zones_example/aggregation_test_1_output/vulnerability/vulnerability_curves.csv b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/vulnerability/vulnerability_curves.csv similarity index 100% rename from examples/data/aggregation_zones_example/aggregation_test_1_output/vulnerability/vulnerability_curves.csv rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/vulnerability/vulnerability_curves.csv diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/exposure/buildings.gpkg b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/exposure/buildings.gpkg similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/exposure/buildings.gpkg rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/exposure/buildings.gpkg diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/exposure/exposure.csv b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/exposure/exposure.csv similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/exposure/exposure.csv rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/exposure/exposure.csv diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/settings.toml b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/settings.toml similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/settings.toml rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/settings.toml diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/vulnerability/vulnerability_curves.csv b/examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/vulnerability/vulnerability_curves.csv similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test1/vulnerability/vulnerability_curves.csv rename to examples/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/vulnerability/vulnerability_curves.csv diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/settings.toml b/examples/data/aggregation_zones/fiat_model/settings.toml similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/settings.toml rename to examples/data/aggregation_zones/fiat_model/settings.toml diff --git a/examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/vulnerability/vulnerability_curves.csv b/examples/data/aggregation_zones/fiat_model/vulnerability/vulnerability_curves.csv similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/output/aggregation_zones_test2/vulnerability/vulnerability_curves.csv rename to examples/data/aggregation_zones/fiat_model/vulnerability/vulnerability_curves.csv diff --git a/examples/data/aggregation_zones_example/fiat_model/vulnerability/vulnerability_identifiers.csv b/examples/data/aggregation_zones/fiat_model/vulnerability/vulnerability_identifiers.csv similarity index 100% rename from examples/data/aggregation_zones_example/fiat_model/vulnerability/vulnerability_identifiers.csv rename to examples/data/aggregation_zones/fiat_model/vulnerability/vulnerability_identifiers.csv diff --git a/examples/data/aggregation_zones_example/aggregation_test_1_output/exposure/buildings.gpkg b/examples/data/aggregation_zones/fiat_model_aggregation1/exposure/buildings.gpkg similarity index 99% rename from examples/data/aggregation_zones_example/aggregation_test_1_output/exposure/buildings.gpkg rename to examples/data/aggregation_zones/fiat_model_aggregation1/exposure/buildings.gpkg index ddb51bcd15326843228a3e8533c8a175f6967e10..8866e92b596d48ff50f27ed8d9cb461ce0836618 100644 GIT binary patch delta 50 zcmZoTAl`65e8V|?enYbm14}Ctb0E?)HZo|wtKWWCpAm?efS4JGS+?KRXI0(+0L9i4 A8~^|S delta 50 zcmZoTAl`65e8V|?ego4GLsKh5BP(N5Jxc?#=DYgscl8;8m?GBLL@vCuOxFpfG9{HOcqv0_ID zhop{Hskh4y1pn3);re;Q!679+z>hs@^FMw64J>@0nC5K`e6WFElS_?(i*X(UUplV< z$8Gj{He;6S%-u}-jPv-{@g(v_b6@B7;MxmR&sJMOWr-t7Be9@F%7_gRBl7+aWH zm|Ix3u(DiG;A48v!1s;!4bLZ@%{-div$*-WDmazdSF%lDdB%K#>HTIwgVRi0jbZBS z($4Z6O`+4@-(r=Se*FsTRz|h$y;oUf85vc#ufE2*l95A&UD{Qiqd6F&WW!Zfw&`^@ zSl=@$Z_m5QTFJ<$wE4lW5JpDD>9%)Rr(tny2dgZbc%b&=LT=gVGw!jJ2E_)quIW5tdR z4oMxYQg2rr2>z`p!u9i}gF{MufFFDG=70MB8#W94oyWBK^&>G}b&m54oDA*^d^>rQ z*jv~%Sne=4FqtsiU~uP8=Y7l@!gG?xi0dwA^2CYa9Bh(o3?Q(1-p4KuCYH&Q10PIa zZYo#YzUDe>B_opp`)1z{L5xfy^3$ttu}))@n|$C`7mqBvxT7OuqjE`NQV!VK7RDB) z7UmX~EvzgTl=zwEGVrhC+rn4M`KT~