All good for the aggregation areas and ground elevation in new development areas

Author: frederique-hub

hydromt_fiat/workflows/exposure_vector.py

@@ -1101,7 +1101,7 @@ def setup_new_composite_areas(
         # new composite areas
         if aggregation_area_fn is not None:
             new_objects = join_exposure_aggregation_areas(
-                self.get_full_gdf(new_objects),
+                _new_exposure_geoms.merge(new_objects, on="Object ID"),
                 aggregation_area_fn=aggregation_area_fn,
                 attribute_names=attribute_names,
                 label_names=label_names,

tests/test_setup_new_composite_areas_ground_elevation.py

@@ -23,6 +23,10 @@
         "type": "datum",
         "path_ref": None,
         "attr_ref": None,
+        "ground_elevation_file": None,
+        "aggregation_area_fn": None,
+        "attribute_names": None,
+        "label_names": None,
     },
     "setup_new_composite_area_geom": {
         "dir": "test_read",
@@ -33,8 +37,8 @@
         "attr_ref": "bfe",
         "ground_elevation_file": None,
         "aggregation_area_fn": None,
-        "attribute_names": "GEOID_short",
-        "label_names": "Aggregation Label: Census Block",
+        "attribute_names": None,
+        "label_names": None,
     },
     "setup_new_composite_area_elevation": {
         "dir": "test_read",
@@ -45,7 +49,7 @@
         "attr_ref": None,
         "ground_elevation_file": DATADIRDEM 
         / "charleston_14m.tif",
-        "aggregation_area_fn": EXAMPLEDIR.joinpath("exposure", "aggregation_areas", "block_groups.gpkg"),
+        "aggregation_area_fn": EXAMPLEDIR.joinpath("test_read", "exposure", "aggregation_areas", "block_groups.gpkg"),
         "attribute_names": "GEOID_short",
         "label_names": "Aggregation Label: Census Block",
     },
@@ -73,6 +77,9 @@ def test_setup_new_composite_areas_ground_elevation(case):
         path_ref=_cases[case]["path_ref"],
         attr_ref=_cases[case]["attr_ref"],
         ground_elevation=_cases[case]["ground_elevation_file"],
+        aggregation_area_fn=_cases[case]["aggregation_area_fn"],
+        attribute_names=_cases[case]["attribute_names"],
+        label_names=_cases[case]["label_names"],
     )
 
     if _cases[case]["new_root"].exists():