flood-adapt 1.0.6__py3-none-any.whl → 1.1.1__py3-none-any.whl

flood_adapt/dbs_classes/database.py

@@ -192,7 +192,7 @@ class Database(IDatabase):
         if self.site.sfincs.slr_scenarios is None:
             raise ConfigError("No SLR scenarios defined in the site configuration.")
         slr = self.site.sfincs.slr_scenarios
-        slr.file = str(self.static_path / slr.file)
+        slr.file = (self.static_path / slr.file).as_posix()
         return slr
 
     def get_outputs(self) -> dict[str, Any]:
@@ -233,7 +233,7 @@ class Database(IDatabase):
             if _type == FloodmapType.water_level:
                 paths = [base_dir / "max_water_level_map.nc"]
             elif _type == FloodmapType.water_depth:
-                paths = [base_dir / f"FloodMap_{scenario_name}.tif"]
+                paths = [base_dir / f"FloodMap_{self.name}.tif"]
         elif mode == Mode.risk:
             if _type == FloodmapType.water_level:
                 paths = list(base_dir.glob("RP_*_maps.nc"))
@@ -285,7 +285,7 @@ class Database(IDatabase):
             path to topobathy tiles
         """
         path = self.input_path.parent.joinpath("static", "dem", "tiles", "topobathy")
-        return str(path)
+        return path.as_posix()
 
     def get_index_path(self) -> str:
         """Return the path of the index tiles which are used to connect each water level cell with the topobathy tiles.
@@ -296,7 +296,7 @@ class Database(IDatabase):
             path to index tiles
         """
         path = self.input_path.parent.joinpath("static", "dem", "tiles", "indices")
-        return str(path)
+        return path.as_posix()
 
     def get_depth_conversion(self) -> float:
         """Return the flood depth conversion that is need in the gui to plot the flood map.

flood_adapt/dbs_classes/dbs_static.py

@@ -290,9 +290,9 @@ class DbsStatic(IDbsStatic):
             raise ConfigError(
                 "No cyclone track database defined in the site configuration."
             )
-        database_file = str(
+        database_file = (
             self._database.static_path
             / "cyclone_track_database"
             / self._database.site.sfincs.cyclone_track_database.file
-        )
+        ).as_posix()
         return CycloneTrackDatabase("ibtracs", file_name=database_file)

flood_adapt/flood_adapt.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, List, Optional, Union
+from typing import Any, List, Literal, Optional, Union
 
 import geopandas as gpd
 import numpy as np
@@ -891,7 +891,7 @@ class FloodAdapt:
 
         output_path = self.database.get_flooding_path(scenario.name)
         obs_points["html"] = [
-            str(output_path.joinpath(f"{station}_timeseries.html"))
+            (output_path / f"{station}_timeseries.html").as_posix()
             for station in obs_points.name
         ]
 
@@ -935,43 +935,94 @@ class FloodAdapt:
 
         return infographic_path
 
-    def get_infometrics(self, name: str) -> pd.DataFrame:
-        """Return the metrics for the given scenario.
+    def get_infometrics(
+        self, name: str, aggr_name: Optional[str] = None
+    ) -> pd.DataFrame:
+        """Return the infometrics DataFrame for the given scenario and optional aggregation.
 
         Parameters
         ----------
         name : str
             The name of the scenario.
+        aggr_name : Optional[str], default None
+            The name of the aggregation, if any.
 
         Returns
         -------
-        metrics: pd.DataFrame
-            The metrics for the scenario.
+        df : pd.DataFrame
+            The infometrics DataFrame for the scenario (and aggregation if specified).
 
         Raises
         ------
         FileNotFoundError
