From 6d30a4957abccadd4df972542a878f7b063e4764 Mon Sep 17 00:00:00 2001 From: Ferdinando Primerano Date: Tue, 22 Oct 2019 16:09:56 +0100 Subject: [PATCH 1/4] Amend ACP countries importer --- lib/data/seeds/biopama_countries.csv | 81 +++++++++++++++++++ .../seeds/biopama_countries_iso_codes.csv | 80 ------------------ .../wdpa/biopama_countries_importer.rb | 11 +-- 3 files changed, 87 insertions(+), 85 deletions(-) create mode 100644 lib/data/seeds/biopama_countries.csv delete mode 100644 lib/data/seeds/biopama_countries_iso_codes.csv diff --git a/lib/data/seeds/biopama_countries.csv b/lib/data/seeds/biopama_countries.csv new file mode 100644 index 000000000..42178131e --- /dev/null +++ b/lib/data/seeds/biopama_countries.csv @@ -0,0 +1,81 @@ +iso3,acp_region +ATG,caribbean +BHS,caribbean +BLZ,caribbean +BRB,caribbean +CUB,caribbean +DMA,caribbean +DOM,caribbean +GRD,caribbean +GUY,caribbean +HTI,caribbean +JAM,caribbean +KNA,caribbean +LCA,caribbean +SUR,caribbean +TTO,caribbean +VCT,caribbean +BDI,central_africa +CAF,central_africa +CMR,central_africa +COD,central_africa +COG,central_africa +GAB,central_africa +GNQ,central_africa +STP,central_africa +TCD,central_africa +DJI,eastern_africa +ERI,eastern_africa +ETH,eastern_africa +KEN,eastern_africa +RWA,eastern_africa +SDN,eastern_africa +SOM,eastern_africa +SSD,eastern_africa +TZA,eastern_africa +UGA,eastern_africa +AGO,southern_africa +BWA,southern_africa +COM,southern_africa +LSO,southern_africa +MDG,southern_africa +MOZ,southern_africa +MWI,southern_africa +MUS,southern_africa +NAM,southern_africa +SWZ,southern_africa +SYC,southern_africa +ZAF,southern_africa +ZMB,southern_africa +ZWE,southern_africa +BEN,western_africa +BFA,western_africa +CIV,western_africa +CPV,western_africa +GHA,western_africa +GIN,western_africa +GMB,western_africa +GNB,western_africa +LBR,western_africa +MLI,western_africa +MRT,western_africa +NER,western_africa +NGA,western_africa +SEN,western_africa +SLE,western_africa +TGO,western_africa +WSM,pacific +PLW,pacific +SLB,pacific +PNG,pacific +FJI,pacific +NRU,pacific +NIU,pacific +TON,pacific +TUV,pacific +COK,pacific +MHL,pacific +VUT,pacific +KIR,pacific +FSM,pacific +TLS,pacific diff --git a/lib/data/seeds/biopama_countries_iso_codes.csv b/lib/data/seeds/biopama_countries_iso_codes.csv deleted file mode 100644 index b1b8bb8eb..000000000 --- a/lib/data/seeds/biopama_countries_iso_codes.csv +++ /dev/null @@ -1,80 +0,0 @@ -ISO3 -ATG -BHS -BLZ -BRB -CUB -DMA -DOM -GRD -GUY -HTI -JAM -KNA -LCA -SUR -TTO -VCT -BDI -CAF -CMR -COD -COG -GAB -GNQ -STP -TCD -DJI -ERI -ETH -KEN -RWA -SDN -SOM -SSD -TZA -UGA -AGO -BWA -COM -LSO -MDG -MOZ -MUS -NAM -SWZ -SYC -ZAF -ZMB -ZWE -BEN -BFA -CIV -CPV -GHA -GIN -GMB -GNB -LBR -MLI -MRT -NER -NGA -SEN -SLE -TGO -WSM -PLW -SLB -PNG -FJI -NRU -NIU -TON -TUV -COK -MHL -VUT -KIR -FSM -TLS diff --git a/lib/modules/wdpa/biopama_countries_importer.rb b/lib/modules/wdpa/biopama_countries_importer.rb index 71d915e91..101b4a752 100644 --- a/lib/modules/wdpa/biopama_countries_importer.rb +++ b/lib/modules/wdpa/biopama_countries_importer.rb @@ -1,5 +1,5 @@ module Wdpa::BiopamaCountriesImporter - BIOPAMA_COUNTRIES_CSV = "#{Rails.root}/lib/data/seeds/biopama_countries_iso_codes.csv" + BIOPAMA_COUNTRIES_CSV = "#{Rails.root}/lib/data/seeds/biopama_countries.csv" extend self def import @@ -7,12 +7,13 @@ def import csv = CSV.read(BIOPAMA_COUNTRIES_CSV) csv.shift # remove headers - csv.each do |row| - iso = row[0] + CSV.foreach(BIOPAMA_COUNTRIES_CSV, headers: true) do |row| + iso = row['iso3'] + region = row['acp_region'] country = Country.find_by_iso_3(iso) if country - country.update_attributes(is_biopama: true) - puts "#{country.name} has been flagged as BIOPAMA country" + country.update_attributes(acp_region: region) + puts "#{country.name} has been flagged as an ACP country" else puts "Country with iso_3 #{iso} does not exist" end From 2d959a141b815c92cbe768422b6b9afbc065541d Mon Sep 17 00:00:00 2001 From: Ferdinando Primerano Date: Tue, 22 Oct 2019 16:10:13 +0100 Subject: [PATCH 2/4] Update db submodule --- db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db b/db index f7477444d..ac63f976b 160000 --- a/db +++ b/db @@ -1 +1 @@ -Subproject commit f7477444d2d95625fc84c7feac40b59e4b282b93 +Subproject commit ac63f976b0a67370c16b3bf21ec3cab3af387468 From 83ef151ffab614c739e56c6d019dcf6d9e308bff Mon Sep 17 00:00:00 2001 From: Ferdinando Primerano Date: Wed, 30 Oct 2019 14:22:09 +0000 Subject: [PATCH 3/4] Remove old code --- lib/modules/wdpa/biopama_countries_importer.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/modules/wdpa/biopama_countries_importer.rb b/lib/modules/wdpa/biopama_countries_importer.rb index 101b4a752..9ebe57da2 100644 --- a/lib/modules/wdpa/biopama_countries_importer.rb +++ b/lib/modules/wdpa/biopama_countries_importer.rb @@ -4,9 +4,6 @@ module Wdpa::BiopamaCountriesImporter def import ActiveRecord::Base.transaction do - csv = CSV.read(BIOPAMA_COUNTRIES_CSV) - csv.shift # remove headers - CSV.foreach(BIOPAMA_COUNTRIES_CSV, headers: true) do |row| iso = row['iso3'] region = row['acp_region'] From 9165edc88be76f74b76b6545f69c083304de184d Mon Sep 17 00:00:00 2001 From: lucacug Date: Thu, 31 Oct 2019 10:46:13 +0000 Subject: [PATCH 4/4] change db pointer to acp regions branch for testing purpose (TO BE REVERTED) --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 162f95637..ae1ecf631 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "db"] path = db url = https://github.com/unepwcmc/protectedplanet-db.git - branch = develop + branch = acp-regions