From 25c5fede25433c2118c7ce3f8454e092d5435a14 Mon Sep 17 00:00:00 2001
From: Glenda Leonard <75265513+gleonard-m@users.noreply.github.com>
Date: Wed, 22 Mar 2023 10:26:31 -0400
Subject: [PATCH] Added new country mappings for Google Analytics. (#3675)

---
 .../static/country_names_v1/data.csv            | 17 +++++++++++++++++
 sql_generators/country_code_lookup/aliases.yaml | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/sql/moz-fx-data-shared-prod/static/country_names_v1/data.csv b/sql/moz-fx-data-shared-prod/static/country_names_v1/data.csv
index af64dd7bea..58b4aab7df 100755
--- a/sql/moz-fx-data-shared-prod/static/country_names_v1/data.csv
+++ b/sql/moz-fx-data-shared-prod/static/country_names_v1/data.csv
@@ -2,6 +2,7 @@ name,code
 "n/a",??
 "UNKNOWN",??
 "None",??
+"(not set)",??
 "Andorra",AD
 "The Principality of Andorra",AD
 "United Arab Emirates",AE
@@ -9,6 +10,7 @@ name,code
 "Afghanistan",AF
 "The Islamic Republic of Afghanistan",AF
 "Antigua and Barbuda",AG
+"Antigua & Barbuda",AG
 "Anguilla",AI
 "Albania",AL
 "The Republic Albania",AL
@@ -33,6 +35,7 @@ name,code
 "Azerbaijan",AZ
 "The Republic of Azerbaijan",AZ
 "Bosnia and Herzegovina",BA
+"Bosnia & Herzegovina",BA
 "Barbados",BB
 "Bangladesh",BD
 "The People's Republic of Bangladesh",BD
@@ -50,6 +53,7 @@ name,code
 "Saint Barthélemy",BL
 "Saint Barthélemy",BL
 "The Collectivity of Saint-Barthélemy",BL
+"St. Barthélemy",BL
 "Bermuda",BM
 "Brunei",BN
 "Brunei Darussalam",BN
@@ -62,6 +66,7 @@ name,code
 "Sint Eustatius",BQ
 "Bonaire, Sint Eustatius, and Saba",BQ
 "Bonaire, Sint Eustatius and Saba",BQ
+"Caribbean Netherlands",BQ
 "Brazil",BR
 "The Federative Republic of Brazil",BR
 "Bahamas",BS
@@ -84,12 +89,14 @@ name,code
 "Congo, the Democratic Republic of the",CD
 "Democratic Republic of the Congo",CD
 "The Democratic Republic of the Congo",CD
+"Congo - Kinshasa",CD
 "Central African Republic",CF
 "The Central African Republic",CF
 "Congo",CG
 "Congo, Republic of the",CG
 "Republic of the Congo",CG
 "The Republic of the Congo",CG
+"Congo - Brazzaville",CG
 "Switzerland",CH
 "The Swiss Confederation",CH
 "Ivory Coast",CI
@@ -261,6 +268,7 @@ name,code
 "St Kitts and Nevis",KN
 "St. Kitts and Nevis",KN
 "Saint Kitts and Nevis",KN
+"St. Kitts & Nevis",KN
 "North Korea",KP
 "Korea, Democratic People's Republic of",KP
 "The Democratic People's Republic of Korea",KP
@@ -311,6 +319,7 @@ name,code
 "Saint Martin (French part)",MF
 "Collectivity of Saint Martin Saint Martin (French part)",MF
 "The Collectivity of Saint-Martin",MF
+"St. Martin",MF
 "Madagascar",MG
 "The Republic of Madagascar",MG
 "Marshall Islands",MH
@@ -326,6 +335,7 @@ name,code
 "The Republic of Mali",ML
 "Myanmar",MM
 "The Republic of the Union of Myanmar",MM
+"Myanmar (Burma)",MM
 "Mongolia",MN
 "Macau",MO
 "Macao",MO
@@ -388,6 +398,7 @@ name,code
 "The Republic of Poland",PL
 "Saint Pierre and Miquelon",PM
 "The Overseas Collectivity of Saint-Pierre and Miquelon",PM
+"St. Pierre & Miquelon",PM
 "Pitcairn Islands",PN
 "Pitcairn",PN
 "The Pitcairn, Henderson, Ducie and Oeno Islands",PN
@@ -457,6 +468,7 @@ name,code
 "Sao Tome and Principe",ST
 "São Tomé and Príncipe",ST
 "The Democratic Republic of São Tomé and Príncipe",ST
+"São Tomé & Príncipe",ST
 "El Salvador",SV
 "The Republic of El Salvador",SV
 "Sint Maarten",SX
@@ -471,6 +483,7 @@ name,code
 "Turks and Caicos",TC
 "Turks and Caicos Islands",TC
 "The Turks and Caicos Islands",TC
+"Turks & Caicos Islands",TC
 "Chad",TD
 "The Republic of Chad",TD
 "French Southern Territories",TF
@@ -494,8 +507,10 @@ name,code
 "The Kingdom of Tonga",TO
 "Turkey",TR
 "The Republic of Turkey",TR
+"Türkiye",TR
 "Trinidad and Tobago",TT
 "The Republic of Trinidad and Tobago",TT
+"Trinidad & Tobago",TT
 "Tuvalu",TV
 "Taiwan",TW
 "Taiwan, Province of China",TW
@@ -523,6 +538,7 @@ name,code
 "Holy See (Vatican City State)",VA
 "St. Vincent and the Grenadines",VC
 "Saint Vincent and the Grenadines",VC
+"St. Vincent & Grenadines",VC
 "Venezuela",VE
 "Venezuela, Bolivarian Republic of",VE
 "The Bolivarian Republic of Venezuela",VE
@@ -542,6 +558,7 @@ name,code
 "The Republic of Vanuatu",VU
 "Wallis and Futuna",WF
 "The Territory of the Wallis and Futuna Islands",WF
+"Wallis & Futuna",WF
 "Samoa",WS
 "The Independent State of Samoa",WS
 "Kosovo",XK
diff --git a/sql_generators/country_code_lookup/aliases.yaml b/sql_generators/country_code_lookup/aliases.yaml
index 5c122a6f90..60c8ca0c39 100644
--- a/sql_generators/country_code_lookup/aliases.yaml
+++ b/sql_generators/country_code_lookup/aliases.yaml
@@ -27,6 +27,7 @@ AQ:
     - "Antarctica"
 AG:
     - "Antigua and Barbuda"
+    - "Antigua & Barbuda"
 AR:
     - "Argentina"
     - "The Argentine Republic"
@@ -82,8 +83,10 @@ BQ:
     - "Sint Eustatius"
     - "Bonaire, Sint Eustatius, and Saba"
     - "Bonaire, Sint Eustatius and Saba"
+    - "Caribbean Netherlands"
 BA:
     - "Bosnia and Herzegovina"
+    - "Bosnia & Herzegovina"
 BW:
     - "Botswana"
     - "The Republic of Botswana"
@@ -154,11 +157,13 @@ CD:
     - "Congo, the Democratic Republic of the"
     - "Democratic Republic of the Congo"
     - "The Democratic Republic of the Congo"
+    - "Congo - Kinshasa"
 CG:
     - "Congo"
     - "Congo, Republic of the"
     - "Republic of the Congo"
     - "The Republic of the Congo"
+    - "Congo - Brazzaville"
 CK:
     - "Cook Islands"
     - "The Cook Islands"
@@ -490,6 +495,7 @@ MZ:
 MM:
     - "Myanmar"
     - "The Republic of the Union of Myanmar"
+    - "Myanmar (Burma)"
 NA:
     - "Namibia"
     - "The Republic of Namibia"
@@ -589,6 +595,7 @@ BL:
     - "Saint Barthélemy"
     - "Saint Barthélemy"
     - "The Collectivity of Saint-Barthélemy"
+    - "St. Barthélemy"
 SH:
     - "Saint Helena"
     - "St Helena, Ascension, Tristan da Cunha"
@@ -597,6 +604,7 @@ KN:
     - "St Kitts and Nevis"
     - "St. Kitts and Nevis"
     - "Saint Kitts and Nevis"
+    - "St. Kitts & Nevis"
 LC:
     - "St. Lucia"
     - "Saint Lucia"
@@ -605,12 +613,15 @@ MF:
     - "Saint Martin (French part)"
     - "Collectivity of Saint Martin Saint Martin (French part)"
     - "The Collectivity of Saint-Martin"
+    - "St. Martin"
 PM:
     - "Saint Pierre and Miquelon"
     - "The Overseas Collectivity of Saint-Pierre and Miquelon"
+    - "St. Pierre & Miquelon"
 VC:
     - "St. Vincent and the Grenadines"
     - "Saint Vincent and the Grenadines"
+    - "St. Vincent & Grenadines"
 WS:
     - "Samoa"
     - "The Independent State of Samoa"
@@ -622,6 +633,7 @@ ST:
     - "Sao Tome and Principe"
     - "São Tomé and Príncipe"
     - "The Democratic Republic of São Tomé and Príncipe"
+    - "São Tomé & Príncipe"
 SA:
     - "Saudi Arabia"
     - "The Kingdom of Saudi Arabia"
@@ -720,18 +732,21 @@ TO:
 TT:
     - "Trinidad and Tobago"
     - "The Republic of Trinidad and Tobago"
+    - "Trinidad & Tobago"
 TN:
     - "Tunisia"
     - "The Republic of Tunisia"
 TR:
     - "Turkey"
     - "The Republic of Turkey"
+    - "Türkiye"
 TM:
     - "Turkmenistan"
 TC:
     - "Turks and Caicos"
     - "Turks and Caicos Islands"
     - "The Turks and Caicos Islands"
+    - "Turks & Caicos Islands"
 TV:
     - "Tuvalu"
 UG:
@@ -785,6 +800,7 @@ VI:
 WF:
     - "Wallis and Futuna"
     - "The Territory of the Wallis and Futuna Islands"
+    - "Wallis & Futuna"
 EH:
     - "Western Sahara"
     - "The Sahrawi Arab Democratic Republic"
@@ -803,6 +819,7 @@ ZW:
     - "n/a"
     - "UNKNOWN"
     - "None"
+    - "(not set)"
 ROW:
     - "Rest of World"
     - "RoW"
\ No newline at end of file