From 2e72e0bb247efbe0fbecc3500a9cca14dbe2293d Mon Sep 17 00:00:00 2001
From: margrietpalm <margrietpalm@users.noreply.github.com>
Date: Thu, 23 Jan 2025 03:44:44 -0800
Subject: [PATCH] Adapt to match some name changes in threedi-schema (#411)
---
CHANGES.rst | 2 +-
threedigrid_builder/interface/db.py | 44 ++++++++++++++---------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/CHANGES.rst b/CHANGES.rst
index 9d99be62..993b2f83 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ Changelog of threedigrid-builder
1.23.1 (unreleased)
-------------------
-- Nothing changed yet.
+- Adapt to match some name changes in threedi-schema
1.23.0 (2025-01-16)
diff --git a/threedigrid_builder/interface/db.py b/threedigrid_builder/interface/db.py
index 3ddfc851..bd14a3de 100644
--- a/threedigrid_builder/interface/db.py
+++ b/threedigrid_builder/interface/db.py
@@ -159,7 +159,7 @@ def get_version(self) -> int:
def upgrade(self, convert_to_geopackage=False):
schema = ModelSchema(self.db)
- schema.upgrade(backup=False, convert_to_geopackage=convert_to_geopackage)
+ schema.upgrade(backup=False)
@contextmanager
def get_session(self) -> ContextManager[Session]:
@@ -205,7 +205,7 @@ def get_settings(self) -> dict:
infiltration = {}
if model_settings.use_vegetation_drag_2d:
vegetation_drag = _object_as_dict(
- session.query(models.VegetationDrag).one()
+ session.query(models.VegetationDrag2D).one()
)
else:
vegetation_drag = {}
@@ -325,21 +325,21 @@ def get_surfaces(self) -> Surfaces:
models.Surface.display_name,
models.Surface.area,
models.Surface.geom.label("the_geom"),
- models.SurfaceParameter.outflow_delay,
- models.SurfaceParameter.surface_layer_thickness,
- models.SurfaceParameter.infiltration,
- models.SurfaceParameter.max_infiltration_capacity,
- models.SurfaceParameter.min_infiltration_capacity,
- models.SurfaceParameter.infiltration_decay_constant,
- models.SurfaceParameter.infiltration_recovery_constant,
+ models.SurfaceParameters.outflow_delay,
+ models.SurfaceParameters.surface_layer_thickness,
+ models.SurfaceParameters.infiltration,
+ models.SurfaceParameters.max_infiltration_capacity,
+ models.SurfaceParameters.min_infiltration_capacity,
+ models.SurfaceParameters.infiltration_decay_constant,
+ models.SurfaceParameters.infiltration_recovery_constant,
models.SurfaceMap.connection_node_id,
models.SurfaceMap.percentage,
models.ConnectionNode.geom.label("connection_node_the_geom"),
)
.select_from(models.Surface)
.join(
- models.SurfaceParameter,
- models.Surface.surface_parameters_id == models.SurfaceParameter.id,
+ models.SurfaceParameters,
+ models.Surface.surface_parameters_id == models.SurfaceParameters.id,
)
.join(
models.SurfaceMap, models.SurfaceMap.surface_id == models.Surface.id
@@ -848,18 +848,18 @@ def get_windshieldings(self) -> Windshieldings:
with self.get_session() as session:
arr = (
session.query(
- models.Windshielding.id,
- models.Windshielding.channel_id,
- models.Windshielding.north,
- models.Windshielding.northeast,
- models.Windshielding.east,
- models.Windshielding.southeast,
- models.Windshielding.south,
- models.Windshielding.southwest,
- models.Windshielding.west,
- models.Windshielding.northwest,
+ models.Windshielding1D.id,
+ models.Windshielding1D.channel_id,
+ models.Windshielding1D.north,
+ models.Windshielding1D.northeast,
+ models.Windshielding1D.east,
+ models.Windshielding1D.southeast,
+ models.Windshielding1D.south,
+ models.Windshielding1D.southwest,
+ models.Windshielding1D.west,
+ models.Windshielding1D.northwest,
)
- .order_by(models.Windshielding.id)
+ .order_by(models.Windshielding1D.id)
.as_structarray()
)