resolved conflict

Deltares · Oct 18, 2024 · 56b3f4d · 56b3f4d
2 parents 328f30f + fa8c695
commit 56b3f4d
Show file tree

Hide file tree

Showing 6 changed files with 166 additions and 114 deletions.
diff --git a/examples/dflowfm_local/dflowfm/structures.ini b/examples/dflowfm_local/dflowfm/structures.ini
@@ -1,4 +1,4 @@
-# written by HYDROLIB-core 0.5.2
+# written by HYDROLIB-core 0.8.0
 
 [General]
 fileVersion = 3.00
@@ -9,7 +9,7 @@ id              = bridge_1                     # Unique structure id (max. 256 c
 name            = bridge_1                     # Given name in the user interface.
 type            = bridge                       # Structure type; must read bridge
 branchId        = branch_12                    # Branch on which the structure is located.
-chainage        = 14.101                       # Chainage on the branch (m).
+chainage        = 14.101398079368284           # Chainage on the branch (m).
 allowedFlowdir  = positive                     # Possible values: both, positive, negative, none.
 csDefId         = rect_h1.550_w2.000_cno_point # Id of Cross-Section Definition.
 shift           = 2.34                         # Vertical shift of the cross section definition [m]. Defined positive upwards.
@@ -24,7 +24,7 @@ id              = bridge_2                      # Unique structure id (max. 256
 name            = bridge_2                      # Given name in the user interface.
 type            = bridge                        # Structure type; must read bridge
 branchId        = branch_3                      # Branch on which the structure is located.
-chainage        = 485.794                       # Chainage on the branch (m).
+chainage        = 485.7938981330206             # Chainage on the branch (m).
 allowedFlowdir  = both                          # Possible values: both, positive, negative, none.
 csDefId         = rect_h1.800_w5.000_cyes_point # Id of Cross-Section Definition.
 shift           = 2.37                          # Vertical shift of the cross section definition [m]. Defined positive upwards.
@@ -39,7 +39,7 @@ id                 = culvert_1                     # Unique structure id (max. 2
 name               = culvert_1                     # Given name in the user interface.
 type               = culvert
 branchId           = branch_13                     # Branch on which the structure is located.
-chainage           = 331.832                       # Chainage on the branch (m).
+chainage           = 331.83172489372555            # Chainage on the branch (m).
 allowedFlowDir     = positive
 leftLevel          = 2.56
 rightLevel         = 2.5