-            If the metrics file does not exist.
+            If the metrics file does not exist for the given scenario (and aggregation).
         """
+        if aggr_name is not None:
+            fn = f"Infometrics_{name}_{aggr_name}.csv"
+        else:
+            fn = f"Infometrics_{name}.csv"
         # Create the infographic path
-        metrics_path = self.database.scenarios.output_path.joinpath(
-            name,
-            f"Infometrics_{name}.csv",
-        )
+        metrics_path = self.database.scenarios.output_path.joinpath(name, fn)
 
         # Check if the file exists
         if not metrics_path.exists():
             raise FileNotFoundError(
-                f"The metrics file for scenario {name}({str(metrics_path)}) does not exist."
+                f"The metrics file for scenario {name}({metrics_path.as_posix()}) does not exist."
             )
-
         # Read the metrics file
-        return MetricsFileReader(str(metrics_path)).read_metrics_from_file(
+        df = MetricsFileReader(metrics_path.as_posix()).read_metrics_from_file(
             include_long_names=True,
             include_description=True,
             include_metrics_table_selection=True,
+            include_metrics_map_selection=True,
+        )
+        if aggr_name is not None:
+            df = df.T
+        return df
+
+    def get_aggr_metric_layers(
+        self,
+        name: str,
+        aggr_type: str,
+        type: Literal["single_event", "risk"] = "single_event",
+        rp: Optional[int] = None,
+        equity: bool = False,
+    ) -> list[dict]:
+        # Read infometrics from csv file
+        metrics_df = self.get_infometrics(name, aggr_name=aggr_type)
+
+        # Filter based on "Show in Metrics Map" column
+        if "Show In Metrics Map" in metrics_df.index:
+            mask = metrics_df.loc["Show In Metrics Map"].to_numpy().astype(bool)
+            metrics_df = metrics_df.loc[:, mask]
+
+        # Keep only relevant attributes of the infometrics
+        keep_rows = [
+            "Description",
+            "Long Name",
+            "Show In Metrics Table",
+            "Show In Metrics Map",
+        ]
+        metrics_df = metrics_df.loc[
+            [row for row in keep_rows if row in metrics_df.index]
+        ]
+
+        # Transform to list of dicts
+        metrics = []
+        for col in metrics_df.columns:
+            metric_dict = {"name": col}
+            # Add the first 4 rows as key-value pairs
+            for i, idx in enumerate(metrics_df.index):
+                metric_dict[idx] = metrics_df.loc[idx, col]
+            metrics.append(metric_dict)
+
+        # Get the filtered metrics layers from the GUI configuration
+        filtered_metrics = self.database.site.gui.output_layers.get_aggr_metrics_layers(
+            metrics, type, rp, equity
         )
 
+        return filtered_metrics
+
     # Static
     def load_static_data(self):
         """Read the static data into the cache.

flood_adapt/misc/utils.py

@@ -4,13 +4,17 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import Union
 
+import geopandas as gpd
 from pydantic import BeforeValidator
 
+from flood_adapt.misc.log import FloodAdaptLogging
 from flood_adapt.misc.path_builder import (
     ObjectDir,
     db_path,
 )
 
+logger = FloodAdaptLogging.getLogger(__name__)
+
 
 @contextmanager
 def modified_environ(*remove, **update):
