starting choropleth map

src/intensivstationen/Intensivstationen.ipynb

@@ -604,9 +604,9 @@
     "    def __init__(self, dataFrame):\n",
     "        self.dataFrame = dataFrame\n",
     "\n",
-    "    def createMedianOfFreeBedsByKreisTable(self):\n",
+    "    def createMedianOfFreeBedsByKreisTable(self, kreisKey):\n",
     "        self.dataFrame['free_beds_divided_by_all_beds_in_percent'] = self.dataFrame['betten_frei'] / (self.dataFrame['betten_frei'] + self.dataFrame['betten_belegt']) * 100\n",
-    "        aggregated = self.dataFrame.groupby('Kreis').agg(\n",
+    "        aggregated = self.dataFrame.groupby(kreisKey).agg(\n",
     "            median_free_beds_in_percent =\n",
     "                pd.NamedAgg(\n",
     "                    column = 'free_beds_divided_by_all_beds_in_percent',\n",
@@ -642,7 +642,7 @@
     "        medianOfFreeBedsByKreisTableFactory = MedianOfFreeBedsByKreisTableFactory(dataFrame)\n",
     "        \n",
     "        # When\n",
-    "        medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable()\n",
+    "        medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('Kreis')\n",
     "\n",
     "        # Then\n",
     "        assert_frame_equal(\n",
@@ -678,10 +678,73 @@
    "outputs": [],
    "source": [
     "medianOfFreeBedsByKreisTableFactory = MedianOfFreeBedsByKreisTableFactory(timeSeries)\n",
-    "medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable()\n",
+    "medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('Kreis')\n",
     "medianOfFreeBedsByKreisTable.reset_index().to_json('../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json', orient = \"records\")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "396cb4f8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "medianOfFreeBedsByKreisTableFactory = MedianOfFreeBedsByKreisTableFactory(timeSeries)\n",
+    "medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel')\n",
+    "bla = medianOfFreeBedsByKreisTable.reset_index()\n",
+    "bla"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "bc391168",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# FK-TODO: merge with ColumnsAdder\n",
+    "class ColumnsAdder2:\n",
+    "\n",
+    "    def __init__(self, kreise):\n",
+    "        self.kreise = kreise\n",
+    "\n",
+    "    def addKreisAndBundeslandAndEinwohnerzahlColumns(self, dataFrame):\n",
+    "        dataFrame_kreise = pd.merge(dataFrame, self.kreise, how = 'left', left_on = 'gemeindeschluessel', right_index = True)\n",
+    "        dataFrame['Kreis'] = dataFrame_kreise['Kreis']\n",
+    "        dataFrame['Einwohnerzahl'] = dataFrame_kreise['Einwohnerzahl']\n",
+    "        return dataFrame"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3a1e481f",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "medianOfFreeBedsByKreisTable2 = ColumnsAdder2(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(bla)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3658bea0",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "medianOfFreeBedsByKreisTable2"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d994f8d6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "medianOfFreeBedsByKreisTable2.to_excel('medianOfFreeBedsByKreisTable.xlsx')"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,