diff --git a/docs/network_module/network_module.rst b/docs/network_module/network_module.rst index c04729011..c2bde73ac 100644 --- a/docs/network_module/network_module.rst +++ b/docs/network_module/network_module.rst @@ -187,6 +187,7 @@ Note: the origin-destination parameters are explained in the :ref:`analysis_modu [hazard] hazard_map = None # / None hazard_id = None # / None - hazard_field_name = None # / None + hazard_field_name = None # / None aggregate_wl = max # max / min / mean hazard_crs = None # EPSG code / projection that can be read by pyproj / None + overlay_segmented_graph = True # True / False diff --git a/examples/data/base_network/network.ini b/examples/data/base_network/network.ini index 90d8ef599..4059839ec 100644 --- a/examples/data/base_network/network.ini +++ b/examples/data/base_network/network.ini @@ -24,7 +24,7 @@ origin_out_fraction = 1 # fraction of things/people going ou [hazard] hazard_map = None # / None hazard_id = None # / None -hazard_field_name = None # / None +hazard_field_name = None # / None aggregate_wl = max # max / min / mean hazard_crs = None # EPSG code / projection that can be read by pyproj / None diff --git a/examples/data/base_network_gpkg/network.ini b/examples/data/base_network_gpkg/network.ini index 7a87f0158..46e1e7e2d 100644 --- a/examples/data/base_network_gpkg/network.ini +++ b/examples/data/base_network_gpkg/network.ini @@ -24,7 +24,7 @@ origin_out_fraction = None # fraction of things/people going [hazard] hazard_map = None # / None hazard_id = None # / None -hazard_field_name = None # / None +hazard_field_name = None # / None aggregate_wl = None # max / min / mean hazard_crs = None # EPSG code / projection that can be read by pyproj / None diff --git a/examples/data/hazard_overlay/network.ini b/examples/data/hazard_overlay/network.ini index b9a1293ca..bc1c78404 100644 --- a/examples/data/hazard_overlay/network.ini +++ b/examples/data/hazard_overlay/network.ini @@ -24,7 +24,7 @@ origin_out_fraction = 1 # fraction of things/people going ou [hazard] hazard_map = max_flood_depth.tif # / None hazard_id = None # / None -hazard_field_name = None # / None +hazard_field_name = None # / None aggregate_wl = max # max / min / mean hazard_crs = EPSG:32736 # EPSG code / projection that can be read by pyproj / None diff --git a/examples/data/single_link_redun/network.ini b/examples/data/single_link_redun/network.ini index 82baaee2a..3721ef242 100644 --- a/examples/data/single_link_redun/network.ini +++ b/examples/data/single_link_redun/network.ini @@ -24,7 +24,7 @@ origin_out_fraction = 1 # fraction of things/people going ou [hazard] hazard_map = None # / None hazard_id = None # / None -hazard_field_name = None # / None +hazard_field_name = None # / None aggregate_wl = max # max / min / mean hazard_crs = None # EPSG code / projection that can be read by pyproj / None diff --git a/ra2ce/network/network_config_data/network_config_data.py b/ra2ce/network/network_config_data/network_config_data.py index d9a044134..ec8985c7d 100644 --- a/ra2ce/network/network_config_data/network_config_data.py +++ b/ra2ce/network/network_config_data/network_config_data.py @@ -78,7 +78,7 @@ class IsolationSection: class HazardSection: hazard_map: list[Path] = field(default_factory=list) hazard_id: str = "" - hazard_field_name: list[str] = field(default_factory=list) + hazard_field_name: str = "" aggregate_wl: AggregateWlEnum = field(default_factory=lambda: AggregateWlEnum.NONE) hazard_crs: str = "" scenario_cost: list[float] = field(default_factory=list) diff --git a/ra2ce/network/network_config_data/network_config_data_reader.py b/ra2ce/network/network_config_data/network_config_data_reader.py index 2683dc791..a35cca5c8 100644 --- a/ra2ce/network/network_config_data/network_config_data_reader.py +++ b/ra2ce/network/network_config_data/network_config_data_reader.py @@ -208,9 +208,6 @@ def get_hazard_section(self) -> HazardSection: ), ) ) - _hazard_section.hazard_field_name = self._parser.getlist( - _section, "hazard_field_name", fallback=_hazard_section.hazard_field_name - ) _hazard_section.aggregate_wl = AggregateWlEnum.get_enum( self._parser.get(_section, "aggregate_wl", fallback=None) )