update Geo module

tools/geo/jsonc/countries.jsonc

@@ -1,18 +1,13 @@
 /*
-    350 countries
+    353 countries
     --  sovereign, dependent and disputed countries according to
         http://en.wikipedia.org/wiki/List_of_sovereign_states
     --  entities with country codes, according to
         http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
     --  dissolved countries, according to
         http://en.wikipedia.org/wiki/ISO_3166-3 and http://www.imdb.com/country/
-    current, independent, dependent, disputed: 286, 197, 79, 9
-    dissolved, independent, dependent, disputed: 64, 28, 22, 13
-    alias: 2
 */
-// FIXME: still missing: Cabinda, ...
 {
-    "alias": ["FXFR", "UK"],
     "code": {
         // http://en.wikipedia.org/wiki/ISO_3166-2:AE
         "Abu Dhabi": "AE-AZ",
@@ -22,6 +17,8 @@
         "Ras al-Khaimah": "AE-RK",
         "Sharjah": "AE-SH",
         "Umm al-Quwain": "AE-UQ",
+        // http://en.wikipedia.org/wiki/ISO_3166-2:AO
+        "Cabinda": "AO-CAB",
         // http://en.wikipedia.org/wiki/ISO_3166-2:AU
         "Ashmore and Cartier Islands": "AU-AC", // AQ
         "Coral Sea Islands": "AU-CS", // AQ
@@ -73,6 +70,8 @@
         // http://en.wikipedia.org/wiki/List_of_sovereign_states_in_the_1970s
         "British Honduras": "GBBZ",
         "Ceylon": "LKLK",
+        "Ellice Islands": "GETV",
+        "Gilbert Islands": "GEKI",
         "Kampuchea": "KAKH",
         "Khmer Republic": "KHKA",
         "North Yemen": "YEYE",
@@ -112,8 +111,9 @@
                 "Zimbabwe Rhodesia"
             ],
             "Middle Africa": [
-                "Angola", "Cameroon", "Central African Republic", "Chad", "Democratic Republic of the Congo",
+                "Angola", "Cabinda", "Cameroon", "Central African Republic", "Chad",
-                "Equatorial Guinea", "Gabon", "Republic of the Congo", "São Tomé and Príncipe", "Zaire"
+                "Democratic Republic of the Congo", "Equatorial Guinea", "Gabon", "Republic of the Congo", "São Tomé and Príncipe",
+                "Zaire"
             ],
             "Northern Africa": [
                 "Algeria", "Canary Islands", "Ceuta and Melilla", "Egypt", "Libya",
@@ -135,7 +135,6 @@
         "Antarctica": {
             // http://en.wikipedia.org/wiki/Territorial_claims_in_Antarctica
             "Antarctica": [
-                // antarctic
                 "Adélie Land", "Antarctica", "Argentine Antarctica", "Australian Antarctic Territory", "Bouvet Island",
                 "British Antarctic Territory", "Chilean Antarctic Territory",
                 "French Southern and Antarctic Territories",
@@ -213,15 +212,19 @@
                 "Solomon Islands", "Tafea", "Tanna", "Vanuatu", "Vemerana"
             ],
             "Micronesia": [
-                // Gilbert and Ellice Islands split into Kiribati (Micronesia) and Tuvalu (Polynesia)
+                // Gilbert and Ellice Islands split into Gilbert Islands and Ellice Islands.
-                // Wake Island is the only U.S. island not in Polynesia (http://en.wikipedia.org/wiki/Micronesia)
+                // Ellice Islands became Tuvalu (Polynesia), Gilbert Islands and
-                "Canton and Enderbury Islands", "Gilbert and Ellice Islands", "Guam", "Kiribati", "Marshall Islands",
+                // Canton and Enderbury Islands became Kiribati (Micronesia). 
-                "Micronesia", "Nauru", "Northern Mariana Islands", "Pacific Islands", "Palau", "Wake Island"
+                // Wake Island is the only U.S. island not in Polynesia
+                // (http://en.wikipedia.org/wiki/Micronesia)
+                "Canton and Enderbury Islands", "Gilbert and Ellice Islands", "Gilbert Islands", "Guam", "Kiribati",
+                "Marshall Islands", "Micronesia", "Nauru", "Northern Mariana Islands", "Pacific Islands",
+                "Palau", "Wake Island"
             ],
             "Polynesia": [
-                "American Samoa", "Cook Islands", "French Polynesia", "Johnston Island", "Midway Islands",
+                "American Samoa", "Cook Islands", "Ellice Islands", "French Polynesia", "Johnston Island",
-                "Niue", "Pitcairn Islands", "Samoa", "Tokelau", "Tonga", "Tuvalu",
+                "Midway Islands", "Niue", "Pitcairn Islands", "Samoa", "Tokelau",
-                "United States Minor Outlying Islands", "United States Miscellaneous Pacific Islands", "Wallis and Futuna"
+                "Tonga", "Tuvalu", "United States Minor Outlying Islands", "United States Miscellaneous Pacific Islands", "Wallis and Futuna"
             ]
         },
         "South America": {
@@ -245,16 +248,6 @@
             ]
         }
     },
