Regenerated files

Author: rijnb

mapcodelib/mapcode_countrynames.h

@@ -18,7 +18,7 @@
 
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 static const char *isofullname[] = {
-"Vatican City State (Holy See)",
+"Vatican (Holy See) (_ City State)",
 "Monaco (Principality of _)",
 "Gibraltar",
 "Tokelau",
@@ -29,8 +29,8 @@ static const char *isofullname[] = {
 "Macau (Aomen)",
 "Sint Maarten",
 "Saint Martin (Collectivity of _)",
-"Norfolk and Philip Island (Philip Island)",
-"Pitcairn Group of Islands",
+"Norfolk and Philip Island (Philip Island) (Norfolk Island)",
+"Pitcairn Islands (Pitcairn, Henderson, Ducie and Oeno Islands)",
 "Bouvet Island",
 "Bermuda (Somers Isles)",
 "British Indian Ocean Territory",
@@ -40,29 +40,29 @@ static const char *isofullname[] = {
 "Montserrat",
 "Jersey (Bailiwick of _)",
 "Christmas Island",
-"Wallis and Futuna (Futuna) (Collectivity of the _ Islands)",
+"Wallis and Futuna (Futuna) (Wallis) (Collectivity of the _ Islands)",
 "British Virgin Islands (Virgin Islands, British)",
 "Liechtenstein (Principality of _)",
 "Aruba",
 "Marshall Islands (Republic of the _)",
 "American Samoa (Samoa, American)",
 "Cook Islands",
-"Saint Pierre and Miquelon (Miquelon) (Collectivity of _)",
+"Saint Pierre and Miquelon (Miquelon) (Saint Pierre) (Collectivity of _)",
 "Niue",
-"Saint Kitts and Nevis (Nevis) (Federation of _)",
+"Saint Kitts and Nevis (Nevis) (Saint Kitts) (Federation of _)",
 "Cayman islands",
-"Bonaire, St Eustasuis and Saba (Saba) (St Eustasius)",
+"Bonaire, St Eustasuis and Saba (Bonaire) (Saba) (St Eustasius)",
 "Maldives (Republic of _)",
-"Saint Helena, Ascension and Tristan da Cunha (Ascension) (Tristan da Cunha)",
+"Saint Helena, Ascension and Tristan da Cunha (Saint Helena) (Ascension) (Tristan da Cunha)",
 "Malta (Republic of _)",
 "Grenada",
 "Virgin Islands of the United States (US Virgin Islands) (American Virgin Islands)",
 "Mayotte (Maore)",
-"Svalbard and Jan Mayen (Jan Mayen) (Spitsbergen)",
-"Saint Vincent and the Grenadines (Grenadines)",
-"Heard Island and McDonald Islands (McDonald Islands)",
+"Svalbard and Jan Mayen (Svalbard) (Jan Mayen) (Spitsbergen)",
+"Saint Vincent and the Grenadines (Saint Vincent) (Grenadines)",
+"Heard Island and McDonald Islands (Heard Island) (McDonald Islands)",
 "Barbados",
-"Antigua and Barbuda (Barbuda)",
+"Antigua and Barbuda (Antigua) (Barbuda)",
 "Curacao",
 "Seychelles (Republic of _)",
 "Palau (Republic of _)",
@@ -77,8 +77,8 @@ static const char *isofullname[] = {
 "Dominica (Commonwealth of _)",
 "Bahrain (Kingdom of _)",
 "Kiribati (Republic of _)",
-"Turks and Caicos Islands (Caicos Islands)",
-"Sao Tome and Principe (Principe) (Democratic Republic of _)",
+"Turks and Caicos Islands (Turks Islands) (Caicos Islands)",
+"Sao Tome and Principe (Sao Tome) (Principe) (Democratic Republic of _)",
 "Hong Kong (Xianggang)",
 "Martinique",
 "Faroe Islands",
@@ -88,10 +88,10 @@ static const char *isofullname[] = {
 "Reunion",
 "Luxembourg (Grand Duchy of _)",
 "Samoa (Independent State of _)",
-"South Georgia and the South Sandwich Islands (South Sandwich Islands)",
+"South Georgia and the South Sandwich Islands (South Georgia) (South Sandwich Islands)",
 "French Polynesia (Collectivity of _)",
 "Cape Verde (Cabo Verde) (Republic of Cabo Verde)",
-"Trinidad and Tobago (Republic of _) (Tobago)",
+"Trinidad and Tobago (Republic of _) (Trinidad) (Tobago)",
 "Brunei (Nation of _, the Abode of Peace)",
 "French Southern and Antarctic Lands",
 "Puerto Rico (Commonwealth of _)",
@@ -100,7 +100,7 @@ static const char *isofullname[] = {
 "Jamaica",
 "Gambia (The Gambia) (Republic of the _)",
 "Qatar (State of _)",
-"Falkland Islands",
+"Falkland Islands (The Falklands)",
 "Vanuatu (Republic of _)",
 "Montenegro",
 "Bahamas (Commonwealth of the _)",
@@ -155,7 +155,7 @@ static const char *isofullname[] = {
 "Jordan (Hashemite Kingdom of _) (Kingdom of _)",
 "Portugal (Portuguese Republic)",
 "Hungary (Republic of _)",
-"South Korea (Republic of Korea)",
+"South Korea (Republic of Korea) (Korea, South)",
 "Iceland",
 "Guatemala (Republic of _)",
 "Cuba (Republic of _)",
@@ -165,9 +165,9 @@ static const char *isofullname[] = {
 "Benin (Republic of _)",
 "Eritrea (State of _)",
 "Malawi (Republic of _)",
-"North Korea (Democratic People's Republic of Korea)",
+"North Korea (Democratic People's Republic of Korea) (Korea, North)",
 "Nicaragua (Republic of _)",
-"Greece (Hellenic Republic)",
+"Greece (Hellenic Republic) (Hellas)",
 "Tajikistan (Republic of _)",
 "Bangladesh (People's Republic of _)",
 "Nepal (Federal Democratic Republic of _)",
@@ -184,7 +184,7 @@ static const char *isofullname[] = {
 "Romania",
 "Ghana (Republic of _)",
 "Uganda (Republic of _)",
-"United Kingdom (Scotland) (Great Britain) (Northern Ireland) (Ireland, Northern) (Britain) (United Kingdom of Great Britain and Northern Ireland)",
+"United Kingdom (Scotland) (Great Britain) (England) (Northern Ireland) (Ireland, Northern) (Britain) (United Kingdom of Great Britain and Northern Ireland)",
 "Guinea (Republic of _) (Guinea-Conakry)",
 "Ecuador (Republic of _)",
 "Western Sahara (Sahrawi Arab Democratic Republic)",
@@ -290,9 +290,9 @@ static const char *isofullname[] = {
 "Kazakhstan (Republic of _)",
 "Argentina (Argentine Republic)",
 "Daman and Diu",
-"Dadra and Nagar Haveli",
+"Dadra and Nagar Haveli (Dadra) (Nagar Haveli)",
 "Chandigarh",
-"Andaman and Nicobar",
+"Andaman and Nicobar (Andaman) (Nicobar)",
 "Lakshadweep",
 "Delhi (National Capital Territory of _)",
 "Meghalaya",
@@ -311,7 +311,7 @@ static const char *isofullname[] = {
 "Kerala",
 "Tamil Nadu",
 "Himachal Pradesh",
-"Jammu and Kashmir",
+"Jammu and Kashmir (Jammu) (Kashmir)",
 "Chhattisgarh",
 "Jharkhand",
 "Karnataka",
@@ -418,7 +418,7 @@ static const char *isofullname[] = {
 "Quebec",
 "Saskatchewan",
 "Manitoba",
-"Newfoundland and Labrador (Labrador)",
+"Newfoundland and Labrador (Newfoundland) (Labrador)",
 "New Brunswick",
 "Nova Scotia",
 "Prince Edward Island",

mapcodelib/mapcode_countrynames_short.h

@@ -18,7 +18,7 @@
 
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 static const char *isofullname[] = {
-"Vatican City State (Holy See)",
+"Vatican (Holy See)",
 "Monaco",
 "Gibraltar",
 "Tokelau",
@@ -29,8 +29,8 @@ static const char *isofullname[] = {
 "Macau (Aomen)",
 "Sint Maarten",
 "Saint Martin",
-"Norfolk and Philip Island (Philip Island)",
-"Pitcairn Group of Islands",
+"Norfolk and Philip Island (Philip Island) (Norfolk Island)",
+"Pitcairn Islands (Pitcairn, Henderson, Ducie and Oeno Islands)",
 "Bouvet Island",
 "Bermuda (Somers Isles)",
 "British Indian Ocean Territory",
@@ -40,29 +40,29 @@ static const char *isofullname[] = {
 "Montserrat",
 "Jersey",
 "Christmas Island",
-"Wallis and Futuna (Futuna)",
+"Wallis and Futuna (Futuna) (Wallis)",
 "British Virgin Islands (Virgin Islands, British)",
 "Liechtenstein",
 "Aruba",
 "Marshall Islands",
 "American Samoa (Samoa, American)",
 "Cook Islands",
-"Saint Pierre and Miquelon (Miquelon)",
+"Saint Pierre and Miquelon (Miquelon) (Saint Pierre)",
 "Niue",
-"Saint Kitts and Nevis (Nevis)",
+"Saint Kitts and Nevis (Nevis) (Saint Kitts)",
 "Cayman islands",
-"Bonaire, St Eustasuis and Saba (Saba) (St Eustasius)",
+"Bonaire, St Eustasuis and Saba (Bonaire) (Saba) (St Eustasius)",
 "Maldives",
-"Saint Helena, Ascension and Tristan da Cunha (Ascension) (Tristan da Cunha)",
+"Saint Helena, Ascension and Tristan da Cunha (Saint Helena) (Ascension) (Tristan da Cunha)",
 "Malta",
 "Grenada",
 "Virgin Islands of the United States (US Virgin Islands) (American Virgin Islands)",
 "Mayotte (Maore)",
-"Svalbard and Jan Mayen (Jan Mayen) (Spitsbergen)",
-"Saint Vincent and the Grenadines (Grenadines)",
-"Heard Island and McDonald Islands (McDonald Islands)",
+"Svalbard and Jan Mayen (Svalbard) (Jan Mayen) (Spitsbergen)",
+"Saint Vincent and the Grenadines (Saint Vincent) (Grenadines)",
+"Heard Island and McDonald Islands (Heard Island) (McDonald Islands)",
 "Barbados",
-"Antigua and Barbuda (Barbuda)",
+"Antigua and Barbuda (Antigua) (Barbuda)",
 "Curacao",
 "Seychelles",
 "Palau",
@@ -77,8 +77,8 @@ static const char *isofullname[] = {
 "Dominica",
 "Bahrain",
 "Kiribati",
-"Turks and Caicos Islands (Caicos Islands)",
-"Sao Tome and Principe (Principe)",
+"Turks and Caicos Islands (Turks Islands) (Caicos Islands)",
+"Sao Tome and Principe (Sao Tome) (Principe)",
 "Hong Kong (Xianggang)",
 "Martinique",
 "Faroe Islands",
@@ -88,10 +88,10 @@ static const char *isofullname[] = {
 "Reunion",
 "Luxembourg",
 "Samoa",
-"South Georgia and the South Sandwich Islands (South Sandwich Islands)",
+"South Georgia and the South Sandwich Islands (South Georgia) (South Sandwich Islands)",
 "French Polynesia",
 "Cape Verde (Cabo Verde) (Republic of Cabo Verde)",
-"Trinidad and Tobago (Tobago)",
+"Trinidad and Tobago (Trinidad) (Tobago)",
 "Brunei",
 "French Southern and Antarctic Lands",
 "Puerto Rico",
@@ -100,7 +100,7 @@ static const char *isofullname[] = {
 "Jamaica",
 "Gambia (The Gambia)",
 "Qatar",
-"Falkland Islands",
+"Falkland Islands (The Falklands)",
 "Vanuatu",
 "Montenegro",
 "Bahamas",
@@ -155,7 +155,7 @@ static const char *isofullname[] = {
 "Jordan",
 "Portugal (Portuguese Republic)",
 "Hungary",
-"South Korea (Republic of Korea)",
+"South Korea (Republic of Korea) (Korea, South)",
 "Iceland",
 "Guatemala",
 "Cuba",
@@ -165,9 +165,9 @@ static const char *isofullname[] = {
 "Benin",
 "Eritrea",
 "Malawi",
-"North Korea (Democratic People's Republic of Korea)",
+"North Korea (Democratic People's Republic of Korea) (Korea, North)",
 "Nicaragua",
-"Greece (Hellenic Republic)",
+"Greece (Hellenic Republic) (Hellas)",
 "Tajikistan",
 "Bangladesh",
 "Nepal",
@@ -184,7 +184,7 @@ static const char *isofullname[] = {
 "Romania",
 "Ghana",
 "Uganda",
-"United Kingdom (Scotland) (Great Britain) (Northern Ireland) (Ireland, Northern) (Britain) (United Kingdom of Great Britain and Northern Ireland)",
+"United Kingdom (Scotland) (Great Britain) (England) (Northern Ireland) (Ireland, Northern) (Britain) (United Kingdom of Great Britain and Northern Ireland)",
 "Guinea (Guinea-Conakry)",
 "Ecuador",
 "Western Sahara (Sahrawi Arab Democratic Republic)",
@@ -290,9 +290,9 @@ static const char *isofullname[] = {
 "Kazakhstan",
 "Argentina (Argentine Republic)",
 "Daman and Diu",
-"Dadra and Nagar Haveli",
+"Dadra and Nagar Haveli (Dadra) (Nagar Haveli)",
 "Chandigarh",
-"Andaman and Nicobar",
+"Andaman and Nicobar (Andaman) (Nicobar)",
 "Lakshadweep",
 "Delhi",
 "Meghalaya",
@@ -311,7 +311,7 @@ static const char *isofullname[] = {
 "Kerala",
 "Tamil Nadu",
 "Himachal Pradesh",
-"Jammu and Kashmir",
+"Jammu and Kashmir (Jammu) (Kashmir)",
 "Chhattisgarh",
 "Jharkhand",
 "Karnataka",
@@ -418,7 +418,7 @@ static const char *isofullname[] = {
 "Quebec",
 "Saskatchewan",
 "Manitoba",
-"Newfoundland and Labrador (Labrador)",
+"Newfoundland and Labrador (Newfoundland) (Labrador)",
 "New Brunswick",
 "Nova Scotia",
 "Prince Edward Island",