displaying Einwohnerzahl

This commit is contained in:
frankknoll
2022-03-01 18:59:40 +01:00
parent 432300a1aa
commit d442a1d404
388 changed files with 437 additions and 406 deletions

View File

@@ -144,12 +144,10 @@
"\n",
"class IOUtils:\n",
"\n",
" @staticmethod\n",
" def saveDataFrameAsJson(dataFrame, file):\n",
" def saveDictAsJson(dict, file):\n",
" IOUtils.ensurePath(file)\n",
" df = dataFrame.copy()\n",
" df['date'] = df['date'].dt.strftime('%Y-%m-%d')\n",
" df.to_json(file, orient=\"records\")\n",
" with open(file, 'w') as outfile:\n",
" json.dump(dict, outfile)\n",
"\n",
" @staticmethod\n",
" def ensurePath(file):\n",
@@ -167,11 +165,12 @@
"source": [
"def getIntensiveCareBeds(timeSeries, kreis = None):\n",
" if kreis is not None:\n",
" return timeSeries[timeSeries['Kreis'] == kreis][['date', 'betten_belegt', 'betten_frei']]\n",
" return timeSeries[timeSeries['Kreis'] == kreis][['date', 'betten_belegt', 'betten_frei', 'Einwohnerzahl']]\n",
" else:\n",
" return timeSeries.groupby('date').agg(**{\n",
" 'betten_belegt': pd.NamedAgg(column = 'betten_belegt', aggfunc = 'sum'),\n",
" 'betten_frei': pd.NamedAgg(column = 'betten_frei', aggfunc = 'sum') \n",
" 'betten_frei': pd.NamedAgg(column = 'betten_frei', aggfunc = 'sum'),\n",
" 'Einwohnerzahl': pd.NamedAgg(column = 'Einwohnerzahl', aggfunc = 'sum') \n",
" }).reset_index()"
]
},
@@ -182,14 +181,34 @@
"metadata": {},
"outputs": [],
"source": [
"def getAndPersistIntensiveCareBeds(timeSeries, kreis = None):\n",
"import json\n",
"\n",
"\n",
"def getAndPersistIntensiveCareBeds(timeSeries, kreis=None):\n",
" dataFrame = getIntensiveCareBeds(timeSeries, kreis)\n",
" display(kreis)\n",
" IOUtils.saveDataFrameAsJson(dataFrame, _getFilename(kreis))\n",
" _saveDataFrameAsJson(dataFrame, _getFilename(kreis))\n",
" return dataFrame\n",
"\n",
"\n",
"def _saveDataFrameAsJson(dataFrame, file):\n",
" IOUtils.saveDictAsJson(\n",
" {\n",
" 'population': int(dataFrame.iloc[0]['Einwohnerzahl']),\n",
" 'data': _dataFrame2Dict(dataFrame),\n",
" },\n",
" file)\n",
"\n",
"\n",
"def _dataFrame2Dict(dataFrame):\n",
" df = dataFrame[['date', 'betten_belegt', 'betten_frei']]\n",
" df['date'] = df['date'].dt.strftime('%Y-%m-%d')\n",
" return df.to_dict(orient=\"records\")\n",
"\n",
"\n",
"def _getFilename(kreis):\n",
" return '../../docs/data/intensivstationen/intensivstationen-{suffix}.json'.format(suffix = _getSuffix(kreis))\n",
" return '../../docs/data/intensivstationen/intensivstationen-{suffix}.json'.format(suffix=_getSuffix(kreis))\n",
"\n",
"\n",
"def _getSuffix(kreis):\n",
" return kreis if kreis is not None else 'de'\n"