From 4ed875b82a8232eb36396d13fda700f06687e40f Mon Sep 17 00:00:00 2001
From: Martijn Visser <mgvisser@gmail.com>
Date: Thu, 1 Aug 2024 15:24:01 +0200
Subject: [PATCH] More fixes

---
 .../Parametrize/Rijnland_parametrize.ipynb    |  1 +
 .../preprocess_data/HHSK.ipynb                | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/peilbeheerst_model/Parametrize/Rijnland_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/Rijnland_parametrize.ipynb
index c3998549..276f8d76 100644
--- a/src/peilbeheerst_model/Parametrize/Rijnland_parametrize.ipynb
+++ b/src/peilbeheerst_model/Parametrize/Rijnland_parametrize.ipynb
@@ -16,6 +16,7 @@
     "import peilbeheerst_model.ribasim_parametrization as ribasim_param\n",
     "import ribasim\n",
     "import ribasim.nodes\n",
+    "from peilbeheerst_model.add_storage_basins import AddStorageBasin\n",
     "\n",
     "warnings.filterwarnings(\"ignore\")"
    ]
diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHSK.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHSK.ipynb
index 4ec315bc..5c8aa26e 100644
--- a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHSK.ipynb
+++ b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHSK.ipynb
@@ -26,7 +26,7 @@
    },
    "outputs": [],
    "source": [
-    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data"
+    "from general_functions import burn_in_peilgebieden, read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {
@@ -376,17 +376,21 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# streefpeilen_PG_v = pd.merge(left = HHSK['peilgebiedvigerend'],\n",
-    "#                              right = HHSK['streefpeil'],\n",
-    "#                              left_on = 'globalid',\n",
-    "#                              right_on = 'peilgebiedvigerendid',\n",
-    "#                              suffixes = ('', '_streefpeil'))[['code', 'nen3610id', 'globalid', 'waterhoogte', 'geometry']]\n",
+    "streefpeilen_PG_v = pd.merge(\n",
+    "    left=HHSK[\"peilgebiedvigerend\"],\n",
+    "    right=HHSK[\"streefpeil\"],\n",
+    "    left_on=\"globalid\",\n",
+    "    right_on=\"peilgebiedvigerendid\",\n",
+    "    suffixes=(\"\", \"_streefpeil\"),\n",
+    ")[[\"code\", \"nen3610id\", \"globalid\", \"waterhoogte\", \"geometry\"]]\n",
     "\n",
-    "# streefpeilen_PG_a = pd.merge(left = HHSK['peilafwijkinggebied'],\n",
-    "#                              right = HHSK['streefpeil'],\n",
-    "#                              left_on = 'globalid',\n",
-    "#                              right_on = 'peilafwijkinggebiedid',\n",
-    "#                              suffixes = ('', '_streefpeil'))[['code', 'nen3610id', 'globalid', 'waterhoogte', 'geometry']]\n",
+    "streefpeilen_PG_a = pd.merge(\n",
+    "    left=HHSK[\"peilafwijkinggebied\"],\n",
+    "    right=HHSK[\"streefpeil\"],\n",
+    "    left_on=\"globalid\",\n",
+    "    right_on=\"peilafwijkinggebiedid\",\n",
+    "    suffixes=(\"\", \"_streefpeil\"),\n",
+    ")[[\"code\", \"nen3610id\", \"globalid\", \"waterhoogte\", \"geometry\"]]\n",
     "\n",
     "# fig, ax = plt.subplots()\n",
     "# streefpeilen_PG_v.plot(ax = ax, color='cornflowerblue')\n",
@@ -411,9 +415,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# peilgebied = burn_in_peilgebieden(base_layer = streefpeilen_PG_v,\n",
-    "#                                   overlay_layer = streefpeilen_PG_a,\n",
-    "#                                   plot = True)"
+    "peilgebied = burn_in_peilgebieden(base_layer=streefpeilen_PG_v, overlay_layer=streefpeilen_PG_a, plot=True)"
    ]
   },
   {