Merge branch 'release-4.8.11'

unepwcmc · Jun 13, 2022 · ea03c2c · ea03c2c
2 parents b2db9bf + a652b22
commit ea03c2c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 4.8.12
+- Removed Western Sahara flag
+- Fixed French Guiana typo
+- Added SAR China to Hong Kong and Macau
+
 ### 4.8.11
 
 - Chore: June 2022 WDPA Release

diff --git a/app/assets/images/flags/french-guyana.svg → app/assets/images/flags/french-guiana.svg b/app/assets/images/flags/french-guyana.svg → app/assets/images/flags/french-guiana.svg
diff --git a/app/assets/images/flags/western-sahara.svg b/app/assets/images/flags/western-sahara.svg
diff --git a/lib/data/seeds/countries.csv b/lib/data/seeds/countries.csv
@@ -74,7 +74,7 @@ Faroe Islands,FO,FRO,,Europe,"POLYGON((-7.64415442599994 61.3941104190001,-7.644
 Fiji,FJ,FJI,english,Asia & Pacific,"POLYGON((173 -22, 173 -11, 180 -11, 180 -22, 173 -22))"
 Finland,FI,FIN,finnish,Europe,"POLYGON((20.62316451 59.811224677,20.62316451 70.0753103640001,31.5695247800001 70.0753103640001,31.5695247800001 59.811224677,20.62316451 59.811224677))"
 France,FR,FRA,french,Europe,"POLYGON((-6 41, -6 52, 9 52, 9 41, -6 41))"
-French Guyana,GF,GUF,french,Latin America & Caribbean,"POLYGON((-54.62777956974332483 5.86008108626166191,-54.58293830828176141 1.95380906920173625,-51.20489661151056993 1.93887060545761947,-51.3842616573568236 5.84521191184669409,-54.62777956974332483 5.86008108626166191))"
+French Guiana,GF,GUF,french,Latin America & Caribbean,"POLYGON((-54.62777956974332483 5.86008108626166191,-54.58293830828176141 1.95380906920173625,-51.20489661151056993 1.93887060545761947,-51.3842616573568236 5.84521191184669409,-54.62777956974332483 5.86008108626166191))"
 French Polynesia,PF,PYF,french,Asia & Pacific,"POLYGON((-154.536976692 -27.6412085919999,-154.536976692 -7.95012786299982,-134.942982551 -7.95012786299982,-134.942982551 -27.6412085919999,-154.536976692 -27.6412085919999))"
 Terres australes et antarctiques françaises,TF,ATF,french,Polar,"POLYGON((39.7282820970001 -49.7216122379999,39.7282820970001 -11.5506324199998,77.5852156910001 -11.5506324199998,77.5852156910001 -49.7216122379999,39.7282820970001 -49.7216122379999))"
 Gabon,GA,GAB,french,Africa,"POLYGON((8.69556725400014 -3.93685618990304,8.69556725400014 2.32249501600009,14.4989905190001 2.32249501600009,14.4989905190001 -3.93685618990304,8.69556725400014 -3.93685618990304))"
@@ -97,7 +97,7 @@ Haiti,HT,HTI,french,Latin America & Caribbean,"POLYGON((-74.4891658189999 18.025
 Heard Island and McDonald Islands,HM,HMD,,Polar,"POLYGON((73.236013217 -53.1925595029999,73.236013217 -52.9616024719999,73.8121850920001 -52.9616024719999,73.8121850920001 -53.1925595029999,73.236013217 -53.1925595029999))"
 Vatican City,VA,VAT,italian,Europe,"POLYGON((12.4527140820001 41.9027519410001,12.4527140820001 41.9039147380001,12.4540354420001 41.9039147380001,12.4540354420001 41.9027519410001,12.4527140820001 41.9027519410001))"
 Honduras,HN,HND,spanish,Latin America & Caribbean,"POLYGON((-89.3637912599999 12.9797773240001,-89.3637912599999 17.4186465520001,-83.1304418609999 17.4186465520001,-83.1304418609999 12.9797773240001,-89.3637912599999 12.9797773240001))"
