xox/coronavis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix data url and adapt to new data format, including type conversion, location name changes etc

Browse Source
This commit is contained in:
fordprefect
2020-12-15 12:11:59 +01:00
parent 5e9a7db2b5
commit 1f85b91236
5 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
coronavis.py
View File

@@ -32,7 +32,7 @@ def get_data():
tries = 10
delay = 10
dataurl = "https://covid.ourworldindata.org/data/ecdc/full_data.csv"
dataurl = "https://covid.ourworldindata.org/data/owid-covid-data.csv"
date = datetime.date.today()
datafile = f"{date}-full-data.csv"
@@ -62,13 +62,56 @@ def get_data():
date,location,new_cases,new_deaths,total_cases,total_deaths = row
elif len(row) == 10:
date,location,new_cases,new_deaths,total_cases,total_deaths,weekly_cases,weekly_deaths,biweekly_cases,biweekly_deaths = row
elif len(row) == 50:
iso_code,continent,location,date,total_cases,new_cases,new_cases_smoothed,total_deaths,new_deaths,new_deaths_smoothed,total_cases_per_million,new_cases_per_million,new_cases_smoothed_per_million,total_deaths_per_million,new_deaths_per_million,new_deaths_smoothed_per_million,reproduction_rate,icu_patients,icu_patients_per_million,hosp_patients,hosp_patients_per_million,weekly_icu_admissions,weekly_icu_admissions_per_million,weekly_hosp_admissions,weekly_hosp_admissions_per_million,new_tests,total_tests,total_tests_per_thousand,new_tests_per_thousand,new_tests_smoothed,new_tests_smoothed_per_thousand,positive_rate,tests_per_case,tests_units,stringency_index,population,population_density,median_age,aged_65_older,aged_70_older,gdp_per_capita,extreme_poverty,cardiovasc_death_rate,diabetes_prevalence,female_smokers,male_smokers,handwashing_facilities,hospital_beds_per_thousand,life_expectancy,human_development_index = row
else:
print(f"WARNING! Table format changed, new header:\n{row})")
exit(1)
# break loop if header
if location=="location":
# table header
continue
# cast to num type
if isinstance(total_cases, str):
if total_cases in ('', ' ', '0.0'):
total_cases = 0
try:
total_cases = int(total_cases)
except:
try:
total_cases = float(total_cases)
except:
print("tc failed")
if isinstance(new_cases, str):
if new_cases in ('', ' ', '0.0'):
new_cases = 0
try:
new_cases = int(new_cases)
except:
try:
new_cases = float(new_cases)
except:
print("nc failed")
if isinstance(new_deaths, str):
if new_deaths in ('', ' ', '0.0'):
new_deaths = 0
try:
new_deaths = int(new_deaths)
except:
try:
new_deaths = float(new_deaths)
except:
print("nd failed")
if isinstance(total_deaths, str):
if total_deaths in ('', ' ', '0.0'):
total_deaths = 0
try:
total_deaths = int(total_deaths)
except:
try:
total_deaths = float(total_deaths)
except:
print("td failed")
if location not in data:
data[location] = []
year, month, day = date.split("-")