flood-adapt 1.1.2__tar.gz → 1.1.4__tar.gz

{flood_adapt-1.1.2 → flood_adapt-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.1.2
+Version: 1.1.4
 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: ====================================================
@@ -712,14 +712,12 @@ 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.9
-Requires-Dist: hydromt-sfincs<2.0,>=1.2.0
+Requires-Dist: hydromt-sfincs<2.0,>=1.2.2
 Requires-Dist: numpy<2.0,>=1.0
 Requires-Dist: numpy-financial<2.0,>=1.0
 Requires-Dist: pandas<3.0,>=2.0

{flood_adapt-1.1.2 → flood_adapt-1.1.4}/flood_adapt/__init__.py

@@ -1,5 +1,5 @@
 # has to be here at the start to avoid circular imports
-__version__ = "1.1.2"
+__version__ = "1.1.4"
 
 from flood_adapt import adapter, database_builder, dbs_classes, objects
 from flood_adapt.config.config import Settings

{flood_adapt-1.1.2 → flood_adapt-1.1.4}/flood_adapt/adapter/sfincs_adapter.py

@@ -677,23 +677,20 @@ class SfincsAdapter(IHazardAdapter):
 
     def add_obs_points(self):
         """Add observation points provided in the site toml to SFINCS model."""
-        if self.settings.obs_point is None:
+        obs_points = self.settings.obs_point
+        if not obs_points:
             return
-        logger.info("Adding observation points to the overland flood model")
 
-        obs_points = self.settings.obs_point
-        names = []
-        lat = []
-        lon = []
-        for pt in obs_points:
-            names.append(pt.name)
-            lat.append(pt.lat)
-            lon.append(pt.lon)
-
-        # create GeoDataFrame from obs_points in site file
+        names = [pt.name for pt in obs_points]
+        lat = [pt.lat for pt in obs_points]
+        lon = [pt.lon for pt in obs_points]
+
+        logger.info("Adding observation points to the overland flood model")
         df = pd.DataFrame({"name": names})
         gdf = gpd.GeoDataFrame(
-            df, geometry=gpd.points_from_xy(lon, lat), crs="EPSG:4326"
+            df,
+            geometry=gpd.points_from_xy(lon, lat),
+            crs="EPSG:4326",
         )
 
         # Add locations to SFINCS file

flood_adapt-1.1.4/flood_adapt/database_builder/__init__.py

@@ -0,0 +1,50 @@
+from flood_adapt.config import (
+    FloodModel,
+    SlrScenariosModel,
+)
+from flood_adapt.database_builder.database_builder import (
+    Basins,
+    ConfigModel,
+    FootprintsOptions,
+    GuiConfigModel,
+    ObsPointModel,
+    SpatialJoinModel,
+    SviConfigModel,
+    TideGaugeConfigModel,
+    TideGaugeSource,
+    UnitSystems,
+    create_database,
+)
+
+from .metrics_utils import (
+    BuildingsInfographicModel,
+    EventInfographicModel,
+    HomesInfographicModel,
+    ImpactCategoriesModel,
+    MetricModel,
+    RiskInfographicModel,
+    RoadsInfographicModel,
+)
+
+__all__ = [
+    "Basins",
+    "ConfigModel",
+    "FootprintsOptions",
+    "GuiConfigModel",
+    "SpatialJoinModel",
+    "SviConfigModel",
+    "TideGaugeConfigModel",
+    "TideGaugeSource",
+    "UnitSystems",
+    "create_database",
+    "BuildingsInfographicModel",
+    "EventInfographicModel",
+    "HomesInfographicModel",
+    "MetricModel",
+    "RiskInfographicModel",
+    "RoadsInfographicModel",
+    "ImpactCategoriesModel",
+    "FloodModel",
+    "SlrScenariosModel",
+    "ObsPointModel",
+]