-    "created": {
-        "United Arab Emirates": {"date": "1971-12-02"},
-        "Anguilla": {},
-        "Slovenia": {"country": "Yugoslavia", "date": "1991-06-25"},
-        "Macedonia": {"country": "Yugoslavia", "date": "1991-09-08"},
-        "Croatia": {"country": "Yugoslavia", "date": "1991-10-08"},
-        "Bosnia and Herzegovina": {"country": "Yugoslavia", "date": "1992-03-01"},
-        "Kosovo": {"country": "Serbia", "date": "2008-02-17"},
-        "South Sudan": {"country": "Sudan", "date": "2011-07-09"}
-    },
     "dependencies": {
         "Argentina": ["Argentine Antarctica"],
         "Argentina, Australia, Chile, France, New Zealand, Norway, United Kingdom": ["Antarctica"],
@@ -262,6 +255,7 @@
             "Ashmore and Cartier Islands", "Australian Antarctic Territory", "Christmas Island", "Cocos Islands", "Coral Sea Islands",
             "Heard Island and McDonald Islands", "Norfolk Island"
         ],
+        "British Indian Ocean Territory": ["Diego Garcia"],
         "Chile": ["Chilean Antarctic Territory"],
         "China": ["Hong Kong", "Macau"],
         "Denmark": ["Faroe Islands", "Greenland"],
@@ -281,16 +275,17 @@
         "New Zealand": ["Cook Islands", "Niue", "Ross Dependency", "Tokelau"],
         "Norway": ["Bouvet Island", "Peter I Island", "Queen Maud Land", "Svalbard and Jan Mayen"],
         "Pakistan": ["Azad Kashmir", "Gilgit-Baltistan"],
+        "Saint Helena, Ascension and Tristan da Cunha": ["Ascension", "Tristan da Cunha"],
         "Spain": ["Canary Islands", "Ceuta and Melilla"],
         "South Africa": ["Bophuthatswana", "Ciskei", "Transkei", "Venda"],
         "Soviet Union": ["Byelorussian Soviet Socialist Republic", "Ukrainian Soviet Socialist Republic"],
         "United Kingdom": [
-            "Akrotiri and Dhekelia", "Anguilla", "Ascension", "Bermuda", "British Antarctic Territory",
+            "Akrotiri and Dhekelia", "Anguilla", "Bermuda", "British Antarctic Territory", "British Honduras",
-            "British Honduras", "British Indian Ocean Territory", "British Virgin Islands", "Cayman Islands", "Diego Garcia",
+            "British Indian Ocean Territory", "British Virgin Islands", "Cayman Islands", "Ellice Islands", "England",
-            "England", "Falkland Islands", "Gibraltar", "Gilbert and Ellice Islands", "Guernsey",
+            "Falkland Islands", "Gibraltar", "Gilbert and Ellice Islands", "Gilbert Islands", "Guernsey",
             "Isle of Man", "Jersey", "Montserrat", "Northern Ireland", "Pitcairn Islands",
             "Saint Christopher-Nevis-Anguilla", "Saint Helena, Ascension and Tristan da Cunha", "Scotland", "South Georgia and the South Sandwich Islands", "Southern Rhodesia",
-            "Tristan da Cunha", "Trucial States", "Turks and Caicos Islands", "Wales"
+            "Trucial States", "Turks and Caicos Islands", "Wales"
         ],
         "United Kingdom, United States": ["Canton and Enderbury Islands"],
         "United States": [
@@ -300,6 +295,7 @@
         ]
     },
     "disputes": {
+        "Angola": ["Cabinda"],
         "Azerbaijan": ["Nagorno-Karabakh"],
         "Comoros": ["Anjouan", "Mohéli"],
         "Cyprus": ["Northern Cyprus"],
@@ -318,110 +314,19 @@
         "Uganda": ["Rwenzururu"],
         "United Kingdom": ["Sealand"]
     },