@@ -136,22 +140,37 @@ def save_file_to_database(
     if src_file == dst_file:
         return dst_file
     elif dst_file.exists():
-        if dst_file.suffix == ".shp":
-            for file in list(dst_file.parent.glob(f"{dst_file.stem}.*")):
-                os.remove(file)
-        else:
-            os.remove(dst_file)
+        match dst_file.suffix:
+            case ".shp":
+                for file in list(dst_file.parent.glob(f"{dst_file.stem}.*")):
+                    os.remove(file)
+            case _:
+                os.remove(dst_file)
 
     dst_file.parent.mkdir(parents=True, exist_ok=True)
-    if src_file.suffix == ".shp":
-        for file in list(src_file.parent.glob(f"{src_file.stem}.*")):
-            shutil.copy2(file, dst_file.parent.joinpath(file.name))
-    else:
-        shutil.copy2(src_file, dst_file)
+    match src_file.suffix:
+        case ".shp" | ".geojson" | ".gpkg":
+            write_gdf_with_global_crs(src_file, dst_file)
+        case _:
+            shutil.copy2(src_file, dst_file)
 
     return dst_file
 
 
+def write_gdf_with_global_crs(src: gpd.GeoDataFrame | Path, dst_path: Path) -> None:
+    if isinstance(src, gpd.GeoDataFrame):
+        gdf = src
+    else:
+        gdf = gpd.read_file(src)
+
+    if gdf.crs is None:
+        logger.warning(f"CRS is not defined for {src}. Assuming EPSG:4326.")
+        gdf = gdf.set_crs(epsg=4326)
+    else:
+        gdf = gdf.to_crs(epsg=4326)
+    gdf.to_file(dst_path)
+
+
 def copy_file_to_output_dir(file_path: Path, output_dir: Path) -> Path:
     output_dir = output_dir.resolve()
     if file_path == output_dir / file_path.name:

flood_adapt/objects/forcing/plotting.py

@@ -161,7 +161,7 @@ def plot_discharge(
     if output_loc.exists():
         output_loc.unlink()
     fig.write_html(output_loc)
-    return str(output_loc), None
+    return output_loc.as_posix(), None
 
 
 def plot_waterlevel(
@@ -278,7 +278,7 @@ def plot_waterlevel(
     if output_loc.exists():
         output_loc.unlink()
     fig.write_html(output_loc)
-    return str(output_loc), None
+    return output_loc.as_posix(), None
 
 
 def plot_rainfall(
@@ -351,7 +351,7 @@ def plot_rainfall(
     if output_loc.exists():
         output_loc.unlink()
     fig.write_html(output_loc)
-    return str(output_loc), None
+    return output_loc.as_posix(), None
 
 
 def plot_wind(
@@ -423,4 +423,4 @@ def plot_wind(
     if output_loc.exists():
         output_loc.unlink()
     fig.write_html(output_loc)
-    return str(output_loc), None
+    return output_loc.as_posix(), None

flood_adapt/objects/measures/measures.py

@@ -198,7 +198,9 @@ class Measure(Object):
         measure = cls.model_validate(toml)
 
         if measure.polygon_file:
-            measure.polygon_file = str(Path(file_path).parent / measure.polygon_file)
+            measure.polygon_file = (
+                Path(file_path).parent / measure.polygon_file
+            ).as_posix()
 
         return measure
 

flood_adapt/workflows/benefit_runner.py

@@ -1,4 +1,5 @@
 import shutil
+from pathlib import Path
 from typing import Any
 
 import geopandas as gpd
@@ -32,7 +33,7 @@ class BenefitRunner:
         self.benefit = benefit
 
         # Get output path based on database path
-        self.results_path = self.database.benefits.output_path.joinpath(
+        self.results_path: Path = self.database.benefits.output_path.joinpath(
             self.benefit.name
         )
         self.site_info = self.database.site
@@ -71,7 +72,7 @@ class BenefitRunner:
         results_html = self.results_path.joinpath("benefits.html")
         with open(results_toml, mode="rb") as fp:
             results = tomli.load(fp)
-        results["html"] = str(results_html)
+        results["html"] = results_html.as_posix()
         self._results = results
         return results
 

{flood_adapt-1.0.6.dist-info → flood_adapt-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.0.6
+Version: 1.1.1
 Summary: A software package support system which can be used to assess the benefits and costs of flood resilience measures
 Author-email: Gundula Winter <Gundula.Winter@deltares.nl>, Panos Athanasiou <Panos.Athanasiou@deltares.nl>, Frederique de Groen <Frederique.deGroen@deltares.nl>, Tim de Wilde <Tim.deWilde@deltares.nl>, Julian Hofer <Julian.Hofer@deltares.nl>, Daley Adrichem <Daley.Adrichem@deltares.nl>, Luuk Blom <Luuk.Blom@deltares.nl>
 License: ====================================================
@@ -705,19 +705,21 @@ Project-URL: Source, https://github.com/Deltares-research/FloodAdapt
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 Classifier: Topic :: Scientific/Engineering :: Hydrology
-Requires-Python: <3.13,>=3.8
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cht-cyclones==1.0.3
-Requires-Dist: cht-meteo==0.3.1
-Requires-Dist: cht-observations==0.2.1
-Requires-Dist: cht-tide==0.1.1
-Requires-Dist: fiat-toolbox==0.1.20
+Requires-Dist: cht-cyclones<2.0,>=1.0.3
+Requires-Dist: cht-meteo<1.0,>=0.3.1
+Requires-Dist: cht-observations<1.0,>=0.2.1
+Requires-Dist: cht-tide<1.0,>=0.1.1
+Requires-Dist: dask==2024.11.2
+Requires-Dist: numba_celltree==0.2.2
+Requires-Dist: fiat-toolbox<0.2.0,>=0.1.22
 Requires-Dist: fiona<2.0,>=1.0
 Requires-Dist: geojson<4.0,>=3.0
 Requires-Dist: geopandas<2.0,>=1.0
-Requires-Dist: hydromt-fiat<1.0,>=0.5.5
-Requires-Dist: hydromt-sfincs[quadtree]<2.0,>=1.2.2
+Requires-Dist: hydromt-fiat<1.0,>=0.5.9
+Requires-Dist: hydromt-sfincs<2.0,>=1.2.0
 Requires-Dist: numpy<2.0,>=1.0
 Requires-Dist: numpy-financial<2.0,>=1.0
 Requires-Dist: pandas<3.0,>=2.0
@@ -753,8 +755,6 @@ Requires-Dist: python-dotenv<2.0,>=1.0; extra == "docs"
 Requires-Dist: folium<1.0,>=0.19.0; extra == "docs"
 Requires-Dist: mapclassify<3.0,>=2.8.0; extra == "docs"
 Requires-Dist: contextily; extra == "docs"
-Provides-Extra: all
-Requires-Dist: flood-adapt[build,dev,docs]; extra == "all"
 
 # FloodAdapt
 FloodAdapt is a decision-support tool that seeks to advance and accelerate flooding-related adaptation planning. It brings rapid, physics-based compound flood and detailed impact modelling into an easy-to-use system, allowing non-expert end-users to evaluate a wide variety of compound events, future conditions, and adaptation options in minutes.  FloodAdapt serves as a connector between scientific advances and practitioner needs, improving and increasing the uptake and impact of adaptation research and development.
@@ -772,117 +772,6 @@ Recent developments of the decision-support system include (1) simplifying and p
 
 FloodAdapt is currently in an intensive development stage. Independent usage of the repository will be challenging prior to end-of-year 2024. FloodAdapt documentation will be expanded on throughout 2024.
 
-# Installation
+# Getting Started
 
-## Setting up Pixi
-To build the environment, manage dependencies and run tasks, FloodAdapt uses [Pixi](https://pixi.sh/latest/), please download and install it by following the instructions on the pixi website.
-
-Before continuing the installation process, make sure you have access to all required private repositories by ensuring you are in the Teams `FloodAdaptUsers` in the [Deltares](https://github.com/orgs/Deltares/teams/floodadaptusers) and [Deltares-research](https://github.com/orgs/Deltares-research/teams/floodadaptusers) organizations.
-
-## Windows
-Then run these commands to install FloodAdapt:
-```bash
-git clone https://github.com/Deltares-research/FloodAdapt.git
-cd FloodAdapt
-pixi install
-```
-## Linux
-Linux is not supported at the moment, but will be supported in the near future.
-
-## Configure database
-
-#### TODO add section for the DatabaseBuilder.
-
-FloodAdapt uses a database to store, handle and organize input files, output files and static data. This database needs to be configured the first time you want to use FloodAdapt. Which is done via `flood_adapt/misc/config.py` which contains the `Settings` class to set and validate environment variables, specific to your system.
-
-To initialize FloodAdapt and configure the database, add the following lines to the top of your script / initialize function to validate and set the environment variables:
-```python
-from pathlib import Path
-from flood_adapt import Settings
-
-# Usually ends in `Database` and can contain multiple sites
-root = Path("path/to/your/database/root")
-
-# Specifies which site to use
-name = "database_name"
-
-# Define the paths to the model kernel binaries
-sfincs_bin = Path("path/to/your/sfincs/bin.exe")
-fiat_bin = Path("path/to/your/fiat/bin.exe")
-
-# Validate and set environment variables
-Settings(
-    DATABASE_ROOT=root,
-    DATABASE_NAME=name,
-    SFINCS_BIN_PATH=sfincs_bin,
-    FIAT_BIN_PATH=fiat_path,
-    VALIDATE_BINARIES=True,
-)
-```
-
-## Developing FloodAdapt
-
-To contribute to FloodAdapt, you will need to install additional dependencies. To do so, clone the repository and install the development environment:
-
-```bash
-# Install dev environment
-git clone https://github.com/Deltares/FloodAdapt
-cd FloodAdapt
-
-# This will install the required environment and run the tests to verify
-pixi run tests
-```
-
-Alternatively, you can open an interactive shell and have pixi take care of activating and updating your environment.
-```bash
-# `activate` the dev environment
-pixi shell -e dev
-
-# Develop
-pytest tests/test_x/test_y/test_z.py
-python scripts/my_script.py
-...
-```
-
-### Adding editable installations to your environment
-
-To make developing easier and not have to reinstall packages after every change, editable installs exist.
-Pixi supports editable installs, but not in the most intuitive way, as they need to be defined as editable in the project specification.
-
-Example command to add the package `example_package` as an editable install to the default environment:
-- go to the non-pixi sections in `pyproject.toml` and comment out the `example_package`. (`[dependencies]` or `[optional-dependencies]`)
-- in the pixi section `[tool.pixi.pypi-dependencies]`: add the following line `example_package = {path = "./path/to/example_package", editable = true }`. Note that this path is relative to the root of this project.
-- run `pixi update`
-
-## Useful pixi commands
-```bash
-# Display all pixi commands and options
-pixi -h
-
-# Install a non default pixi environment defined in pyproject.toml
-pixi install -e [ENV_NAME]
-
-# Update environment(s) to the latest allowed by dependency specifications in pyproject.toml
-pixi update
-
-# List all available tasks
-pixi task list
-
-# Run a task in the default environment for that task
-pixi run [TASK]
-
-# Start a shell in the pixi environment
-pixi shell -e [ENV_NAME]
-
-# Add a package to the dependencies
-pixi add [PACKAGE]
-
-# Run a task in a specific environment
-pixi run -e [ENV_NAME] [TASK]
-```
-
-### Generating the documentation
-
-We use `quartodoc` to generate our API documentation automatically. If you have the `docs` optional dependency group installed.
-you can do this by running `quartodoc build` from the `docs` directory, and it will create the documentation for you.
-After this is done, if you wish, you can build and view the documentation locally by running `quarto preview` from the `docs` directory
+Please review our [`developer guide`](DEVELOPER_GUIDE.md) for information on how to install and use FloodAdapt locally.

{flood_adapt-1.0.6.dist-info → flood_adapt-1.1.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-flood_adapt/__init__.py,sha256=th2A3Ub_atS7QHg1y2SxGCiECW7BKlWrXZX7fuHd4M8,781
-flood_adapt/flood_adapt.py,sha256=g-OpS0spvi-puwQFhvsfu_vvduozTPXk9DU2ay9ypgs,38698
+flood_adapt/__init__.py,sha256=qFXo1YJVbLyqFpONc_TfAdUhZw9fgTacsn1XbFq1LxM,779
+flood_adapt/flood_adapt.py,sha256=HVFS4OFhcB0TqHtMw3kbEei0IfJxsciauHfG3XZ38-0,40747
 flood_adapt/adapter/__init__.py,sha256=vnF8NCkEVX-N-gtGS-J_A1H1YYAjihWjJZFyYGwcp8Q,180
-flood_adapt/adapter/fiat_adapter.py,sha256=s6M-_bwr4NUWLZvlc619BUmnA_z-DNMggVcnlG-jrqM,60075
-flood_adapt/adapter/sfincs_adapter.py,sha256=QIfD_7UnciN4MdminT5BRDEKCyubJBGf8RsSOd2hs9s,78864
+flood_adapt/adapter/fiat_adapter.py,sha256=seDjPoumkhUOd7qer3ni1_Ut3dwyq0-_yhJNaTEFc2E,60284
+flood_adapt/adapter/sfincs_adapter.py,sha256=SSZ5hlnHpXLmDQqbyBMfybdAQIOpYOqIsSzoKk4XLZg,78825
 flood_adapt/adapter/sfincs_offshore.py,sha256=DkqGwx0Fx4dojY1YH8tW3MUS4Omgd5DC6QINEsTP0Uk,7659
 flood_adapt/adapter/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/adapter/interface/hazard_adapter.py,sha256=S2NIUAMSRgxC_E-tZRJ2qIP06U1zEVdn-MnvMTrn86s,2828
@@ -11,14 +11,15 @@ flood_adapt/adapter/interface/model_adapter.py,sha256=8OMjxw-3gv6eX60bv_44AaU_lE
 flood_adapt/adapter/interface/offshore.py,sha256=G3ZpCWw6SjpyhOJIh0Acc5jnoUS8SO_zWLmfMED7zho,481
 flood_adapt/config/__init__.py,sha256=wfcPGORAGBXWUi8G7E5tLWvBS9A2ajJ9atHfxatExj4,1933
 flood_adapt/config/config.py,sha256=-aMmeBLE03O0Az-S9ms6Rz5hX8_5Kn2vr7IjjMI9w2o,9374
-flood_adapt/config/fiat.py,sha256=ZKrzNmzh8iFfm31Z1HV6YuU7QXWr1nFP1RHMhgeZ-HA,3427
-flood_adapt/config/gui.py,sha256=NRsSehmMk_8sCh9pxeCWAcwNcTo0qWTEZtkB1wZNN_g,10527
-flood_adapt/config/hazard.py,sha256=vhFvubkFdl4oTnhL7oeNHA7I_h3WCl9QzAzBByt5qrU,12210
+flood_adapt/config/fiat.py,sha256=svx3zRp8ZcHifTl0hLbl2JCeYuqckxQFJjDd-C0oqok,3417
+flood_adapt/config/gui.py,sha256=9VFfzQOjRs4E6sY0bweBUpPGgHfKc7Az7yBlNetotcg,16784
+flood_adapt/config/hazard.py,sha256=Ev6mj78cZ_vQuJ11KYjhJOzmfRB6fz267OJeKI0bYaM,12216
 flood_adapt/config/impacts.py,sha256=O7vE7jB3GSXnkqAvv7TqJiJ_j1uJ3mck_KQ-ScsB3bo,3192
 flood_adapt/config/sfincs.py,sha256=y8C3PzFwwgMB_sb8rBzgteaQ8fCxep6DnZxuk0q__bc,4825
 flood_adapt/config/site.py,sha256=VR90jCHWcxgoQJptNyXy7LseGjXUDRtdOjNGCddFVzI,4328
 flood_adapt/database_builder/__init__.py,sha256=YsI5bGcAKYmsmb5W-spp91hzsKSTRtkXBLNRxLOWml4,474
-flood_adapt/database_builder/database_builder.py,sha256=yJH1OIrPIJiT18Ab97fSZu-30uVT5u0oQYidx-gSGsc,99653
+flood_adapt/database_builder/database_builder.py,sha256=WHCsRGZq2owNyuLMpk2wEnGR2QrELAVDqJfE8xG12JE,100855
+flood_adapt/database_builder/metrics_utils.py,sha256=VCLhEIViwlmGxh9LBoEGMsRcSEvktiKvh8IolUjHPfI,66459
 flood_adapt/database_builder/templates/default_units/imperial.toml,sha256=zIjPlxIa2kWLUjSYisd8UolXGo5iKdFoDDz_JkKBXTM,295
 flood_adapt/database_builder/templates/default_units/metric.toml,sha256=tc0XMKs7xGL9noB9lAb0gyQfjYxzokgHa3NqpccxWl0,302
 flood_adapt/database_builder/templates/green_infra_table/green_infra_lookup_table.csv,sha256=ooQzNGQwAMSAphy5W2ZyR5boQlcwvPv9ToJx1MlZhVE,466
@@ -40,16 +41,7 @@ flood_adapt/database_builder/templates/icons/white_down_48x48.png,sha256=ZxXz4WK
 flood_adapt/database_builder/templates/icons/white_left_48x48.png,sha256=mLjrGhsMo79EyaeEK9Ykmym-knv2LHk92JTMWaAfaw0,738
 flood_adapt/database_builder/templates/icons/white_right_48x48.png,sha256=dxYJT-zTp8KXLcjRkd4toZjkPrFCjDwBbSmqPspw9Qk,753
 flood_adapt/database_builder/templates/icons/white_up_48x48.png,sha256=eahYlRiknCFlIfA26BJQl__o74cqwuKTRRZ35SgCXcY,733
-flood_adapt/database_builder/templates/infographics/OSM/config_charts.toml,sha256=bHvgceR1Gb05jIv7Rk2NFNWowtFn4ztVTgF4z_OOYOk,2608
-flood_adapt/database_builder/templates/infographics/OSM/config_people.toml,sha256=k-0q5reU-0LA0QMlT5Mat8mldH9t37fMSt2pUZ0P0do,1754
-flood_adapt/database_builder/templates/infographics/OSM/config_risk_charts.toml,sha256=kwBVwsSY-D3ADuJdLxFQlSLuhxguxdNXk-dn-Pt_ud8,3804
-flood_adapt/database_builder/templates/infographics/OSM/config_roads.toml,sha256=VFlCpP2KzGlfBPoblNdL6YlJEmccUvIlUgLaOtwxwrc,1874
-flood_adapt/database_builder/templates/infographics/OSM/styles.css,sha256=yV8U2Z1DwuyfaAL13iQHjEJcPiDHXCUzGt2REXlSKeg,762
-flood_adapt/database_builder/templates/infographics/US_NSI/config_charts.toml,sha256=7mRXeh7-pvfsHp-gFdubQXR33nqaSyzKuJVc1WILdJU,3762
-flood_adapt/database_builder/templates/infographics/US_NSI/config_people.toml,sha256=9VJ0rzIj4YZIYWATQZYmbO6KLBB-C9i7skBOvE0M3oA,1892
-flood_adapt/database_builder/templates/infographics/US_NSI/config_risk_charts.toml,sha256=kwBVwsSY-D3ADuJdLxFQlSLuhxguxdNXk-dn-Pt_ud8,3804
-flood_adapt/database_builder/templates/infographics/US_NSI/config_roads.toml,sha256=T1QqW95D0MTeWMLDV85WdodXrIf0T7uIRZA9FU0l_is,1873
-flood_adapt/database_builder/templates/infographics/US_NSI/styles.css,sha256=yV8U2Z1DwuyfaAL13iQHjEJcPiDHXCUzGt2REXlSKeg,762
+flood_adapt/database_builder/templates/infographics/styles.css,sha256=yV8U2Z1DwuyfaAL13iQHjEJcPiDHXCUzGt2REXlSKeg,762
 flood_adapt/database_builder/templates/infographics/images/ambulance.png,sha256=dw5vcU_kRePrBA3Zl4_aQFz1Rc93x26y8PelY2MJ_Lo,7757
 flood_adapt/database_builder/templates/infographics/images/car.png,sha256=PFED6xR31G2P15ZGM14CyJeca7zfUlwQe2348bpPCxM,6600
 flood_adapt/database_builder/templates/infographics/images/cart.png,sha256=hLknRSLm7YCSw5kmDP_JysAN6cLiNCVKkqhfsaoT_8c,27453
@@ -62,27 +54,15 @@ flood_adapt/database_builder/templates/infographics/images/person.png,sha256=ipz
 flood_adapt/database_builder/templates/infographics/images/school.png,sha256=7N6EkuNxHKyFuBVSRDQVN3wZkX7O-eXrcvjJeyOb8w8,7554
 flood_adapt/database_builder/templates/infographics/images/truck.png,sha256=0IhvYYvmfAPvFiA5ipwTz3VnvlFe5vyfNrejPinrlOo,9492
 flood_adapt/database_builder/templates/infographics/images/walking_person.png,sha256=vaxO4oGejK5Q4KyGXuew2YgpGPabpnwLyxTFH1WMbmo,11080
-flood_adapt/database_builder/templates/infometrics/mandatory_metrics_config.toml,sha256=3iR6iKvpJuM_Ol2BQpdEU_2Y9niETYDRv8jql_wze3Q,211
-flood_adapt/database_builder/templates/infometrics/mandatory_metrics_config_risk.toml,sha256=7bczTZqoMgXot_OTQmabUbUFGFBmKkvaWSB0tsHvodk,1759
-flood_adapt/database_builder/templates/infometrics/OSM/metrics_additional_risk_configs.toml,sha256=_UTrZOqdM8ewvkHaKWfhgi7-xbTtajQTBubN7NO0Bo8,80
-flood_adapt/database_builder/templates/infometrics/OSM/with_SVI/infographic_metrics_config.toml,sha256=hqdh1XcgNiGWBenCbNom-5G_xvVxM3JVqi2iT9M3tBI,5457
-flood_adapt/database_builder/templates/infometrics/OSM/with_SVI/infographic_metrics_config_risk.toml,sha256=lKBrte-wP6fpeEGRkn8g1lE6CjP1EuR7wNI_wGuuYxo,6436
-flood_adapt/database_builder/templates/infometrics/OSM/without_SVI/infographic_metrics_config.toml,sha256=060PJozh88C-j-TxqMsoRb7TFL1yJ7f0iLShvPPwBYc,4626
-flood_adapt/database_builder/templates/infometrics/OSM/without_SVI/infographic_metrics_config_risk.toml,sha256=mKOoD1o7K3vqak_0vBWm83fsuu0SMKZNm8vv2b_5PW0,2096
-flood_adapt/database_builder/templates/infometrics/US_NSI/metrics_additional_risk_configs.toml,sha256=-J8wqk43scvvRQ804tqv3mOrbI8CJ3RsaRLVhzgrVEs,79
-flood_adapt/database_builder/templates/infometrics/US_NSI/with_SVI/infographic_metrics_config.toml,sha256=CjTyfC3wwG6krpHM8LMPhIM0c7u3Ljet8FHglNSjkPw,7436
-flood_adapt/database_builder/templates/infometrics/US_NSI/with_SVI/infographic_metrics_config_risk.toml,sha256=5hZnHWUX_UnA8TAHh_MAnFV8ra-m-8DWyAFkwyT8iHQ,6301
-flood_adapt/database_builder/templates/infometrics/US_NSI/without_SVI/infographic_metrics_config.toml,sha256=aPCMJ2BlpXjSHZA9x80JhhvCkbDDqZ-P7gwOYnxq34A,6631
-flood_adapt/database_builder/templates/infometrics/US_NSI/without_SVI/infographic_metrics_config_risk.toml,sha256=VLO7NRWTPzYRj3jYDb_mImPTppSm8Lh1ajCdNPuyc4U,2045
 flood_adapt/database_builder/templates/output_layers/bin_colors.toml,sha256=yN3_h2IimOyjtfhZ-ZoWyNa-2cAeFRNlbvaNTLhEMfA,417
 flood_adapt/dbs_classes/__init__.py,sha256=J-a6BEkjDhuUzzRKuAn_AtTg_D9wNIsmY3BnVTiC2JA,731
-flood_adapt/dbs_classes/database.py,sha256=oR0aC2HRsGGe0pwFrPtPAzXxfv_lqtTdjY9UrS9wwtU,23409
+flood_adapt/dbs_classes/database.py,sha256=6zYAhVJVL3bNjxEzObVn4jOnuSQJYmsEuWN85fOeDT4,23425
 flood_adapt/dbs_classes/dbs_benefit.py,sha256=ayEYz8ga49HLdYuUsDWZOuZnpRnBpTuyhvfe2IyWAKI,1825
 flood_adapt/dbs_classes/dbs_event.py,sha256=ak3kHan6L1EfC8agDLKiCe8gaY5leOmj_qUBsI61q9A,1869
 flood_adapt/dbs_classes/dbs_measure.py,sha256=vVs-LtnHJN7eSGIFUglJdpbtfq_QI_Ftkv4lh5mfnNM,4085
 flood_adapt/dbs_classes/dbs_projection.py,sha256=lyiU_ctP2ixK28RKnBN6mVJbOuaDsWCj1y6-MHlyi_k,1078
 flood_adapt/dbs_classes/dbs_scenario.py,sha256=LHWx3Dr1XR47bPyPRkR70h3VcT0f0MVgB-R8V_G_O04,3993
-flood_adapt/dbs_classes/dbs_static.py,sha256=KPKjz7xyzjn6yqVvfEHlzW7Wnqi_DmSkFhC9l4hEAr4,10557
+flood_adapt/dbs_classes/dbs_static.py,sha256=Yzs-bsfAq2jkZ_-0_ojuzNf81Wifaxw8a1APNNS0mqM,10565
 flood_adapt/dbs_classes/dbs_strategy.py,sha256=qiEObHZeYL93GmdjSiGQls1ZmxdMZPkRkwzHgmoYwyE,4856
 flood_adapt/dbs_classes/dbs_template.py,sha256=b2x2sWNYTnaWU8Plgp51PFPrZGEv2kRRn9JBAgYhLbI,11578
 flood_adapt/dbs_classes/interface/database.py,sha256=kPHsmreB-vHaFD_FRXbP06tVs7pGxt4Rucim6aEqiKg,2550
@@ -94,7 +74,7 @@ flood_adapt/misc/debug_timer.py,sha256=TUXsJSX62P66AQrf7rqpmd95EZECJVWGT7pHpuxNG
 flood_adapt/misc/exceptions.py,sha256=66lD9OlAfGadhbMN2t2C03KofzU_zOoVHnuEeDtSc0w,1827
 flood_adapt/misc/log.py,sha256=aK5uJch8p3a4Js4f79tO5AM9yZvNlGPjHYPsY5EuWbc,6898
 flood_adapt/misc/path_builder.py,sha256=sLhvk3tq-QzI3fFjdzckpBYYZeuGyHBbuI0R98Tqud8,1396
-flood_adapt/misc/utils.py,sha256=-wOWgbDqswwGVYJARKfq-3L7DIs4OIHfrze5g3-qapU,5588
+flood_adapt/misc/utils.py,sha256=geIPsi448gvS8U-W3szPkQj2G2J3ASoYiOOnO20B4ko,6134
 flood_adapt/objects/__init__.py,sha256=PlLA7iblvM4Efy7KUOZn0S1ThWcRA8L6T3CSrmr8Kvg,2134
 flood_adapt/objects/object_model.py,sha256=mNBAdsOhqGGc2DSOU2W_TfqBKdEAKFPksSJaNcLpznI,2422
 flood_adapt/objects/benefits/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -113,7 +93,7 @@ flood_adapt/objects/forcing/forcing.py,sha256=MonjhiHP6ge_5UFDMcLmj0pt5jK76Eznb4
 flood_adapt/objects/forcing/forcing_factory.py,sha256=lpugKlMt0MN8BxyykottMOuQd_fp1MHrkuuqbHWWdRY,5965
 flood_adapt/objects/forcing/meteo_handler.py,sha256=rTxY5WNobK_Ifzj2eVcoSPGgb3TzuZljSv_dLn5FLo8,3016
 flood_adapt/objects/forcing/netcdf.py,sha256=ZBzFtN5joVs36lVjvYErVaHEylUQ6eKIhR0uk_MD-zM,1388
-flood_adapt/objects/forcing/plotting.py,sha256=z612jv_9aRyK6cUm181vXFhihWz5XX_c6UDQg8rU02o,14804
+flood_adapt/objects/forcing/plotting.py,sha256=Y7f_9bY8d9jbd7BqEAeRmof-aaJhlznM3_wGBOI7g-s,14828
 flood_adapt/objects/forcing/rainfall.py,sha256=e6P3IMzItvnsmXbcMXl1oV-d9LDuh3jTIc_vt6Kz5zo,3282
 flood_adapt/objects/forcing/tide_gauge.py,sha256=jGIh6jQlhecGkPfBaZ8NKbr7FlpmLZAwmlqgp8lEWu0,7143
 flood_adapt/objects/forcing/time_frame.py,sha256=1X3G0Ax18BHRvAomf-CW_ISRk_3qgAakwgZCIBxIkL4,2855
@@ -123,7 +103,7 @@ flood_adapt/objects/forcing/waterlevels.py,sha256=8lCmUdeyABurJwftae4_Iut9hCn24x
 flood_adapt/objects/forcing/wind.py,sha256=xs_xZdUoZUDP1y1xITlNVJwiyDt6wQsFbPFhVRDjSqg,3925
 flood_adapt/objects/measures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/objects/measures/measure_factory.py,sha256=tPT4fSzT5buiLf3gmxtap1vrfH2HusQOWTluucFFwJ0,2728
-flood_adapt/objects/measures/measures.py,sha256=WCVwMJNvvHNgYjALwrIMKPUChe4qPF1FyI4eG6jUQnc,19717
+flood_adapt/objects/measures/measures.py,sha256=fJ7f6zcViQJIMlyKQlnL8hOwWcNZmsuheh1LeRjDB7U,19757
 flood_adapt/objects/output/floodmap.py,sha256=_JmPFIjORSwyAKICgUtEgTn0wswWdGY-sEFy3KqNo_k,281
 flood_adapt/objects/projections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/objects/projections/projections.py,sha256=GCbT2nAGEkiBicVrfuYsw1UYIj9BLj9v0pGnhBI7DZk,4052
@@ -132,10 +112,10 @@ flood_adapt/objects/scenarios/scenarios.py,sha256=2_VSO9rl5bdy2PT-Po5ngnEp9a0gmH
 flood_adapt/objects/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/objects/strategies/strategies.py,sha256=Jw-WJDCamL9p_7VEir3AdmYPMVAiCVRU9n_whG6WcgE,2981
 flood_adapt/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flood_adapt/workflows/benefit_runner.py,sha256=VtYt0sHFymNyErpzOtuN55cKJGVm5hT2a_Qzprg6T88,21786
+flood_adapt/workflows/benefit_runner.py,sha256=eA21TuHdeZ6QYO8ehXri6BHlkyHsVsZphIdIca5g0KA,21824
 flood_adapt/workflows/scenario_runner.py,sha256=9_Y6GmMYhYoTRkBUIlju0eBy6DosGf4Zl2tgu1QEubI,4119
-flood_adapt-1.0.6.dist-info/LICENSE,sha256=Ui5E03pQ0EVKxvKA54lTPA1xrtgA2HMGLQai95eOzoE,36321
-flood_adapt-1.0.6.dist-info/METADATA,sha256=FvbH5BpNMV_cXv23oWzPC2APQvSzPmGBwQKZjyBIFGY,53209
-flood_adapt-1.0.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-flood_adapt-1.0.6.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
-flood_adapt-1.0.6.dist-info/RECORD,,
+flood_adapt-1.1.1.dist-info/LICENSE,sha256=Ui5E03pQ0EVKxvKA54lTPA1xrtgA2HMGLQai95eOzoE,36321
+flood_adapt-1.1.1.dist-info/METADATA,sha256=ZCiBsiXoCBBXNEMSsEhJbI5wZiVyW6aVH6EVZBaJY8k,48876
+flood_adapt-1.1.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+flood_adapt-1.1.1.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
+flood_adapt-1.1.1.dist-info/RECORD,,