replace Aggregation Label with aggregation_label (#442)

* replace Aggregation Label with aggregation_label * remove space * update version download artifact
Deltares · Feb 3, 2025 · 93dfbad · 93dfbad
1 parent 4768731
commit 93dfbad
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -58,7 +58,7 @@ jobs:
         shell: bash -l {0}
         run: python -m build
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: releases
           path: dist
@@ -72,7 +72,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist
@@ -105,7 +105,7 @@ jobs:
     if: ${{ github.event_name == 'release'}}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist
@@ -126,7 +126,7 @@ jobs:
     if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist

diff --git a/docs/data/national_structure_inventory.rst b/docs/data/national_structure_inventory.rst
@@ -25,7 +25,7 @@ corresponding NSI fields (right-hand side)::
     "ground_elevtn": "ground_el",
     "X Coordinate": "x",
     "Y Coordinate": "y",
-    "Aggregation Label: Census Block": "cbfips"
+    "aggregation_label:Census Block": "cbfips"
 
 HydroMT-FIAT obtains the NSI data of the area of interest through the `NSI API
 <https://www.hec.usace.army.mil/confluence/nsi/technicalreferences/latest/api-reference-guide>`_.

diff --git a/docs/user_guide/user_guide_overview.rst b/docs/user_guide/user_guide_overview.rst
@@ -87,7 +87,7 @@ In case the user wants to add several aggregation zones at once, multiple aggreg
 
 After loading the configuration file (*.yml*) and executing the **FIAT Hydro MT** model builder, the user receives a file (*.csv*) with the original exposure data and an additional column with the aggregation label(s) as output. The `FIAT toolbox <https://github.com/Deltares/delft-fiat>`_ will automatically prepend "*Aggregation Label*" to the prior specified aggregation label, therefore the aggregation labels can be identified as such.
 
-   Aggregation Label: {label_name}
+   aggregation_label:{label_name}
 
 *Note: It may occur that polygons overlap in the aggregation vector files. In this case the information for the affected object_id will be merged and both aggregation zones will be assigned to the object.* ::
 

diff --git a/examples/data/aggregation_zones/fiat_model/exposure/exposure.csv b/examples/data/aggregation_zones/fiat_model/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748561544418,-79.93000008,32.770545239,450190002002010,1,centroid,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635444641,-79.92968382,32.771271301,450190002002010,1,centroid,RES4
 573785665,573785665,RES,RES1-2SNB,330007.42,165003.71,7.364031290178299,-79.93179589,32.773364727,450190002002004,1,centroid,RES1-2SNB

diff --git a/...es/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/exposure/exposure.csv b/...es/data/aggregation_zones/fiat_model/output/aggregation_zones_test1/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,Aggregation Label: Base_zones
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,aggregation_label:Base_zones
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748561544418,-79.93000008,32.770545239,450190002002010,1,centroid,RES4,SR-3
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635444641,-79.92968382,32.771271301,450190002002010,1,centroid,RES4,SR-4
 573785665,573785665,RES,RES1-2SNB,330007.42,165003.71,7.364031290178299,-79.93179589,32.773364727,450190002002004,1,centroid,RES1-2SNB,SR-5

diff --git a/...es/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/exposure/exposure.csv b/...es/data/aggregation_zones/fiat_model/output/aggregation_zones_test2/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,Aggregation Label: Base_zones,Aggregation Label: Land_use,Aggregation Label: Accommodation_type
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,aggregation_label:Base_zones,aggregation_label:Land_use,aggregation_label:Accommodation_type
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748561544418,-79.93000008,32.770545239,450190002002010,1,centroid,RES4,SR-3,Neighborhood,
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635444641,-79.92968382,32.771271301,450190002002010,1,centroid,RES4,SR-4,Neighborhood,
 573785665,573785665,RES,RES1-2SNB,330007.42,165003.71,7.364031290178299,-79.93179589,32.773364727,450190002002004,1,centroid,RES1-2SNB,SR-5,Neighborhood,

diff --git a/examples/data/aggregation_zones/fiat_model_aggregation1/exposure/exposure.csv b/examples/data/aggregation_zones/fiat_model_aggregation1/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,Zoning_map
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,Zoning_map
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748561544418,-79.93000008,32.770545239,450190002002010,1,centroid,RES4,SR-3
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635444641,-79.92968382,32.771271301,450190002002010,1,centroid,RES4,SR-4
 573785665,573785665,RES,RES1-2SNB,330007.42,165003.71,7.364031290178299,-79.93179589,32.773364727,450190002002004,1,centroid,RES1-2SNB,SR-5

diff --git a/examples/data/aggregation_zones/fiat_model_aggregation2/exposure/exposure.csv b/examples/data/aggregation_zones/fiat_model_aggregation2/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,Zoning_map,Land_use_map,Horse_track,Accomodation_Zone
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,Zoning_map,Land_use_map,Horse_track,Accomodation_Zone
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748561544418,-79.93000008,32.770545239,450190002002010,1,centroid,RES4,SR-3,Neighborhood,1,
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635444641,-79.92968382,32.771271301,450190002002010,1,centroid,RES4,SR-4,Neighborhood,1,
 573785665,573785665,RES,RES1-2SNB,330007.42,165003.71,7.364031290178299,-79.93179589,32.773364727,450190002002004,1,centroid,RES1-2SNB,SR-5,Neighborhood,2,

diff --git a/examples/data/building_footprints/fiat_model/exposure/exposure.csv b/examples/data/building_footprints/fiat_model/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748562,4.5019E+14,1,centroid,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635,4.5019E+14,1,centroid,RES4
 573785665,573785665,RES,RES1-2SNB,330007.42,165003.71,7.36403129,4.5019E+14,1,centroid,RES1-2SNB

diff --git a/...s/data/setup_exposure_buildings/test_vulnerability_and_exposure_NSI/exposure/exposure.csv b/...s/data/setup_exposure_buildings/test_vulnerability_and_exposure_NSI/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_flht,ground_elevtn,Aggregation Label: Census Block,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_flht,ground_elevtn,aggregation_label:Census Block,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,0.5,2.580267906188965,450190001001006,centroid,RES3A_structure,RES3A_content
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.0,2.580267906188965,450190002002010,centroid,RES4_structure,RES4_content
 573783433,573783433,COM,RES4,476216.254,238108.127,0.5,2.0590968132019043,450190002002010,centroid,RES4_structure,RES4_content

diff --git a/...xposure_buildings_with_dem_data/test_vulnerability_and_exposure_NSI/exposure/exposure.csv b/...xposure_buildings_with_dem_data/test_vulnerability_and_exposure_NSI/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_flht,ground_elevtn,Aggregation Label: Census Block,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_flht,ground_elevtn,aggregation_label:Census Block,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,0.5,7.298348064632416,450190001001006,centroid,RES3A_structure,RES3A_content
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.0,8.381748561544418,450190002002010,centroid,RES4_structure,RES4_content
 573783433,573783433,COM,RES4,476216.254,238108.127,0.5,7.374183635444641,450190002002010,centroid,RES4_structure,RES4_content

diff --git a/examples/data/setup_new_composite_area/test_read/exposure/exposure.csv b/examples/data/setup_new_composite_area/test_read/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,7.298348065,-79.93682513,32.77688289,4.5019E+14,1,centroid,RES3A,RES3A
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748562,-79.93000008,32.77054524,4.5019E+14,1,centroid,RES4,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635,-79.92968382,32.7712713,4.5019E+14,1,centroid,RES4,RES4

diff --git a/..._composite_area/test_setup_new_composite_area_elevation_aggregation/exposure/exposure.csv b/..._composite_area/test_setup_new_composite_area_elevation_aggregation/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content,index,Council,Zoning_map,Land_use_map
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content,index,Council,Zoning_map,Land_use_map
 574486973,574486973,RES,RES3A,480189.335,240094.667,7.298348065,-79.93682513,32.77688289,450190000000000.0,1.0,centroid,RES3A,RES3A,,,,
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748562,-79.93000008,32.77054524,450190000000000.0,1.0,centroid,RES4,RES4,,,,
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635,-79.92968382,32.7712713,450190000000000.0,1.0,centroid,RES4,RES4,,,,

diff --git a/examples/data/update_ground_elevation/fiat_model/exposure/exposure.csv b/examples/data/update_ground_elevation/fiat_model/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,7.298348065,-79.93682513,32.77688289,4.5019E+14,1,centroid,RES3A,RES3A
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748562,-79.93000008,32.77054524,4.5019E+14,1,centroid,RES4,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635,-79.92968382,32.7712713,4.5019E+14,1,centroid,RES4,RES4

diff --git a/examples/data/update_ground_elevation/test_update_ground_elevation/exposure/exposure.csv b/examples/data/update_ground_elevation/test_update_ground_elevation/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,2.580267906188965,-79.93682513,32.77688289,450190000000000.0,1,centroid,RES3A,RES3A
 573783417,573783417,COM,RES4,1177614.2,588807.1,2.580267906188965,-79.93000008,32.77054524,450190000000000.0,1,centroid,RES4,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,2.0590968132019043,-79.92968382,32.7712713,450190000000000.0,1,centroid,RES4,RES4

diff --git a/examples/data/update_ground_floor_height/fiat_model/exposure/exposure.csv b/examples/data/update_ground_floor_height/fiat_model/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,7.298348065,-79.93682513,32.77688289,4.5019E+14,1,centroid,RES3A,RES3A
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748562,-79.93000008,32.77054524,4.5019E+14,1,centroid,RES4,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635,-79.92968382,32.7712713,4.5019E+14,1,centroid,RES4,RES4

diff --git a/examples/data/update_ground_floor_height/updated_fiat_model/exposure/exposure.csv b/examples/data/update_ground_floor_height/updated_fiat_model/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,7.298348065,-79.93682513,32.77688289,450190000000000.0,1,centroid,RES3A,RES3A
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748562,-79.93000008,32.77054524,450190000000000.0,1,centroid,RES4,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635,-79.92968382,32.7712713,450190000000000.0,1,centroid,RES4,RES4

diff --git a/examples/data/update_max_potential_damage/fiat_model/exposure/exposure.csv b/examples/data/update_max_potential_damage/fiat_model/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,7.298348065,-79.93682513,32.77688289,4.5019E+14,1,centroid,RES3A,RES3A
 573783417,573783417,COM,RES4,1177614.2,588807.1,8.381748562,-79.93000008,32.77054524,4.5019E+14,1,centroid,RES4,RES4
 573783433,573783433,COM,RES4,476216.254,238108.127,7.374183635,-79.92968382,32.7712713,4.5019E+14,1,centroid,RES4,RES4

diff --git a/...date_max_potential_damage/test_update_max_potential_damage_polygons/exposure/exposure.csv b/...date_max_potential_damage/test_update_max_potential_damage_polygons/exposure/exposure.csv
@@ -1,4 +1,4 @@
-object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,Aggregation Label: Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content,geometry,groundfloorheight,maxpotential_content
+object_id,object_name,primary_object_type,secondary_object_type,max_damage_structure,max_damage_content,ground_elevtn,X Coordinate,Y Coordinate,aggregation_label:Census Block,ground_flht,extract_method,fn_damage_structure,fn_damage_content,geometry,groundfloorheight,maxpotential_content
 574486973,574486973,RES,RES3A,480189.335,240094.667,7.298348065,-79.93682513,32.77688289,450190000000000.0,1,centroid,RES3A,RES3A,POINT (-79.93682513 32.776882893),,
 573783417,573783417,COM,RES4,10000.0,588807.1,8.381748562,-79.93000008,32.77054524,450190000000000.0,1,centroid,RES4,RES4,POINT (-79.93000008 32.770545239),7.0,10000.0
 573783433,573783433,COM,RES4,10000.0,238108.127,7.374183635,-79.92968382,32.7712713,450190000000000.0,1,centroid,RES4,RES4,POINT (-79.92968382 32.771271301),7.0,10000.0

diff --git a/examples/update_exposure_data.ipynb b/examples/update_exposure_data.ipynb
diff --git a/hydromt_fiat/data/attribute_linking/NSI_attributes_to_FIAT.json b/hydromt_fiat/data/attribute_linking/NSI_attributes_to_FIAT.json
@@ -8,5 +8,5 @@
     "ground_flht": "found_ht",
     "ground_elevtn": "ground_elv",
     "geometry": "geometry",
-    "Aggregation Label: Census Blockgroup": "cbfips"
+    "aggregation_label:Census Blockgroup": "cbfips"
 }
