Initialize spatial table as GeoDataFrame

python/ribasim/ribasim/config.py

@@ -132,7 +132,7 @@ def add(self, node: Node, tables: Sequence[TableModel[Any]] | None = None) -> No
             node_type=self.__class__.__name__,
         )
         self.node.df = (
-            node_table  # type: ignore
+            node_table
             if self.node.df is None
             else pd.concat([self.node.df, node_table])
         )

python/ribasim/ribasim/geometry/edge.py

@@ -76,7 +76,7 @@ def add(
         if self.df is None:
             self.df = table_to_append
         else:
-            self.df = pd.concat([self.df, table_to_append])  # type: ignore
+            self.df = pd.concat([self.df, table_to_append])
 
     def get_where_edge_type(self, edge_type: str) -> NDArray[np.bool_]:
         assert self.df is not None

python/ribasim/ribasim/input_base.py

@@ -17,6 +17,7 @@
 import pandas as pd
 import pandera as pa
 from pandera.typing import DataFrame
+from pandera.typing.geopandas import GeoDataFrame
 from pydantic import BaseModel as PydanticBaseModel
 from pydantic import (
     ConfigDict,
@@ -339,6 +340,8 @@
 
 
 class SpatialTableModel(TableModel[TableT], Generic[TableT]):
+    df: GeoDataFrame[TableT] | None = Field(default=None, exclude=True, repr=False)
+
     @classmethod
     def _from_db(cls, path: FilePath, table: str):
         with connect(path) as connection:
@@ -358,10 +361,9 @@
         ----------
         path : FilePath
         """
-
-        gdf = gpd.GeoDataFrame(data=self.df)
-        gdf = gdf.set_geometry("geometry")
-        gdf.to_file(path, layer=self.tablename(), driver="GPKG", mode="a")
+        if self.df is None:
+            return
+        self.df.to_file(path, layer=self.tablename(), driver="GPKG", mode="a")
 
     def sort(self):
         if self.df is not None: