From b4bb79efdf371d54cc3ab37a73a9481006430ec0 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Wed, 14 Dec 2022 23:45:55 +0100 Subject: [PATCH] refactoring --- src/intensivstationen/Intensivstationen.ipynb | 7 ++----- src/intensivstationen/TimeseriesReader.py | 8 +++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb index a59faf16000..2bed2017aad 100644 --- a/src/intensivstationen/Intensivstationen.ipynb +++ b/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)" ] diff --git a/src/intensivstationen/TimeseriesReader.py b/src/intensivstationen/TimeseriesReader.py index 8eb3c0bb2fe..7b9c8fea0fc 100644 --- a/src/intensivstationen/TimeseriesReader.py +++ b/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)