diff --git a/hydromt_fiat/fiat.py b/hydromt_fiat/fiat.py
@@ -1127,8 +1127,8 @@ def setup_equity_data(
         # Save the census block aggregation area data
         block_groups = equity.get_block_groups()
 
-        # Update the aggregation label: Census Blockgroup
-        del self.exposure.exposure_db["Aggregation Label: Census Blockgroup"]
+        # Update the aggregation_label:Census Blockgroup
+        del self.exposure.exposure_db["aggregation_label:Census Blockgroup"]
         self.setup_aggregation_areas(
             aggregation_area_fn=block_groups,
             attribute_names="GEOID_short",
@@ -1206,7 +1206,7 @@ def setup_aggregation_areas(
             aggregation_area_fn,
             attribute_names,
             # Make sure that column name for aggregation areas includes the Aggregation Label part
-            ["Aggregation Label: " + name for name in label_names],
+            ["aggregation_label:" + name for name in label_names],
             new_composite_area,
             keep_all=False,
         )

diff --git a/hydromt_fiat/workflows/exposure_vector.py b/hydromt_fiat/workflows/exposure_vector.py
@@ -56,18 +56,18 @@ class ExposureVector(Exposure):
         "secondary_object_type",
         "ground_elevtn",
     ]
-    _OPTIONAL_VARIABLE_COLUMNS = ["Aggregation Label: {}", "Aggregation Variable: {}"]
+    _OPTIONAL_VARIABLE_COLUMNS = ["aggregation_label:{}", "Aggregation Variable: {}"]
 
     _CSV_COLUMN_DATATYPES = {
         "object_id": int,
         "object_name": str,
         "primary_object_type": str,
         "secondary_object_type": str,
         "extract_method": str,
-        "Aggregation Label": str,
+        "aggregation_lable:": str,
         "fn_damage_structure": str,
         "fn_damage_content": str,
-        "Ground Flood Height": float,
+        "ground_flht": float,
         "ground_elevtn": float,
         "max_damage_structure": float,
         "max_damage_content": float,
@@ -1985,7 +1985,7 @@ def get_object_ids(
                 ids = buildings["object_id"]
             elif selection_type == "aggregation_area":
                 ids = buildings.loc[
-                    buildings[f"Aggregation Label: {aggregation}"]
+                    buildings[f"aggregation_label:{aggregation}"]
                     == aggregation_area_name,
                     "object_id",
                 ]

diff --git a/tests/test_setup_new_composite_areas_ground_elevation.py b/tests/test_setup_new_composite_areas_ground_elevation.py
@@ -58,7 +58,7 @@
             "test_read", "exposure", "aggregation_areas", "block_groups.gpkg"
         ),
         "attribute_names": "GEOID_short",
-        "label_names": "Aggregation Label: Census Block",
+        "label_names": "aggregation_label:Census Block",
     },
 }