From 95a9c4fc4568fc70a753443cd977fdd0442ed953 Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <cramakri@ethz.ch>
Date: Wed, 8 Apr 2020 12:38:31 +0000
Subject: [PATCH] refactor: use new path for the Harvard Worldmap dataset
---
notebooks/process/CompileGeoData.ipynb | 13 +++++++++++--
notebooks/process/ToRates.ipynb | 12 +++++++++++-
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/notebooks/process/CompileGeoData.ipynb b/notebooks/process/CompileGeoData.ipynb
index 3dda43ed3..115990484 100644
--- a/notebooks/process/CompileGeoData.ipynb
+++ b/notebooks/process/CompileGeoData.ipynb
@@ -26,7 +26,7 @@
"outputs": [],
"source": [
"ts_folder = \"../../data/covid-19_jhu-csse/\"\n",
- "worldmap_path = \"../../data/worldmap/country_centroids.csv\"\n",
+ "worldmap_path = \"../../data/atlas/worldmap/country_centroids.csv\"\n",
"out_folder = None\n",
"PAPERMILL_OUTPUT_PATH = None"
]
@@ -80,10 +80,19 @@
"outputs": [],
"source": [
"country_centroids_df = pd.read_csv(worldmap_path)\n",
- "country_centroids_df = country_centroids_df[['name', 'name_long', 'region_un', 'subregion', 'region_wb', 'pop_est', 'gdp_md_est', 'income_grp', 'Longitude', 'Latitude']]\n",
+ "country_centroids_df = country_centroids_df[['name', 'name_long', 'sov_a3', 'region_un', 'subregion', 'region_wb', 'pop_est', 'gdp_md_est', 'income_grp', 'Longitude', 'Latitude']]\n",
"country_centroids_df['name_jhu'] = country_centroids_df['name_long'] "
]
},
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "country_centroids_df.head()"
+ ]
+ },
{
"cell_type": "code",
"execution_count": null,
diff --git a/notebooks/process/ToRates.ipynb b/notebooks/process/ToRates.ipynb
index 9aa7f046f..5db50b0b9 100644
--- a/notebooks/process/ToRates.ipynb
+++ b/notebooks/process/ToRates.ipynb
@@ -28,7 +28,7 @@
"outputs": [],
"source": [
"ts_folder = \"../../data/covid-19_jhu-csse/\"\n",
- "wb_path = \"../../data/worldbank/SP.POP.TOTL.zip\"\n",
+ "wb_path = \"../../data/atlas/worldbank/SP.POP.TOTL.zip\"\n",
"geodata_path = \"../../data/geodata/geo_data.csv\"\n",
"out_folder = None\n",
"PAPERMILL_OUTPUT_PATH = None"
@@ -167,6 +167,16 @@
"].iloc[:,-2:]"
]
},
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "country_centroids_df = pd.read_csv(worldmap_path)\n",
+ "country_centroids_df = country_centroids_df[['name', 'name_long', 'sov_a3', 'region_un', 'subregion', 'region_wb', 'pop_est', 'gdp_md_est', 'income_grp', 'Longitude', 'Latitude']]"
+ ]
+ },
{
"cell_type": "markdown",
"metadata": {},
--
GitLab