From 6353335e5d927cc3132bb83f1f36e6c8dcb926ea Mon Sep 17 00:00:00 2001
From: Rok Roskar <rokroskar@gmail.com>
Date: Fri, 24 Apr 2020 00:30:27 +0200
Subject: [PATCH] chore: update converters
---
.../covid_19_utils/covid_19_utils/converters/__init__.py | 2 ++
src/covid-19/covid_19_utils/covid_19_utils/converters/italy.py | 1 -
src/covid-19/covid_19_utils/covid_19_utils/converters/spain.py | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
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 ef0d0e55b..7b34f91e0 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
@@ -103,6 +103,8 @@ class CaseConverterImpl:
except TypeError:
pass
+ # make sure that date is datetime
+ df["date"] = pd.to_datetime(df["date"])
return df[self.common_columns]
# def _compute_daily_counts(self, df):
diff --git a/src/covid-19/covid_19_utils/covid_19_utils/converters/italy.py b/src/covid-19/covid_19_utils/covid_19_utils/converters/italy.py
index 1b45b301e..e57206849 100644
--- a/src/covid-19/covid_19_utils/covid_19_utils/converters/italy.py
+++ b/src/covid-19/covid_19_utils/covid_19_utils/converters/italy.py
@@ -37,7 +37,6 @@ class ItalyRegionalCaseConverter(CaseConverter):
metadata["istatid"] = metadata.istatid.astype(int)
df_conv = _correct_trentino(df_conv)
merged = pd.merge(df_conv, metadata, on="istatid").drop_duplicates()
-
return self._set_common_columns(merged)
def read_data(self, path):
diff --git a/src/covid-19/covid_19_utils/covid_19_utils/converters/spain.py b/src/covid-19/covid_19_utils/covid_19_utils/converters/spain.py
index 6fc55482b..88d8834c2 100644
--- a/src/covid-19/covid_19_utils/covid_19_utils/converters/spain.py
+++ b/src/covid-19/covid_19_utils/covid_19_utils/converters/spain.py
@@ -72,6 +72,7 @@ class SpainCaseConverter(CaseConverter):
# calculate incidence rates
merged = df_conv.merge(pd.DataFrame(region_populations))
merged["country"] = "ESP"
+ merged["country_label"] = "Spain"
return self._set_common_columns(merged)
--
GitLab