Added parameters for variable friction and 1D vegetation

CHANGES.rst

@@ -4,7 +4,8 @@ Changelog of threedi-schema
 0.217.14 (unreleased)
 ---------------------
 
-- Nothing changed yet.
+- Add parameters vegetation_stem_density, vegetation_stem_diameter, vegetation_height and vegetation_drag_coefficient to CrossSectionLocation
+- Add parameters friction_values, vegetation_stem_densities, vegetation_stem_diameters, vegetation_heights and vegetation_drag_coefficients to CrossSectionDefinition
 
 
 0.217.13 (2023-10-02)

threedi_schema/domain/models.py

@@ -267,6 +267,11 @@ class CrossSectionDefinition(Base):
     height = Column(String(255))
     shape = Column(IntegerEnum(constants.CrossSectionShape))
     code = Column(String(100))
+    friction_values = Column(String)
+    vegetation_stem_densities = Column(String)
+    vegetation_stem_diameters = Column(String)
+    vegetation_heights = Column(String)
+    vegetation_drag_coefficients = Column(String)
 
 
 class ConnectionNode(Base):
@@ -573,6 +578,10 @@ class CrossSectionLocation(Base):
     friction_type = Column(IntegerEnum(constants.FrictionType), nullable=False)
     friction_value = Column(Float, nullable=False)
     bank_level = Column(Float)
+    vegetation_stem_density = Column(Float)
+    vegetation_stem_diameter = Column(Float)
+    vegetation_height = Column(Float)
+    vegetation_drag_coefficient = Column(Float)
     the_geom = Column(Geometry("POINT"), nullable=False)
     channel_id = Column(
         Integer, ForeignKey(Channel.__tablename__ + ".id"), nullable=False

threedi_schema/migrations/versions/0218_1d_vegetation_and_variable_friction.py

@@ -0,0 +1,50 @@
+"""rename vegetation columns
+
+Revision ID: 0218
+Revises: 0217
+Create Date: 2023-12-22 08:33
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = '0218'
+down_revision = '0217'
+branch_labels = None
+depends_on = None
+
+LOC_COLUMNS = (
+    "vegetation_stem_density",
+    "vegetation_stem_diameter",
+    "vegetation_height",
+    "vegetation_drag_coefficient",
+    "vegetation_drag_coeficients"
+)
+
+DEF_COLUMNS = (
+    "friction_values",
+    "vegetation_stem_densities",
+    "vegetation_stem_diameters",
+    "vegetation_heights",
+    "vegetation_drag_coefficients"
+)
+
+
+def upgrade():
+    with op.batch_alter_table("v2_cross_section_location") as batch_op:
+        for column in LOC_COLUMNS:
+            batch_op.add_column(sa.Column(column, sa.Float()))
+    with op.batch_alter_table("v2_cross_section_definition") as batch_op:
+        for column in DEF_COLUMNS:
+            batch_op.add_column(sa.Column(column, sa.String()))
+
+
+def downgrade():
+    with op.batch_alter_table("v2_cross_section_location") as batch_op:
+        for column in LOC_COLUMNS:
+            batch_op.drop_column(column)
+    with op.batch_alter_table("v2_cross_section_definition") as batch_op:
+        for column in DEF_COLUMNS:
+            batch_op.drop_column(column)