francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2022-12-15 00:35:00 +01:00
parent 08743e4971
commit 06601c9358
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/intensivstationen/Chart.py
View File

@@ -1,9 +1,17 @@
from decouple import AutoConfig from decouple import AutoConfig
from Datawrapper import Datawrapper from Datawrapper import Datawrapper
from ColumnsAdder import ColumnsAdder
from KreiseReader import readKreise
from MedianOfFreeBedsByKreisTableFactory import MedianOfFreeBedsByKreisTableFactory
def createMedianOfFreeBedsByKreisChart(medianOfFreeBedsByKreisTable, chartTitle):
config = AutoConfig(search_path='../..') def createMedianOfFreeBedsByKreisChart(timeSeries, chartTitle):
dataWrapper = Datawrapper(config('DATAWRAPPER_API_TOKEN')) dataWrapper = Datawrapper(AutoConfig(search_path='../..')('DATAWRAPPER_API_TOKEN'))
dataWrapper.setChartTitle(chartTitle) dataWrapper.setChartTitle(chartTitle)
dataWrapper.uploadChartData(medianOfFreeBedsByKreisTable) dataWrapper.uploadChartData(data = _createMedianOfFreeBedsByKreisTableForChoroplethMap(timeSeries))
dataWrapper.publishChart() dataWrapper.publishChart()
def _createMedianOfFreeBedsByKreisTableForChoroplethMap(timeSeries):
medianOfFreeBedsByKreisTableFactory = MedianOfFreeBedsByKreisTableFactory(timeSeries)
medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()
return ColumnsAdder(readKreise()).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)

26
src/intensivstationen/Intensivstationen.ipynb
View File

@@ -83,7 +83,8 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"timeSeries = readTimeseries(download = needsUpdate)" "timeSeries = readTimeseries(download = needsUpdate)\n",
"timeSeries"
] ]
}, },
{ {
@@ -119,23 +120,10 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"medianOfFreeBedsByKreisTableFactory = MedianOfFreeBedsByKreisTableFactory(timeSeries)\n", "medianOfFreeBedsByKreisTable = MedianOfFreeBedsByKreisTableFactory(timeSeries).createMedianOfFreeBedsByKreisTable('Kreis')\n",
"medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('Kreis')\n", "medianOfFreeBedsByKreisTable.reset_index().to_json(\n",
"medianOfFreeBedsByKreisTable.reset_index().to_json('../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json', orient = \"records\")" " '../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json',\n",
] " orient = \"records\")"
},
{
"cell_type": "code",
"execution_count": null,
"id": "396cb4f8",
"metadata": {},
"outputs": [],
"source": [
"def createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory):\n",
" medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()\n",
" return ColumnsAdder(readKreise()).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
" \n",
"medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)"
] ]
}, },
{ {
@@ -160,7 +148,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"createMedianOfFreeBedsByKreisChart(\n", "createMedianOfFreeBedsByKreisChart(\n",
" medianOfFreeBedsByKreisTable,\n", " timeSeries,\n",
" chartTitle = getChartTitle(\n", " chartTitle = getChartTitle(\n",
" dateStart=timeSeries['date'].min(),\n", " dateStart=timeSeries['date'].min(),\n",
" dateEnd=timeSeries['date'].max()))" " dateEnd=timeSeries['date'].max()))"