refactoring

src/intensivstationen/Intensivstationen.ipynb

@@ -81,10 +81,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "kreise = readKreise(download = False)\n",
-    "timeSeries = readTimeseries(download = needsUpdate)\n",
-    "timeSeries = ColumnsAdder(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
-    "timeSeries"
+    "timeSeries = readTimeseries(download = needsUpdate)"
    ]
   },
   {
@@ -133,7 +130,7 @@
    "source": [
     "def createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory):\n",
     "    medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()\n",
-    "    return ColumnsAdder(kreise).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
+    "    return ColumnsAdder(readKreise()).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
     "    \n",
     "medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)"
    ]

src/intensivstationen/TimeseriesReader.py

@@ -1,8 +1,14 @@
 import pandas as pd
 from urllib import request
-
+from ColumnsAdder import ColumnsAdder
+from KreiseReader import readKreise
 
 def readTimeseries(download = False):
+    timeSeries = _readTimeseries(download = download)
+    timeSeries = ColumnsAdder(readKreise()).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)
+    return timeSeries
+
+def _readTimeseries(download = False):
     timeSeriesFile = 'zeitreihe-tagesdaten.csv'
     if download:
         _downloadTimeseries(timeSeriesFile)