diff --git a/examples/dflowfm_local/geoms/bridges.geojson b/examples/dflowfm_local/geoms/bridges.geojson
@@ -1,8 +1,63 @@
 {
-"type": "FeatureCollection",
-"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::32647" } },
-"features": [
-{ "type": "Feature", "properties": { "friction": 0.023, "frictiontype": "Manning", "csdefid": "rect_h1.550_w2.000_cno_point", "length": 10.0, "inletlosscoeff": 0.2, "id": "bridge_1", "pillarwidth": null, "allowedflowdir": "positive", "formfactor": null, "type": "bridge", "branchid": "branch_12", "shift": 2.34, "outletlosscoeff": 0.2, "chainage": 14.101 }, "geometry": { "type": "Point", "coordinates": [ 665021.849053248995915, 1525588.928306785644963 ] } },
-{ "type": "Feature", "properties": { "friction": 0.023, "frictiontype": "Manning", "csdefid": "rect_h1.800_w5.000_cyes_point", "length": 5.0, "inletlosscoeff": 0.8, "id": "bridge_2", "pillarwidth": null, "allowedflowdir": "both", "formfactor": null, "type": "bridge", "branchid": "branch_3", "shift": 2.37, "outletlosscoeff": 0.82, "chainage": 485.794 }, "geometry": { "type": "Point", "coordinates": [ 665599.689329552114941, 1525859.454655284294859 ] } }
-]
-}
+    "type": "FeatureCollection",
+    "crs": {
+        "type": "name",
+        "properties": {
+            "name": "urn:ogc:def:crs:EPSG::32647"
+        }
+    },
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "allowedflowdir": "positive",
+                "csdefid": "rect_h1.550_w2.000_cno_point",
+                "branchid": "branch_12",
+                "formfactor": null,
+                "inletlosscoeff": 0.2,
+                "pillarwidth": null,
+                "length": 10.0,
+                "frictiontype": "Manning",
+                "friction": 0.023,
+                "chainage": 14.101398079368284,
+                "id": "bridge_1",
+                "outletlosscoeff": 0.2,
+                "shift": 2.34,
+                "type": "bridge"
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    665022.016103448579088,
+                    1525588.835311949253082
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "allowedflowdir": "both",
+                "csdefid": "rect_h1.800_w5.000_cyes_point",
+                "branchid": "branch_3",
+                "formfactor": null,
+                "inletlosscoeff": 0.8,
+                "pillarwidth": null,
+                "length": 5.0,
+                "frictiontype": "Manning",
+                "friction": 0.023,
+                "chainage": 485.7938981330206,
+                "id": "bridge_2",
+                "outletlosscoeff": 0.82,
+                "shift": 2.37,
+                "type": "bridge"
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    665599.659389415639453,
+                    1525859.470726222032681
+                ]
+            }
+        }
+    ]
+}
diff --git a/examples/dflowfm_local/geoms/crosssections.geojson b/examples/dflowfm_local/geoms/crosssections.geojson
@@ -2,8 +2,8 @@
 "type": "FeatureCollection",
 "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::32647" } },
 "features": [
-{ "type": "Feature", "properties": { "index": "1", "crsloc_id": "river_2_517.67", "crsloc_branchid": "river_2", "crsloc_chainage": 517.667, "crsloc_shift": -10.0, "crsloc_definitionid": "rect_h10.000_w50.000_c0_point", "crsdef_id": "rect_h10.000_w50.000_c0_point", "crsdef_type": "rectangle", "crsdef_branchid": "river_2", "crsdef_height": 10.0, "crsdef_width": 50.0, "crsdef_closed": "0", "crsdef_frictionid": "Manning_0.023", "frictiontype": "Manning", "frictionvalue": 0.023, "crsdef_thalweg": 0.0, "temp_id": "river_2_517.67", "crsdef_xyzcount": null, "crsdef_xcoordinates": null, "crsdef_ycoordinates": null, "crsdef_zcoordinates": null, "crsdef_frictionids": null, "crsdef_frictionpositions": null, "crsdef_diameter": null }, "geometry": { "type": "Point", "coordinates": [ 664224.816234820173122, 1526639.322860097046942 ] } },
-{ "type": "Feature", "properties": { "index": "0", "crsloc_id": "river_1_797.90", "crsloc_branchid": "river_1", "crsloc_chainage": 797.899, "crsloc_shift": 0.0, "crsloc_definitionid": "CRS_CP_test", "crsdef_id": "CRS_CP_test", "crsdef_type": "xyz", "crsdef_branchid": "river_1", "crsdef_height": null, "crsdef_width": null, "crsdef_closed": null, "crsdef_frictionid": null, "frictiontype": "Manning", "frictionvalue": 0.023, "crsdef_thalweg": 0.0, "temp_id": "river_1_797.90", "crsdef_xyzcount": 4.0, "crsdef_xcoordinates": "663467.053905815 663519.1541187783 663661.1271991032 663715.8324227147", "crsdef_ycoordinates": "1525610.846236772 1525571.7710770494 1525466.2681457987 1525421.98296478", "crsdef_zcoordinates": "1.5 -10.0 -10.0 1.5", "crsdef_frictionids": "Manning_0.023", "crsdef_frictionpositions": "0 312.3907275552155", "crsdef_diameter": null }, "geometry": { "type": "Point", "coordinates": [ 663592.067468464956619, 1525517.21589796221815 ] } },
+{ "type": "Feature", "properties": { "index": "1", "crsloc_id": "river_2_517.67", "crsloc_branchid": "river_2", "crsloc_chainage": 517.66731089307473, "crsloc_shift": -10.0, "crsloc_definitionid": "rect_h10.000_w50.000_c0_point", "crsdef_id": "rect_h10.000_w50.000_c0_point", "crsdef_type": "rectangle", "crsdef_branchid": "river_2", "crsdef_height": 10.0, "crsdef_width": 50.0, "crsdef_closed": "0", "crsdef_frictionid": "Manning_0.023", "frictiontype": "Manning", "frictionvalue": 0.023, "crsdef_thalweg": 0.0, "temp_id": "river_2_517.67", "crsdef_xyzcount": null, "crsdef_xcoordinates": null, "crsdef_ycoordinates": null, "crsdef_zcoordinates": null, "crsdef_frictionids": null, "crsdef_frictionpositions": null, "crsdef_diameter": null }, "geometry": { "type": "Point", "coordinates": [ 664218.310854589915834, 1526639.322860097046942 ] } },
+{ "type": "Feature", "properties": { "index": "0", "crsloc_id": "river_1_797.90", "crsloc_branchid": "river_1", "crsloc_chainage": 797.89912499925765, "crsloc_shift": 0.0, "crsloc_definitionid": "CRS_CP_test", "crsdef_id": "CRS_CP_test", "crsdef_type": "xyz", "crsdef_branchid": "river_1", "crsdef_height": null, "crsdef_width": null, "crsdef_closed": null, "crsdef_frictionid": null, "frictiontype": "Manning", "frictionvalue": 0.023, "crsdef_thalweg": 0.0, "temp_id": "river_1_797.90", "crsdef_xyzcount": 4.0, "crsdef_xcoordinates": "663467.053905815 663519.1541187783 663661.1271991032 663715.8324227147", "crsdef_ycoordinates": "1525610.846236772 1525571.7710770494 1525466.2681457987 1525421.98296478", "crsdef_zcoordinates": "1.5 -10.0 -10.0 1.5", "crsdef_frictionids": "Manning_0.023", "crsdef_frictionpositions": "0 312.3907275552155", "crsdef_diameter": null }, "geometry": { "type": "Point", "coordinates": [ 663683.65676968137268, 1525448.029921997338533 ] } },
 { "type": "Feature", "properties": { "index": "branch_1", "crsloc_id": "branch_1_260.66", "crsloc_branchid": "branch_1", "crsloc_chainage": 260.66498236970841, "crsloc_shift": -10.0, "crsloc_definitionid": "rect_h10.000_w10.000_cno_branch", "crsdef_id": "rect_h10.000_w10.000_cno_branch", "crsdef_type": "rectangle", "crsdef_branchid": "branch_1", "crsdef_height": 10.0, "crsdef_width": 10.0, "crsdef_closed": "0", "crsdef_frictionid": "Manning_0.023", "frictiontype": "Manning", "frictionvalue": 0.023, "crsdef_thalweg": 0.0, "temp_id": "branch_1_260.66", "crsdef_xyzcount": null, "crsdef_xcoordinates": null, "crsdef_ycoordinates": null, "crsdef_zcoordinates": null, "crsdef_frictionids": null, "crsdef_frictionpositions": null, "crsdef_diameter": null }, "geometry": { "type": "Point", "coordinates": [ 665236.284100000746548, 1525175.886749999597669 ] } },
 { "type": "Feature", "properties": { "index": "branch_2", "crsloc_id": "branch_2_13.86", "crsloc_branchid": "branch_2", "crsloc_chainage": 13.857973773609158, "crsloc_shift": -10.0, "crsloc_definitionid": "rect_h10.000_w10.000_cno_branch", "crsdef_id": "rect_h10.000_w10.000_cno_branch", "crsdef_type": "rectangle", "crsdef_branchid": "branch_2", "crsdef_height": 10.0, "crsdef_width": 10.0, "crsdef_closed": "0", "crsdef_frictionid": "Manning_0.023", "frictiontype": "Manning", "frictionvalue": 0.023, "crsdef_thalweg": 0.0, "temp_id": "branch_2_13.86", "crsdef_xyzcount": null, "crsdef_xcoordinates": null, "crsdef_ycoordinates": null, "crsdef_zcoordinates": null, "crsdef_frictionids": null, "crsdef_frictionpositions": null, "crsdef_diameter": null }, "geometry": { "type": "Point", "coordinates": [ 665363.387300000526011, 1525419.212349999696016 ] } },
 { "type": "Feature", "properties": { "index": "branch_3", "crsloc_id": "branch_3_287.44", "crsloc_branchid": "branch_3", "crsloc_chainage": 287.43781358077678, "crsloc_shift": -10.0, "crsloc_definitionid": "rect_h10.000_w10.000_cno_branch", "crsdef_id": "rect_h10.000_w10.000_cno_branch", "crsdef_type": "rectangle", "crsdef_branchid": "branch_3", "crsdef_height": 10.0, "crsdef_width": 10.0, "crsdef_closed": "0", "crsdef_frictionid": "Manning_0.023", "frictiontype": "Manning", "frictionvalue": 0.023, "crsdef_thalweg": 0.0, "temp_id": "branch_3_287.44", "crsdef_xyzcount": null, "crsdef_xcoordinates": null, "crsdef_ycoordinates": null, "crsdef_zcoordinates": null, "crsdef_frictionids": null, "crsdef_frictionpositions": null, "crsdef_diameter": null }, "geometry": { "type": "Point", "coordinates": [ 665505.848199999891222, 1525684.700599999865517 ] } },