refactoring

src/intensivstationen/Intensivstationen.ipynb

@@ -32,7 +32,7 @@
     "from TimeseriesReader import readTimeseries\n",
     "from IntensivstationenHtmlFileUpdater import saveLastUpdatedIntensivstationen, saveKreisOptions\n",
     "from KreiseReader import readKreise\n",
-    "from KreisOptionsProvider import getKreisOptions\n",
+    "from KreisOptionsProvider import getKreisOptionsAndAlleLandkreise\n",
     "\n",
     "\n",
     "pd.set_option('display.max_rows', 100)\n",
@@ -85,17 +85,6 @@
     "timeSeries"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "74ea4d55",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "kreise = readKreise(download = False)\n",
-    "kreise"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -103,7 +92,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "timeSeries = ColumnsAdder(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
+    "timeSeries = ColumnsAdder(kreise = readKreise(download = False)).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
     "timeSeries"
    ]
   },
@@ -124,7 +113,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "kreisOptions = ['<option selected=\"\" value=\"de\">Alle Landkreise</option>']  + getKreisOptions(kreisValues)"
+    "kreisOptions = getKreisOptionsAndAlleLandkreise(kreisValues)"
    ]
   },
   {

src/intensivstationen/KreisOptionsProvider.py

@@ -1,3 +1,6 @@
+def getKreisOptionsAndAlleLandkreise(kreisValues):
+    return ['<option selected="" value="de">Alle Landkreise</option>']  + getKreisOptions(kreisValues)
+
 def getKreisOptions(kreisValues):
     return [getKreisOption(kreis) for kreis in kreisValues]