Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix gfh to mpd (damages) and remove count and replace with zip #397

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+38 −29
Open

fix gfh to mpd (damages) and remove count and replace with zip #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3e8d48
fix gfh to mpd (damages) and remove count and replace with zip
Santonia27 Oct 15, 2024
3d4531e
fix additional_attributes
Santonia27 Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hydromt_fiat/api/hydromt_fiat_vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def new_additional_attributes(self, config_yaml):
].new_composite_area
# Check if additional attributes already exist
add_attrs_existing = [
attr["name"]
attr.name
for attr in self.fiat_model.spatial_joins["additional_attributes"]
]
for i, label_name in enumerate(label_names):
Expand All @@ -242,7 +242,7 @@ def new_additional_attributes(self, config_yaml):
aggregation_area_fn.pop(i)
attribute_names.pop(i)
label_names.pop(i)
self.fiat_model.setup_aggregation_areas(
self.fiat_model.setup_additional_attributes(
aggregation_area_fn, attribute_names, label_names, new_composite_area
)

Expand Down
63 changes: 36 additions & 27 deletions hydromt_fiat/workflows/exposure_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,8 +764,8 @@ def setup_ground_floor_height(
gdf = self.get_full_gdf(self.exposure_db)

# If roads in model filter out for spatial joint
if gdf["Primary Object Type"].str.contains("roads").any():
gdf_roads = gdf[gdf["Primary Object Type"].str.contains("roads")]
if gdf["Primary Object Type"].str.contains("road").any():
gdf_roads = gdf[gdf["Primary Object Type"].str.contains("road")]
gdf = join_spatial_data(
gdf[~gdf.isin(gdf_roads)].dropna(subset=["geometry"]),
gfh,
Expand Down Expand Up @@ -848,60 +848,58 @@ def setup_max_potential_damage(

elif isinstance(max_potential_damage, list):
# Multiple files are used to assign the ground floor height to the assets
count = 0
for i in max_potential_damage:
for max_damages,attribute, method, max_dis,damage_type in zip(max_potential_damage,attribute_name,method_damages,max_dist,damage_types):
# When the max_potential_damage is a string but not jrc_damage_values
# or hazus_max_potential_damages. Here, a single file is used to
# assign the ground floor height to the assets
gfh = self.data_catalog.get_geodataframe(i)
mpd = self.data_catalog.get_geodataframe(max_damages)

# If method is "intersection" remove columns from gfh exept for attribute name and geometry
if method_damages[count] == "intersection":
if method == "intersection":
columns_to_drop = [
col
for col in gfh.columns
if col != attribute_name[count] and col != "geometry"
for col in mpd.columns
if col != attribute and col != "geometry"
]
gfh = gfh.drop(columns=columns_to_drop)
mpd = mpd.drop(columns=columns_to_drop)

# Get exposure data
gdf = self.get_full_gdf(self.exposure_db)

# If roads in model filter out for spatial joint
if gdf["Primary Object Type"].str.contains("roads").any():
gdf_roads = gdf[gdf["Primary Object Type"].str.contains("roads")]
if gdf["Primary Object Type"].str.contains("road").any():
gdf_roads = gdf[gdf["Primary Object Type"].str.contains("road")]
gdf = join_spatial_data(
gdf[~gdf.isin(gdf_roads)].dropna(subset=["geometry"]),
gfh,
attribute_name[count],
method_damages[count],
max_dist[count],
mpd,
attribute,
method,
max_dis,
self.logger,
)
gdf = pd.concat([gdf, gdf_roads])
else:
gdf = join_spatial_data(
gdf,
gfh,
attribute_name[count],
method_damages[count],
max_dist[count],
mpd,
attribute,
method,
max_dis,
self.logger,
)

# If method is "intersection" rename *"_left" to original exposure_db name
if method_damages[count] == "intersection":
if method == "intersection":
self.intersection_method(gdf)

# Update exposure_db with updated dataframe
self.exposure_db = self._set_values_from_other_column(
gdf,
f"Max Potential Damage: {damage_types[count].capitalize()}",
attribute_name[count],
f"Max Potential Damage: {damage_type.capitalize()}",
attribute,
)
if "geometry" in self.exposure_db.columns:
self.exposure_db.drop(columns=["geometry"], inplace=True)
count += 1

elif max_potential_damage in [
"jrc_damage_values",
Expand Down Expand Up @@ -952,11 +950,22 @@ def setup_max_potential_damage(
# When the max_potential_damage is a string but not jrc_damage_values
# or hazus_max_potential_damages. Here, a single file is used to
# assign the ground floor height to the assets
gfh = self.data_catalog.get_geodataframe(max_potential_damage)
mpd = self.data_catalog.get_geodataframe(max_potential_damage)
gdf = self.get_full_gdf(self.exposure_db)
gdf = join_spatial_data(
gdf, gfh, attribute_name, method_damages, max_dist, self.logger
)


# If roads in model filter out for spatial joint
if gdf["Primary Object Type"].str.contains("road").any():
gdf_roads = gdf[gdf["Primary Object Type"].str.contains("road")]
# Spatial joint exposure and updated damages
gdf = join_spatial_data(
gdf[~gdf.isin(gdf_roads)].dropna(subset=["geometry"]), mpd, attribute_name, method_damages, max_dist, self.logger
)
gdf = pd.concat([gdf, gdf_roads])
else:
gdf = join_spatial_data(
gdf, mpd, attribute_name, method_damages, max_dist, self.logger
)
self.exposure_db = self._set_values_from_other_column(
gdf,
f"Max Potential Damage: {damage_types[0].capitalize()}",
Expand Down
Loading