-Hong Kong,HK,HKG,,Asia & Pacific,"POLYGON((113.837331576 22.177069403,113.837331576 22.5639460320001,114.40129642 22.5639460320001,114.40129642 22.177069403,113.837331576 22.177069403))"
+"Hong Kong, SAR China",HK,HKG,,Asia & Pacific,"POLYGON((113.837331576 22.177069403,113.837331576 22.5639460320001,114.40129642 22.5639460320001,114.40129642 22.177069403,113.837331576 22.177069403))"
 Hungary,HU,HUN,hungarian,Europe,"POLYGON((16.0940352780001 45.741343486,16.0940352780001 48.5692328900001,22.8776005460001 48.5692328900001,22.8776005460001 45.741343486,16.0940352780001 45.741343486))"
 Iceland,IS,ISL,,Europe,"POLYGON((-24.539906379 63.3967145850001,-24.539906379 66.564154364,-13.5029190749999 66.564154364,-13.5029190749999 63.3967145850001,-24.539906379 63.3967145850001))"
 India,IN,IND,,Asia & Pacific,"POLYGON((68.1434025400001 6.74555084800015,68.1434025400001 35.4954055790001,97.3622530520001 35.4954055790001,97.3622530520001 6.74555084800015,68.1434025400001 6.74555084800015))"
@@ -127,7 +127,7 @@ Libya,LY,LBY,,Africa,"POLYGON((9.28654382300007 19.496123759,9.28654382300007 33
 Liechtenstein,LI,LIE,german,Europe,"POLYGON((9.47588627100012 47.0524004120001,9.47588627100012 47.2628010050001,9.61572269700011 47.2628010050001,9.61572269700011 47.0524004120001,9.47588627100012 47.0524004120001))"
 Lithuania,LT,LTU,,Europe,"POLYGON((20.9245687005624 53.8868411260001,20.9245687005624 56.4426024370001,26.8007202560001 56.4426024370001,26.8007202560001 53.8868411260001,20.9245687005624 53.8868411260001))"
 Luxembourg,LU,LUX,french,Europe,"POLYGON((5.71492720500004 49.441324362,5.71492720500004 50.1749746710001,6.50257938700014 50.1749746710001,6.50257938700014 49.441324362,5.71492720500004 49.441324362))"
-Macau,MO,MAC,,Asia & Pacific,"POLYGON((113.519867384 22.1053734400001,113.519867384 22.220770575,113.587494337 22.220770575,113.587494337 22.1053734400001,113.519867384 22.1053734400001))"
+"Macau, SAR China",MO,MAC,,Asia & Pacific,"POLYGON((113.519867384 22.1053734400001,113.519867384 22.220770575,113.587494337 22.220770575,113.587494337 22.1053734400001,113.519867384 22.1053734400001))"
 The Republic of North Macedonia,MK,MKD,,Europe,"POLYGON((20.4441573490001 40.8493940230001,20.4441573490001 42.3703347790001,23.0095821530001 42.3703347790001,23.0095821530001 40.8493940230001,20.4441573490001 40.8493940230001))"
 Madagascar,MG,MDG,,Africa,"POLYGON((43.2229110040001 -25.5985653629998,43.2229110040001 -11.9436174459998,50.5039168630001 -11.9436174459998,50.5039168630001 -25.5985653629998,43.2229110040001 -25.5985653629998))"
 Malawi,MW,MWI,,Africa,"POLYGON((32.6633081470002 -17.1353353879999,32.6633081470002 -9.38123504699981,35.9042989500001 -9.38123504699981,35.9042989500001 -17.1353353879999,32.6633081470002 -17.1353353879999))"

diff --git a/lib/data/seeds/overseas_territories.csv b/lib/data/seeds/overseas_territories.csv
@@ -1,7 +1,7 @@
 country,overseas_territories
 AUS,CCK;CXR;NFK;HMD
 NZL,TKL
-CHN,HKG;MAC
+CHN,HKG;MAC;TWN
 GBR,AIA;BMU;VGB;CYM;IOT;FLK;MSR;SGS;SHN;PCN;TCA;JEY;GGY;GIB;IMN
 FRA,NCL;PYF;WLF;ATF;BLM;GLP;GUF;MAF;MTQ;MYT;REU;SPM
 USA,ASM;VIR;GUM;MNP;PRI;UMI

diff --git a/lib/tasks/fix_french_guiana_typo.rake b/lib/tasks/fix_french_guiana_typo.rake
@@ -0,0 +1,4 @@
+desc "Fix French Guaina typo"
+task fix_french_guiana_typo: :environment do
+  Country.find_by(name: 'French Guyana').update(name: 'French Guiana')
+end
diff --git a/lib/tasks/rename_and_assign_chinese_territories.rake b/lib/tasks/rename_and_assign_chinese_territories.rake
@@ -0,0 +1,9 @@
+desc 'Rename Chinese overseas territories and assign Taiwan to China'
+task rename_and_assign_chinese_territories: :environment do
+  Country.find_by(name: 'Hong Kong').update(name: 'Hong Kong, SAR China')
+  Country.find_by(name: 'Macau').update(name: 'Macau, SAR China')
+
+  china = Country.find_by(name: 'China')
+  taiwan = Country.find_by(name: 'Taiwan, Province of China')
+  taiwan.update(parent: china)
+end