diff --git a/src/help.txt b/src/help.txt index 4d166f516b2..d41c20b7ae5 100644 --- a/src/help.txt +++ b/src/help.txt @@ -9,6 +9,7 @@ zwei Spalten darstellen: src/intensivstationen/AGS_2022-02-28.json downloaded from https://www.xrepository.de/details/urn:de:bund:destatis:bevoelkerungsstatistik:schluessel:ags 04-kreise.xlsx: https://www.destatis.de/DE/Themen/Laender-Regionen/Regionales/Gemeindeverzeichnis/Administrativ/04-kreise.html +COVID-19_Todesfaelle.xlsx: https://www.rki.de/DE/Content/InfAZ/N/Neuartiges_Coronavirus/Projekte_RKI/COVID-19_Todesfaelle.html get VAERS data: - download data (e.g. 2022VAERSData.zip) from https://vaers.hhs.gov/data/datasets.html and save and unzip in VAERS folder diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb index 3175688d2bf..e27b34480ae 100644 --- a/src/intensivstationen/Intensivstationen.ipynb +++ b/src/intensivstationen/Intensivstationen.ipynb @@ -72,16 +72,11 @@ " self.kreise = kreise\n", "\n", " def addKreisAndBundeslandAndEinwohnerzahlColumns(self, dataFrame):\n", - " dataFrame['Kreis'] = dataFrame['gemeindeschluessel'].map(\n", - " lambda gemeindeschluessel: self.kreise.loc[gemeindeschluessel, 3])\n", - "\n", - " dataFrame['Bundesland'] = dataFrame['bundesland'].map(\n", - " lambda bundesland: self.kreise.loc[bundesland, '2'])\n", - "\n", - " dataFrame['Einwohnerzahl'] = dataFrame['gemeindeschluessel'].map(\n", - " lambda gemeindeschluessel: int(self.kreise.loc[gemeindeschluessel, 6]))\n", - "\n", - " return dataFrame\n" + " dataFrame_kreise = pd.merge(dataFrame, self.kreise, how = 'left', left_on = 'gemeindeschluessel', right_index = True)\n", + " dataFrame['Kreis'] = dataFrame_kreise[3]\n", + " dataFrame['Einwohnerzahl'] = dataFrame_kreise[6]\n", + " dataFrame['Bundesland'] = dataFrame['bundesland'].map(lambda bundesland: self.kreise.loc[bundesland, '2'])\n", + " return dataFrame" ] }, {