diff --git a/src/covid-19/covid_19_utils/covid_19_utils/converters/__init__.py b/src/covid-19/covid_19_utils/covid_19_utils/converters/__init__.py index a698cefa45a60d7f9062376e283b3bdd66bace00..5135c547751151f0c4558eb01c287d55bcc412c5 100644 --- a/src/covid-19/covid_19_utils/covid_19_utils/converters/__init__.py +++ b/src/covid-19/covid_19_utils/covid_19_utils/converters/__init__.py @@ -87,14 +87,19 @@ class CaseConverterImpl: except ValueError: pass - df["positive_100k"] = df["positive"] / df["population"] * 100000 - df["deceased_100k"] = df["deceased"] / df["population"] * 100000 - df["tested_100k"] = df["tested"] / df["population"] * 100000 - for column in self.common_columns: if column not in df.columns: df[column] = "" + df["positive_100k"] = df["positive"] / df["population"] * 100000 + df["deceased_100k"] = df["deceased"] / df["population"] * 100000 + + # lazy solution to tested missing - todo: implement types checks for columns + try: + df["tested_100k"] = df["tested"] / df["population"] * 100000 + except TypeError: + pass + return df[self.common_columns] @classmethod