From 7e0b001075e5d64dc53a48b191ef2cfdd5b6e4f1 Mon Sep 17 00:00:00 2001
From: Diego Ripley <diego@diegoripley.ca>
Date: Mon, 2 Jun 2025 13:56:50 +0000
Subject: [PATCH] Enable downloading of 2021 hydro

---
 hydro/download.sh |  8 ++++----
 hydro/process.sh  | 18 ------------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100755 hydro/process.sh

diff --git a/hydro/download.sh b/hydro/download.sh
index 73fd8f4..7299b07 100755
--- a/hydro/download.sh
+++ b/hydro/download.sh
@@ -2,16 +2,16 @@
 if [ ! -d "${DATA_FOLDER}/hydro" ]
 then
     echo "Making directory ${DATA_FOLDER}/hydro/"
-    mkdir -p ${DATA_FOLDER}/hydro/{input,output}/{2021,2016,2011,2006}
+    mkdir -p ${DATA_FOLDER}/hydro/{input,extracted,output}/{2021,2016,2011,2006}
 fi
 
 INPUT_FOLDER="${DATA_FOLDER}/hydro/input"
 
-#echo "Downloading 2021 hydro"
-#aria2c -x16 -i "${SCRIPT_DIR}/hydro/hydro_2021.txt" --dir=${INPUT_FOLDER}/2021 --auto-file-renaming=false
+echo "Downloading 2021 hydro"
+aria2c -x16 -i "${SCRIPT_DIR}/hydro/hydro_2021.txt" --dir=${INPUT_FOLDER}/2021 --auto-file-renaming=false
 echo "Downloading 2016 hydro"
 aria2c -x16 -i "${SCRIPT_DIR}/hydro/hydro_2016.txt" --dir=${INPUT_FOLDER}/2016 --auto-file-renaming=false
 echo "Downloading 2011 boundaries"
 aria2c -x16 -i "${SCRIPT_DIR}/hydro/hydro_2011.txt" --dir=${INPUT_FOLDER}/2011 --auto-file-renaming=false
 echo "Downloading 2006 boundaries"
-aria2c -x16 -i "${SCRIPT_DIR}/hydro/hydro_2006.txt" --dir=${INPUT_FOLDER}/2006 --auto-file-renaming=false
\ No newline at end of file
+aria2c -x16 -i "${SCRIPT_DIR}/hydro/hydro_2006.txt" --dir=${INPUT_FOLDER}/2006 --auto-file-renaming=false
diff --git a/hydro/process.sh b/hydro/process.sh
deleted file mode 100755
index 6a07f7f..0000000
--- a/hydro/process.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Standardizes field names, builds up hierarchy for datasets, create Canada and Geographic Regions of Canada
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/country.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/geographic_regions_of_canada.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/provinces_and_territories.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/census_divisions.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/economic_regions.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/census_agricultural_regions.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/forward_sortation_areas.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/federal_electoral_districts.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/census_consolidated_subdivisions.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/census_metropolitan_areas.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/census_subdivisions.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/population_centres.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/designated_places.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/census_tracts.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/aggregate_dissemination_areas.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/dissemination_areas.sql
-psql "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@db/$POSTGRES_DB" -f boundaries/dissemination_blocks.sql
\ No newline at end of file