flood-adapt 0.3.12__tar.gz → 0.3.14__tar.gz

{flood_adapt-0.3.12 → flood_adapt-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 0.3.12
+Version: 0.3.14
 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:                     GNU GENERAL PUBLIC LICENSE

{flood_adapt-0.3.12 → flood_adapt-0.3.14}/flood_adapt/__init__.py

@@ -1,10 +1,9 @@
 # has to be here at the start to avoid circular imports
-__version__ = "0.3.12"
+__version__ = "0.3.14"
 
-from flood_adapt import adapter, dbs_classes, objects
+from flood_adapt import adapter, database_builder, dbs_classes, objects
 from flood_adapt.config.config import Settings
 from flood_adapt.config.site import Site
-from flood_adapt.database_builder.database_builder import DatabaseBuilder
 from flood_adapt.flood_adapt import FloodAdapt
 from flood_adapt.misc.exceptions import ComponentError, DatabaseError, FloodAdaptError
 from flood_adapt.misc.log import FloodAdaptLogging
@@ -19,10 +18,10 @@ __all__ = [
     "objects",
     "dbs_classes",
     "adapter",
+    "database_builder",
     "FloodAdaptError",
     "DatabaseError",
     "ComponentError",
-    "DatabaseBuilder",
 ]
 
 FloodAdaptLogging()  # Initialize logging once for the entire package

{flood_adapt-0.3.12 → flood_adapt-0.3.14}/flood_adapt/adapter/fiat_adapter.py

@@ -880,6 +880,16 @@ class FiatAdapter(IImpactAdapter):
             for aggr in self.config.aggregation
         ]
         new_dev_geom_name = Path(self.config.new_development_file_name).stem
+        # Ensure new_devs geom is in the correct CRS
+        new_dev_geom = gpd.read_file(area_path)
+        if new_dev_geom.crs != self.model.exposure.crs:
+            self.logger.warning(
+                f"New development area geometries are in {new_dev_geom.crs}, but the model is in {self.model.exposure.crs}. Reprojecting geometries."
+            )
+            new_dev_geom = new_dev_geom.to_crs(self.model.exposure.crs)
+        # Replace file with the reprojected one
+        os.remove(area_path)
+        new_dev_geom.to_file(area_path)
         # Use hydromt function
         self.model.exposure.setup_new_composite_areas(
             percent_growth=population_growth,

{flood_adapt-0.3.12 → flood_adapt-0.3.14}/flood_adapt/adapter/sfincs_adapter.py

@@ -675,7 +675,10 @@ class SfincsAdapter(IHazardAdapter):
             )
 
             event = self.database.events.get(scenario.event)
-            if self.settings.obs_point[ii].name == self.settings.tide_gauge.name:
+            if (
+                self.settings.tide_gauge is not None
+                and self.settings.obs_point[ii].name == self.settings.tide_gauge.name
+            ):
                 self._add_tide_gauge_plot(fig, event, units=gui_units)
 
             # write html to results folder

flood_adapt-0.3.14/flood_adapt/database_builder/__init__.py

@@ -0,0 +1,23 @@
+from flood_adapt.database_builder.database_builder import (
+    Basins,
+    ConfigModel,
+    FootprintsOptions,
+    GuiConfigModel,
+    SpatialJoinModel,
+    SviConfigModel,
+    TideGaugeConfigModel,
+    UnitSystems,
+    create_database,
+)
+
+__all__ = [
+    "Basins",
+    "ConfigModel",
+    "FootprintsOptions",
+    "GuiConfigModel",
+    "SpatialJoinModel",
+    "SviConfigModel",
+    "TideGaugeConfigModel",
+    "UnitSystems",
+    "create_database",
+]