From 484e16a566a270331beaf933edcd22162ff3aadf Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Mon, 28 Feb 2022 17:18:01 +0100
Subject: [PATCH] simplifying names of Bundesland

---
 src/intensivstationen/Intensivstationen.ipynb | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb
index 08f2769efe4..63ca4f4258e 100644
--- a/src/intensivstationen/Intensivstationen.ipynb
+++ b/src/intensivstationen/Intensivstationen.ipynb
@@ -93,21 +93,21 @@
     "            lambda gemeindeschluessel: self.kreisByKreisschluessel.loc[gemeindeschluessel, 'Kreis'])\n",
     "        dataFrame['Bundesland'] = dataFrame['bundesland'].map({\n",
     "            '01': 'Schleswig-Holstein',\n",
-    "            '02': 'Freie Hansestadt Hamburg',\n",
+    "            '02': 'Hamburg',\n",
     "            '03': 'Niedersachsen',\n",
-    "            '04': 'Freie Hansestadt Bremen',\n",
+    "            '04': 'Bremen',\n",
     "            '05': 'Nordrhein-Westfalen',\n",
     "            '06': 'Hessen',\n",
     "            '07': 'Rheinland-Pfalz',\n",
     "            '08': 'Baden-Württemberg',\n",
-    "            '09': 'Freistaat Bayern',\n",
+    "            '09': 'Bayern',\n",
     "            '10': 'Saarland',\n",
     "            '11': 'Berlin',\n",
     "            '12': 'Brandenburg',\n",
     "            '13': 'Mecklenburg-Vorpommern',\n",
-    "            '14': 'Freistaat Sachsen',\n",
+    "            '14': 'Sachsen',\n",
     "            '15': 'Sachsen-Anhalt',\n",
-    "            '16': 'Freistaat Thüringen'})\n",
+    "            '16': 'Thüringen'})\n",
     "        return dataFrame\n"
    ]
   },
@@ -140,7 +140,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def aggregateData(timeSeries, kreis = None):\n",
+    "def getIntensiveCareBeds(timeSeries, kreis = None):\n",
     "    if kreis is not None:\n",
     "        return timeSeries[timeSeries['Kreis'] == kreis][['date', 'betten_belegt', 'betten_frei']]\n",
     "    else:\n",
@@ -157,8 +157,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def aggregateAndPersistData(timeSeries, kreis = None):\n",
-    "    dataFrame = aggregateData(timeSeries, kreis)\n",
+    "def getAndPersistIntensiveCareBeds(timeSeries, kreis = None):\n",
+    "    dataFrame = getIntensiveCareBeds(timeSeries, kreis)\n",
     "    display(kreis)\n",
     "    dataFrame.to_csv(_getFilename(kreis), index = False)\n",
     "    return dataFrame\n",
@@ -174,7 +174,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "aggregateAndPersistData(timeSeries)"
+    "getAndPersistIntensiveCareBeds(timeSeries)"
    ]
   },
   {
@@ -185,7 +185,7 @@
    "outputs": [],
    "source": [
     "for kreis in kreisValues:\n",
-    "    aggregateAndPersistData(timeSeries, kreis)"
+    "    getAndPersistIntensiveCareBeds(timeSeries, kreis)"
    ]
   }
  ],