-    "dissolved": {
+    // http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-        // joined: joined an existing country (or split between existing countries)
+    "exception": ["AC", "CP", "DG", "EA", "EU", "FXFR", "IC", "TA", "UK"],
-        // merged: merged into a new country
-        // renamed: just renamed
-        // split: split into new countries
-        "Korea": {"country": "Japan", "date": "1910-08-22", "dissolved": "joined"},
-        "Siam": {"country": "Thailand", "date": "1939-06-23", "dissolved": "renamed"},
-        "Biafra": {"country": "Nigeria", "date": "1970-01-15", "dissolved": "joined"},
-        "United Arab Republic": {"country": "Egypt", "date": "1971-09-01", "dissolved": "renamed"},
-        "Trucial States": {"country": [
-            "Abu Dhabi", "Ajman", "Dubai", "Fujairah", "Ras al-Khaimah",
-            "Sharjah", "Umm al-Quwain"
-        ], "date": "1971-12-01", "dissolved": "split"},
-        "Abu Dhabi": {"country": "United Arab Emirates", "date": "1971-12-02", "dissolved": "merged"},
-        "Ajman": {"country": "United Arab Emirates", "date": "1971-12-02", "dissolved": "merged"},
-        "Dubai": {"country": "United Arab Emirates", "date": "1971-12-02", "dissolved": "merged"},
-        "Fujairah": {"country": "United Arab Emirates", "date": "1971-12-02", "dissolved": "merged"},
-        "Sharjah": {"country": "United Arab Emirates", "date": "1971-12-02", "dissolved": "merged"},
-        "Umm al-Quwain": {"country": "United Arab Emirates", "date": "1971-12-02", "dissolved": "merged"},
-        "Ras al-Khaimah": {"country": "United Arab Emirates", "date": "1972-02-11", "dissolved": "joined"},
-        "Ceylon": {"country": "Sri Lanka", "date": "1972-05-22", "dissolved": "renamed"},
-        "British Honduras": {"country": "Belize", "date": "1973-06-01", "dissolved": "renamed"},
-        "Tanna": {"country": "New Hebrides", "date": "1974-06-29", "dissolved": "joined"},
-        "Khmer Republic": {"country": "Kampuchea", "date": "1975-04-17", "dissolved": "renamed"},
-        "Sikkim": {"country": "India", "date": "1975-05-16", "dissolved": "joined"},
-        "Dahomey": {"country": "Benin", "date": "1975-11-30", "dissolved": "renamed"},
-        "North Vietnam": {"country": "Vietnam", "date": "1976-07-02", "dissolved": "merged"},
-        "South Vietnam": {"country": "Vietnam", "date": "1976-07-02", "dissolved": "merged"},
-        "French Afar and Issas": {"country": "Djibouti", "date": "1977-06-27", "dissolved": "renamed"},
-        "French Southern and Antarctic Territories": {"country": [
-            "Adélie Land', 'French Southern Territories"
-        ], "date": "1979", "dissolved": "split"},
-        "Rhodesia": {"country": "Zimbabwe Rhodesia", "date": "1979-06-01", "dissolved": "renamed"},
-        "Canton and Enderbury Islands": {"country": "Kiribati", "date": "1979-07-12", "dissolved": "merged"},
-        // actually, Tuvalu became independent 1978-10-01
-        "Gilbert and Ellice Islands": {"country": [
-            "Kiribati", "Tuvalu"
-        ], "date": "1979-07-12", "dissolved": "split"},
-        "Panama Canal Zone": {"country": "Panama", "date": "1979-10-01", "dissolved": "joined"},
-        "Zimbabwe Rhodesia": {"country": "Southern Rhodesia", "date": "1979-06-01", "dissolved": "renamed"},
-        "Southern Rhodesia": {"country": "Zimbabwe", "date": "1980-04-18", "dissolved": "renamed"},
-        "Tafea": {"country": "New Hebrides", "date": "1980-05-26", "dissolved": "joined"},
-        "Vemerana": {"country": "New Hebrides", "date": "1980-07-24", "dissolved": "joined"},
-        "New Hebrides": {"country": "Vanuatu", "date": "1980-07-30", "dissolved": "renamed"},
-        "Rwenzururu": {"country": "Uganda", "date": "1982-08-13", "dissolved": "joined"},
-        "Saint Christopher-Nevis-Anguilla": {"country": [
-            "Anguilla", "Saint Kitts and Nevis"
-        ], "date": "1983-09-19", "dissolved": "split"},
-        "Upper Volta": {"country": "Burkina Faso", "date": "1984-08-04", "dissolved": "renamed"},
-        "Johnston Island": {"country": "United States Minor Outlying Islands", "date": "1986", "dissolved": "merged"},
-        "Midway Islands": {"country": "United States Minor Outlying Islands", "date": "1986", "dissolved": "merged"},
-        "United States Miscellaneous Pacific Islands": {"country": "United States Minor Outlying Islands", "date": "1986", "dissolved": "merged"},
-        "Wake Island": {"country": "United States Minor Outlying Islands", "date": "1986", "dissolved": "merged"},
-        "Pacific Islands": {"country": [
-            "Marshall Islands", "Micronesia", "Northern Mariana Islands", "Palau"
-        ], "date": "1986", "dissolved": "split"},
-        "Kampuchea": {"country": "Cambodia", "date": "1989-05-01", "dissolved": "renamed"},
-        "Burma": {"country": "Myanmar", "date": "1989-06-18", "dissolved": "renamed"},
-        "North Yemen": {"country": "Yemen", "date": "1990-05-22", "dissolved": "merged"},
-        "South Yemen": {"country": "Yemen", "date": "1990-05-22", "dissolved": "merged"},
-        "East Germany": {"country": "Germany", "date": "1990-10-03", "dissolved": "merged"},
-        "West Germany": {"country": "Germany", "date": "1990-10-03", "dissolved": "merged"},
-        "Neutral Zone": {"country": [
-            "Iraq", "Saudi Arabia"
-        ], "date": "1991", "dissolved": "joined"},
-        // The Byelorussian Soviet Socialist Republic, like the Ukrainian SSR,
-        // had its own ISO 3361-1 code, being a member of the United Nations
-        "Ukrainian Soviet Socialist Republic": {"country": "Ukraine", "date": "1991-08-24", "dissolved": "renamed"},
-        "Byelorussian Soviet Socialist Republic": {"country": "Belarus", "date": "1991-08-25", "dissolved": "renamed"},
-        "Soviet Union": {"country": [
-            "Armenia", "Azerbaijan", "Estonia", "Georgia", "Kazakhstan",
-            "Kyrgyzstan", "Latvia", "Lithuania", "Moldova", "Russia",
-            "Tajikistan", "Turkmenistan", "Uzbekistan"        
-        ], "date": "1991-12-25", "dissolved": "split"},
-        "Czechoslovakia": {"country": [
-            "Czech Republic", "Slovakia"
-        ], "date": "1993-01-01", "dissolved": "split"},
-        "Bophuthatswana": {"country": "South Africa", "date": "1994-04-27", "dissolved": "joined"},
-        "Ciskei": {"country": "South Africa", "date": "1994-04-27", "dissolved": "joined"},
-        "Transkei": {"country": "South Africa", "date": "1994-04-27", "dissolved": "joined"},
-        "Venda": {"country": "South Africa", "date": "1994-04-27", "dissolved": "joined"},
-        "Metropolitan France": {"country": "France", "date": "1997", "dissolved": "merged"},
-        "Zaire": {"country": "Democratic Republic of the Congo", "date": "1997-05-17", "dissolved": "renamed"},
-        "Bougainville": {"country": "Papua New Guinea", "date": "1998-12-24", "dissolved": "joined"},
-        "Chechnia": {"country": "Russia", "date": "2000-02-06", "dissolved": "joined"},
-        "Anjouan": {"country": "Comoros", "date": "2002-03-10", "dissolved": "joined"},
-        "Mohéli": {"country": "Comoros", "date": "2002-03-10", "dissolved": "joined"},
-        "East Timor": {"country": "Timor-Leste", "date": "2002-05-20", "dissolved": "renamed"},
-        "Yugoslavia": {"country": "Serbia and Montenegro", "date": "2003-02-04", "dissolved": "renamed"},
-        "Serbia and Montenegro": {"country": [
-            "Serbia", "Montenegro"
-        ], "date": "2006-06-05", "dissolved": "split"},
-        "Netherlands Antilles": {"country": [
-            "Bonaire, Sint Eustatius and Saba", "Curaçao", "Sint Maarten"
-        ], "date": "2010-10-10", "dissolved": "split"}
-    },
     "flag": {
         // no flag
         "Antarctica": "Flag of the Antarctic Treaty",
         "Ashmore and Cartier Islands": "Flag of Australia",
+        "Cabinda": "Flag of Cabinda",
         "Canton and Enderbury Islands": "Flag of Gilbert and Ellice Islands",
         "Chilean Antarctic Territory": "Flag of Magallanes, Chile",
         "Coral Sea Islands": "Flag of Australia",
         "Diego Garcia": "Flag of the British Indian Ocean Territory",
+        "Ellice Islands": "Flag of Gilbert and Ellice Islands",
+        "Gilbert Islands": "Flag of Gilbert and Ellice Islands",
         "Gilgit-Baltistan": "Flag of Gilgit-Baltistan United Movement",
         "Heard Island and McDonald Islands": "Flag of Australia",
         "Neutral Zone": "Flag of the United Nations",
@@ -459,13 +364,15 @@
         "Rwenzururu": "Rwenzururu flag.png"
     },
     "flag_link": [
-        // these are dependent or dissolved countrie that share their flag
+        // these are dependent or dissolved countries that share their flag
         // with another country and need to get a symlink to the other flag
         "Adélie Land",
         "Ajman",
         "Canton and Enderbury Islands",
         "Diego Garcia",
+        "Ellice Islands",
         "French Southern and Antarctic Territories",
+        "Gilbert Islands",
         "Ras al-Khaimah"
     ],
     "geocode": {
@@ -496,8 +403,7 @@
         "French Southern Territories": ["Amsterdam Island", "Bassas da India", "Glorioso Islands", "Kerguelen Island"],
         "Fujairah": ["Fujairah Region"],
         "Georgia": ["Georgia, Asia"],
-        // see http://en.wikipedia.org/wiki/Gilbert_Islands
+        "Gilbert and Ellice Islands": ["Gilbert Islands", "Ellice Islands"],
-        "Gilbert and Ellice Islands": ["Arorae, Kiribati", "Butaritari, Kiribati", "Makin, Kiribati", "Tuvalu"],
         // "Jamaica": ["Clarendon Parish, Jamaica", "St. James Parish, Jamaica", "St. Thomas Parish, Jamaica", "Westmoreland Parish, Jamaica"], // in case results are us-biased
         "Jammu and Kashmir": ["Jammu and Kashmir, India"],
         "Johnston Island": ["Johnston Atoll"],
@@ -1034,10 +940,13 @@
         "Biafra",
         "Bophuthatswana",
         "British Honduras",
+        "Cabinda",
+        "Ciskei",
         "Dominion of Ceylon",
         "Dubai",
-        "Ciskei",
+        "Ellice Islands",
         "Fujairah",
+        "Gilbert Islands",
         "Khmer Republic",
         "People's Republic of Kampuchea",
         "Ras al-Khaimah",