Fix ordering issues and a plot join.

Deltares · Aug 12, 2024 · 0b3ed46 · 0b3ed46
1 parent dc27b4d
commit 0b3ed46
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/guide/examples.ipynb b/docs/guide/examples.ipynb
@@ -189,7 +189,7 @@
    "source": [
     "q = 10 / 86400  # 10 m³/day\n",
     "tabulated_rating_curve4 = model.tabulated_rating_curve.add(\n",
-    "    Node(4, Point(4.0, 0.0)),\n",
+    "    Node(8, Point(4.0, 0.0)),\n",
     "    [\n",
     "        tabulated_rating_curve.Static(\n",
     "            level=[0.0, 1.0],\n",
@@ -207,7 +207,7 @@
     "    ],\n",
     ")\n",
     "tabulated_rating_curve8 = model.tabulated_rating_curve.add(\n",
-    "    Node(8, Point(3.0, -1.0)),\n",
+    "    Node(4, Point(3.0, -1.0)),\n",
     "    [\n",
     "        tabulated_rating_curve.Static(\n",
     "            level=[0.0, 1.0],\n",

diff --git a/python/ribasim/ribasim/model.py b/python/ribasim/ribasim/model.py
@@ -340,8 +340,8 @@ def plot_control_listen(self, ax):
         node = self.node_table().df
         control_nodes_geometry = df_listen_edge.merge(
             node,
-            left_on=["control_node_id", "control_node_type"],
-            right_on=["node_id", "node_type"],
+            left_on=["control_node_id"],
+            right_on=["node_id"],
             how="left",
         )["geometry"]
 

diff --git a/python/ribasim_testmodels/ribasim_testmodels/basic.py b/python/ribasim_testmodels/ribasim_testmodels/basic.py
@@ -91,7 +91,7 @@ def basic_model() -> ribasim.Model:
     # Setup TabulatedRatingCurve
     q = 10 / 86400  # 10 m³/day
     model.tabulated_rating_curve.add(
-        Node(4, Point(4.0, 0.0)),
+        Node(8, Point(4.0, 0.0)),
         [
             tabulated_rating_curve.Static(
                 level=[0.0, 1.0],
@@ -109,7 +109,7 @@ def basic_model() -> ribasim.Model:
         ],
     )
     model.tabulated_rating_curve.add(
-        Node(8, Point(3.0, -1.0)),
+        Node(4, Point(3.0, -1.0)),
         [
             tabulated_rating_curve.Static(
                 level=[0.0, 1.0],