resolved conflicts

hydromt_delft3dfm/workflows/boundaries.py

@@ -11,7 +11,6 @@
 
 from hydromt_delft3dfm import graph_utils
 
-
 logger = logging.getLogger(__name__)
 
 __all__ = [

hydromt_delft3dfm/workflows/crosssections.py

@@ -602,10 +602,11 @@ def set_point_crosssections(
         return pd.DataFrame()
 
     # get branch friction (regard crosssections')
+    _friction_cols = ["frictionid", "frictiontype", "frictionvalue"]
     crosssections = crosssections.drop(
-        columns=["frictionid", "frictiontype", "frictionvalue"]
+        columns=[c for c in _friction_cols if c in crosssections.columns],
     ).merge(
-        branches[["frictionid", "frictiontype", "frictionvalue"]],
+        branches[_friction_cols],
         left_on="branch_id",
         right_index=True,
     )
@@ -1026,11 +1027,11 @@ def _set_xyz_crs(crosssections: gpd.GeoDataFrame):
                 "crsdef_xcoordinates": c.xcoordinates,
                 "crsdef_ycoordinates": c.ycoordinates,
                 "crsdef_zcoordinates": c.zcoordinates,
+                "crsdef_frictionpositions": f"0 { c.ycoordinates.split(' ')[-1]}",
                 "crsdef_closed": c.closed,
                 "crsdef_frictionids": c.frictionid,
                 "frictiontype": c.frictiontype,
                 "frictionvalue": c.frictionvalue,
-                "crsdef_frictionpositions": c.frictionpositions,
             }
         )
         crslocs.append(
@@ -1057,7 +1058,7 @@ def _set_xyz_crs(crosssections: gpd.GeoDataFrame):
     return crosssections_
 
 
-def xyzp2xyzl(xyz: pd.DataFrame, sort_by: list = ["x", "y"]):
+def xyzp2xyzl(xyz: pd.DataFrame, sort_by: list = ["x", "y"]) -> gpd.GeoDataFrame:
     """Convert xyz points to xyz lines.
 
     Parameters