Backend: Improve country code detection

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-06-13 07:40:35 +02:00
parent 01717ae6f7
commit eaa1bb7d25
4 changed files with 465 additions and 464 deletions

View file

@ -13,6 +13,7 @@ var DatePathRegexp = regexp.MustCompile("\\D\\d{4}/\\d{1,2}/?\\d*")
var DateTimeRegexp = regexp.MustCompile("\\D\\d{4}[\\-_]\\d{2}[\\-_]\\d{2}.{1,4}\\d{2}\\D\\d{2}\\D\\d{2,}")
var DateIntRegexp = regexp.MustCompile("\\d{1,4}")
var YearRegexp = regexp.MustCompile("\\d{4,5}")
var CountryWordsRegexp = regexp.MustCompile("[\\p{L}]{2,}")
var (
YearMin = 1990
@ -186,12 +187,18 @@ func CountryCode(s string) string {
return "zz"
}
r := strings.NewReplacer("\\", " ", "/", " ", "_", " ", "-", " ")
s = r.Replace(s)
words := strings.Fields(s)
words := CountryWordsRegexp.FindAllString(s, -1)
for _, w := range words {
search := strings.ToLower(strings.Trim(w, ":.,;!?/-_"))
for i, w := range words {
if i < len(words)-1 {
search := strings.ToLower(w + " " + words[i+1])
if code, ok := Countries[search]; ok {
return code
}
}
search := strings.ToLower(w)
if code, ok := Countries[search]; ok {
return code

View file

@ -229,7 +229,27 @@ func TestCountryCode(t *testing.T) {
t.Run("San Francisco", func(t *testing.T) {
result := CountryCode("San Francisco 2019")
assert.Equal(t, "zz", result)
assert.Equal(t, "us", result)
})
t.Run("Los Angeles", func(t *testing.T) {
result := CountryCode("I was in Los Angeles")
assert.Equal(t, "us", result)
})
t.Run("St Gallen", func(t *testing.T) {
result := CountryCode("St.----Gallen")
assert.Equal(t, "ch", result)
})
t.Run("Congo Brazzaville", func(t *testing.T) {
result := CountryCode("Congo Brazzaville")
assert.Equal(t, "cg", result)
})
t.Run("Congo", func(t *testing.T) {
result := CountryCode("Congo")
assert.Equal(t, "cd", result)
})
t.Run("U.S.A.", func(t *testing.T) {

View file

@ -2,437 +2,424 @@
package txt
var Countries = map[string]string{
"andorra": "ad",
"france": "fr",
"frankreich": "fr",
"slovakia": "sk",
"austria": "at",
"wörthersee": "at",
"österreich": "at",
"vienna": "at",
"salzburg": "at",
"klagenfurt": "at",
"innsbruck": "at",
"hungary": "hu",
"republic of georgia": "ge",
"vatican city": "va",
"poland": "pl",
"warsaw": "pl",
"warschau": "pl",
"cambodia": "kh",
"vientiane": "la",
"lao people's democratic republic": "la",
"vietnam": "vn",
"denmark": "dk",
"myanmar": "mm",
"czechia": "cz",
"czech": "cz",
"zurich": "ch",
"zürich": "ch",
"st gallen": "ch",
"st. gallen": "ch",
"basel": "ch",
"lucerne": "ch",
"luzern": "ch",
"switzerland": "ch",
"swiss": "ch",
"schweiz": "ch",
"belgium": "be",
"sweden": "se",
"sverige": "se",
"schweden": "se",
"gotland": "se",
"öland": "se",
"faroe": "fo",
"albania": "al",
"macedonia": "mk",
"montenegro": "me",
"finland": "fi",
"san marino": "sm",
"moldova": "md",
"belarus": "by",
"brazil": "br",
"brasil": "br",
"russia": "ru",
"ukraine": "ua",
"unitedkingdom": "gb",
"london": "gb",
"scotland": "gb",
"edinburgh": "gb",
"england": "gb",
"britain": "gb",
"buckingham": "gb",
"isle of man": "im",
"ireland": "ie",
"dublin": "ie",
"deutschland": "de",
"germany": "de",
"aachen": "de",
"steglitz": "de",
"friedrichshain": "de",
"berghain": "de",
"bundestag": "de",
"grunewald": "de",
"charlottenburg": "de",
"wilmersdorf": "de",
"tempelhof": "de",
"schönefeld": "de",
"reichstag": "de",
"kreuzberg": "de",
"ostsee": "de",
"nordsee": "de",
"wannsee": "de",
"berlin": "de",
"pfalz": "de",
"mannheim": "de",
"heidelberg": "de",
"stuttgart": "de",
"bisingen": "de",
"balingen": "de",
"hechingen": "de",
"swabian": "de",
"schwäbische": "de",
"albtrauf": "de",
"münchen": "de",
"württemberg": "de",
"bayern": "de",
"erfurt": "de",
"leipzig": "de",
"schwerin": "de",
"greifswald": "de",
"dresden": "de",
"nürnberg": "de",
"würzburg": "de",
"munich": "de",
"frankfurt": "de",
"brandenburg": "de",
"hamburg": "de",
"tübingen": "de",
"tubingen": "de",
"köln": "de",
"dortmund": "de",
"düsseldorf": "de",
"cologne": "de",
"saarland": "de",
"saarbrücken": "de",
"latvia": "lv",
"lettland": "lv",
"lithuania": "lt",
"litauen": "lt",
"estonia": "ee",
"australia": "au",
"melbourne": "au",
"perth": "au",
"tasmania": "au",
"tasmanien": "au",
"sydney": "au",
"capetown": "za",
"durban": "za",
"pretoria": "za",
"kapstadt": "za",
"johannesburg": "za",
"south africa": "za",
"republic of south africa": "za",
"eswatini": "sz",
"kingdom of eswatini": "sz",
"swaziland": "sz",
"romania": "ro",
"ecuador": "ec",
"mexico": "mx",
"colombia": "co",
"california": "us",
"washington": "us",
"the white house": "us",
"new york": "us",
"nyc": "us",
"florida": "us",
"cape canaveral": "us",
"san francisco": "us",
"oakland": "us",
"san diego": "us",
"los angeles": "us",
"seattle": "us",
"chicago": "us",
"miami": "us",
"dallas": "us",
"houston": "us",
"las vegas": "us",
"minneapolis": "us",
"kansas": "us",
"wisconsin": "us",
"michigan": "us",
"illinois": "us",
"boston": "us",
"massachusetts": "us",
"connecticut": "us",
"new jersey": "us",
"delaware": "us",
"orlando": "us",
"detroit": "us",
"nevada": "us",
"texas": "us",
"usa": "us",
"u.s.a.": "us",
"u.s.": "us",
"united states": "us",
"mongolia": "mn",
"chile": "cl",
"rwanda": "rw",
"turkey": "tr",
"kyrgyzstan": "kg",
"bhutan": "bt",
"nepal": "np",
"bangladesh": "bd",
"jordan": "jo",
"syria": "sy",
"lebanon": "lb",
"bulgaria": "bg",
"greece": "gr",
"hellas": "gr",
"north korea": "kp",
"democratic people's republic of korea": "kp",
"dprk": "kp",
"dpr korea": "kp",
"algeria": "dz",
"tunisia": "tn",
"libya": "ly",
"mauritania": "mr",
"the gambia": "gm",
"senegal": "sn",
"guinea-bissau": "gw",
"sierra leone": "sl",
"guinea": "gn",
"côte d'ivoire": "ci",
"liberia": "lr",
"ghana": "gh",
"togo": "tg",
"burkina faso": "bf",
"benin": "bj",
"mali": "ml",
"niger": "ne",
"nigeria": "ng",
"sudan": "sd",
"central african republic": "cf",
"equatorial guinea": "gq",
"gabon": "ga",
"congo brazzaville": "cg",
"congo": "cd",
"uganda": "ug",
"kenya": "ke",
"somalia": "so",
"ethiopia": "et",
"djibouti": "dj",
"cameroon": "cm",
"namibia": "na",
"angola": "ao",
"burundi": "bi",
"tanzania": "tz",
"zambia": "zm",
"zimbabwe": "zw",
"rhodesia": "zw",
"mozambique": "mz",
"malawi": "mw",
"uzbekistan": "uz",
"tajikistan": "tj",
"kazakhstan": "kz",
"croatia": "hr",
"slovenia": "si",
"turkmenistan": "tm",
"bolivia": "bo",
"guernsey": "gg",
"china": "cn",
"shanghai": "cn",
"上海市": "cn",
"peking": "cn",
"北京市": "cn",
"beijing": "cn",
"venezuela": "ve",
"virgin island": "vg",
"argentina": "ar",
"argentine": "ar",
"uruguay": "uy",
"paraguay": "py",
"suriname": "sr",
"guyana": "gy",
"nicaragua": "ni",
"costa rica": "cr",
"panama": "pa",
"honduras": "hn",
"belize": "bz",
"peru": "pe",
"portugal": "pt",
"eritrea": "er",
"iceland": "is",
"ísland": "is",
"afghanistan": "af",
"india": "in",
"indien": "in",
"indonesia": "id",
"iraq": "iq",
"irak": "iq",
"iran": "ir",
"persia": "ir",
"yemen": "ye",
"qatar": "qa",
"kuwait": "kw",
"oman": "om",
"east timor": "tl",
"pakistan": "pk",
"saudi arabia": "sa",
"south korea": "kr",
"united arab emirates": "ae",
"emirates": "ae",
"cyprus": "cy",
"dominica": "dm",
"haiti": "ht",
"hayti": "ht",
"cuba": "cu",
"papua new guinea": "pg",
"armenia": "am",
"republic of armenia": "am",
"azerbaijan": "az",
"malta": "mt",
"italy": "it",
"milan": "it",
"mailand": "it",
"neapel": "it",
"palermo": "it",
"genua": "it",
"florenz": "it",
"bologna": "it",
"venezia": "it",
"venedig": "it",
"italien": "it",
"jersey island": "je",
"bailiwick of jersey": "je",
"bahrain": "bh",
"japan": "jp",
"tokyo": "jp",
"東京都": "jp",
"fukushima": "jp",
"nippon": "jp",
"nihon": "jp",
"pilipinas": "ph",
"filipinas": "ph",
"philippines": "ph",
"madagascar": "mg",
"taiwan": "tw",
"taipei": "tw",
"cape verde": "cv",
"comoros": "km",
"mauritius": "mu",
"são tomé": "st",
"príncipe": "st",
"seychelles": "sc",
"seychellen": "sc",
"maldives": "mv",
"singapore": "sg",
"sri lanka": "lk",
"saint kitts": "kn",
"nevis": "kn",
"antigua": "ag",
"barbuda": "ag",
"montserrat": "ms",
"bahamas": "bs",
"turks island": "tc",
"caicos island": "tc",
"barbados": "bb",
"saint vincent": "vc",
"grenada": "gd",
"saint lucia": "lc",
"jamaica": "jm",
"trinidad": "tt",
"tobago": "tt",
"new zealand": "nz",
"kiribati": "ki",
"fiji": "fj",
"bligh island": "fj",
"marshall island": "mh",
"micronesia": "fm",
"nauru": "nr",
"palau": "pw",
"monaco": "mc",
"liechtenstein": "li",
"gibraltar": "gi",
"spain": "es",
"spanien": "es",
"andalusien": "es",
"andalusia": "es",
"canarias": "es",
"granada": "es",
"madrid": "es",
"barcelona": "es",
"córdoba": "es",
"seville": "es",
"málaga": "es",
"bilbao": "es",
"valencia": "es",
"españa": "es",
"espana": "es",
"canada": "ca",
"kanada": "ca",
"vancouver": "ca",
"british columbia": "ca",
"montreal": "ca",
"toronto": "ca",
"ottawa": "ca",
"quebec": "ca",
"ontario": "ca",
"alberta": "ca",
"niagara falls": "ca",
"israel": "il",
"state of israel": "il",
"holy land": "il",
"egypt": "eg",
"ägypten": "eg",
"aegypten": "eg",
"el salvador": "sv",
"guatemala": "gt",
"niue": "nu",
"south sudan": "ss",
"serbia": "rs",
"solomon island": "sb",
"samoa": "ws",
"gaborone": "bw",
"botswana": "bw",
"botsuana": "bw",
"saint helena": "sh",
"ascension": "sh",
"tristan da cunha": "sh",
"south sandwich island": "gs",
"bermuda": "bm",
"british indian ocean": "io",
"british indian territory": "io",
"thailand": "th",
"kosovo": "xk",
"lesotho": "ls",
"brunei": "bn",
"malaysia": "my",
"luxembourg": "lu",
"anguilla": "ai",
"vanuatu": "vu",
"tuvalu": "tv",
"greenland": "gl",
"cook island": "ck",
"cayman island": "ky",
"falkland island": "fk",
"pitcairn island": "pn",
"tokelau": "tk",
"tonga": "to",
"réunion": "fr",
"strassburg": "fr",
"strasbourg": "fr",
"straßburg": "fr",
"paris": "fr",
"netherlands": "nl",
"holland": "nl",
"chad": "td",
"bosnia": "ba",
"herzegovina": "ba",
"norway": "no",
"norwegen": "no",
"morocco": "ma",
"palestine": "ps",
"mcdonald island": "hm",
"heard island": "hm",
"andorra": "ad",
"france": "fr",
"frankreich": "fr",
"slovakia": "sk",
"austria": "at",
"wörthersee": "at",
"österreich": "at",
"vienna": "at",
"salzburg": "at",
"klagenfurt": "at",
"innsbruck": "at",
"hungary": "hu",
"georgia republic": "ge",
"vatican city": "va",
"poland": "pl",
"warsaw": "pl",
"warschau": "pl",
"cambodia": "kh",
"vientiane": "la",
"lao republic": "la",
"vietnam": "vn",
"denmark": "dk",
"myanmar": "mm",
"czechia": "cz",
"czech": "cz",
"zurich": "ch",
"zürich": "ch",
"st gallen": "ch",
"basel": "ch",
"lucerne": "ch",
"luzern": "ch",
"switzerland": "ch",
"swiss": "ch",
"schweiz": "ch",
"belgium": "be",
"sweden": "se",
"sverige": "se",
"schweden": "se",
"gotland": "se",
"öland": "se",
"faroe": "fo",
"albania": "al",
"macedonia": "mk",
"montenegro": "me",
"finland": "fi",
"san marino": "sm",
"moldova": "md",
"belarus": "by",
"brazil": "br",
"brasil": "br",
"russia": "ru",
"ukraine": "ua",
"united kingdom": "gb",
"london": "gb",
"scotland": "gb",
"edinburgh": "gb",
"england": "gb",
"britain": "gb",
"buckingham": "gb",
"isle of man": "im",
"ireland": "ie",
"dublin": "ie",
"deutschland": "de",
"germany": "de",
"aachen": "de",
"steglitz": "de",
"friedrichshain": "de",
"berghain": "de",
"bundestag": "de",
"grunewald": "de",
"charlottenburg": "de",
"wilmersdorf": "de",
"tempelhof": "de",
"schönefeld": "de",
"reichstag": "de",
"kreuzberg": "de",
"ostsee": "de",
"nordsee": "de",
"wannsee": "de",
"berlin": "de",
"pfalz": "de",
"mannheim": "de",
"heidelberg": "de",
"stuttgart": "de",
"bisingen": "de",
"balingen": "de",
"hechingen": "de",
"swabian": "de",
"schwäbische": "de",
"albtrauf": "de",
"münchen": "de",
"württemberg": "de",
"bayern": "de",
"erfurt": "de",
"leipzig": "de",
"schwerin": "de",
"greifswald": "de",
"dresden": "de",
"nürnberg": "de",
"würzburg": "de",
"munich": "de",
"frankfurt": "de",
"brandenburg": "de",
"hamburg": "de",
"tübingen": "de",
"tubingen": "de",
"köln": "de",
"dortmund": "de",
"düsseldorf": "de",
"cologne": "de",
"saarland": "de",
"saarbrücken": "de",
"latvia": "lv",
"lettland": "lv",
"lithuania": "lt",
"litauen": "lt",
"estonia": "ee",
"australia": "au",
"melbourne": "au",
"perth": "au",
"tasmania": "au",
"tasmanien": "au",
"sydney": "au",
"capetown": "za",
"durban": "za",
"pretoria": "za",
"kapstadt": "za",
"johannesburg": "za",
"south africa": "za",
"eswatini": "sz",
"swaziland": "sz",
"romania": "ro",
"ecuador": "ec",
"mexico": "mx",
"colombia": "co",
"california": "us",
"washington": "us",
"new york": "us",
"nyc": "us",
"florida": "us",
"cape canaveral": "us",
"san francisco": "us",
"oakland": "us",
"san diego": "us",
"los angeles": "us",
"seattle": "us",
"chicago": "us",
"miami": "us",
"dallas": "us",
"houston": "us",
"las vegas": "us",
"minneapolis": "us",
"kansas": "us",
"wisconsin": "us",
"michigan": "us",
"illinois": "us",
"boston": "us",
"massachusetts": "us",
"connecticut": "us",
"new jersey": "us",
"delaware": "us",
"orlando": "us",
"detroit": "us",
"nevada": "us",
"texas": "us",
"usa": "us",
"united states": "us",
"mongolia": "mn",
"chile": "cl",
"rwanda": "rw",
"turkey": "tr",
"kyrgyzstan": "kg",
"bhutan": "bt",
"nepal": "np",
"bangladesh": "bd",
"jordan": "jo",
"syria": "sy",
"lebanon": "lb",
"bulgaria": "bg",
"greece": "gr",
"hellas": "gr",
"north korea": "kp",
"dprk": "kp",
"dpr korea": "kp",
"algeria": "dz",
"tunisia": "tn",
"libya": "ly",
"mauritania": "mr",
"gambia": "gm",
"senegal": "sn",
"guinea bissau": "gw",
"sierra leone": "sl",
"guinea": "gn",
"ivory coast": "ci",
"liberia": "lr",
"ghana": "gh",
"togo": "tg",
"burkina faso": "bf",
"benin": "bj",
"mali": "ml",
"niger": "ne",
"nigeria": "ng",
"sudan": "sd",
"central african": "cf",
"equatorial guinea": "gq",
"gabon": "ga",
"congo brazzaville": "cg",
"congo": "cd",
"uganda": "ug",
"kenya": "ke",
"somalia": "so",
"ethiopia": "et",
"djibouti": "dj",
"cameroon": "cm",
"namibia": "na",
"angola": "ao",
"burundi": "bi",
"tanzania": "tz",
"zambia": "zm",
"zimbabwe": "zw",
"rhodesia": "zw",
"mozambique": "mz",
"malawi": "mw",
"uzbekistan": "uz",
"tajikistan": "tj",
"kazakhstan": "kz",
"croatia": "hr",
"slovenia": "si",
"turkmenistan": "tm",
"bolivia": "bo",
"guernsey": "gg",
"china": "cn",
"shanghai": "cn",
"上海市": "cn",
"peking": "cn",
"北京市": "cn",
"beijing": "cn",
"venezuela": "ve",
"virgin island": "vg",
"argentina": "ar",
"argentine": "ar",
"uruguay": "uy",
"paraguay": "py",
"suriname": "sr",
"guyana": "gy",
"nicaragua": "ni",
"costa rica": "cr",
"panama": "pa",
"honduras": "hn",
"belize": "bz",
"peru": "pe",
"portugal": "pt",
"eritrea": "er",
"iceland": "is",
"ísland": "is",
"afghanistan": "af",
"india": "in",
"indien": "in",
"indonesia": "id",
"iraq": "iq",
"irak": "iq",
"iran": "ir",
"persia": "ir",
"yemen": "ye",
"qatar": "qa",
"kuwait": "kw",
"oman": "om",
"east timor": "tl",
"pakistan": "pk",
"saudi arabia": "sa",
"south korea": "kr",
"united arab": "ae",
"uae": "ae",
"cyprus": "cy",
"dominica": "dm",
"haiti": "ht",
"hayti": "ht",
"cuba": "cu",
"new guinea": "pg",
"armenia": "am",
"azerbaijan": "az",
"malta": "mt",
"italy": "it",
"milan": "it",
"mailand": "it",
"neapel": "it",
"palermo": "it",
"genua": "it",
"florenz": "it",
"bologna": "it",
"venezia": "it",
"venedig": "it",
"italien": "it",
"jersey island": "je",
"bahrain": "bh",
"japan": "jp",
"tokyo": "jp",
"東京都": "jp",
"fukushima": "jp",
"nippon": "jp",
"nihon": "jp",
"pilipinas": "ph",
"filipinas": "ph",
"philippines": "ph",
"madagascar": "mg",
"taiwan": "tw",
"taipei": "tw",
"cape verde": "cv",
"comoros": "km",
"mauritius": "mu",
"são tomé": "st",
"príncipe": "st",
"seychelles": "sc",
"seychellen": "sc",
"maldives": "mv",
"singapore": "sg",
"sri lanka": "lk",
"saint kitts": "kn",
"nevis": "kn",
"antigua": "ag",
"barbuda": "ag",
"montserrat": "ms",
"bahamas": "bs",
"turks island": "tc",
"caicos island": "tc",
"barbados": "bb",
"saint vincent": "vc",
"grenada": "gd",
"saint lucia": "lc",
"jamaica": "jm",
"trinidad": "tt",
"tobago": "tt",
"new zealand": "nz",
"kiribati": "ki",
"fiji": "fj",
"bligh island": "fj",
"marshall island": "mh",
"micronesia": "fm",
"nauru": "nr",
"palau": "pw",
"monaco": "mc",
"liechtenstein": "li",
"gibraltar": "gi",
"spain": "es",
"spanien": "es",
"andalusien": "es",
"andalusia": "es",
"canarias": "es",
"granada": "es",
"madrid": "es",
"barcelona": "es",
"córdoba": "es",
"seville": "es",
"málaga": "es",
"bilbao": "es",
"valencia": "es",
"españa": "es",
"espana": "es",
"canada": "ca",
"kanada": "ca",
"vancouver": "ca",
"british columbia": "ca",
"montreal": "ca",
"toronto": "ca",
"ottawa": "ca",
"quebec": "ca",
"ontario": "ca",
"alberta": "ca",
"niagara falls": "ca",
"israel": "il",
"holy land": "il",
"egypt": "eg",
"ägypten": "eg",
"aegypten": "eg",
"el salvador": "sv",
"guatemala": "gt",
"niue": "nu",
"south sudan": "ss",
"serbia": "rs",
"solomon island": "sb",
"samoa": "ws",
"gaborone": "bw",
"botswana": "bw",
"botsuana": "bw",
"saint helena": "sh",
"sandwich island": "gs",
"bermuda": "bm",
"british indian": "io",
"thailand": "th",
"kosovo": "xk",
"lesotho": "ls",
"brunei": "bn",
"malaysia": "my",
"luxembourg": "lu",
"anguilla": "ai",
"vanuatu": "vu",
"tuvalu": "tv",
"greenland": "gl",
"cook island": "ck",
"cayman island": "ky",
"falkland island": "fk",
"pitcairn island": "pn",
"tokelau": "tk",
"tonga": "to",
"réunion": "fr",
"strassburg": "fr",
"strasbourg": "fr",
"straßburg": "fr",
"paris": "fr",
"netherlands": "nl",
"holland": "nl",
"chad": "td",
"bosnia": "ba",
"herzegovina": "ba",
"norway": "no",
"norwegen": "no",
"morocco": "ma",
"palestine": "ps",
"mcdonald island": "hm",
"heard island": "hm",
}

View file

@ -10,14 +10,14 @@ AT:Salzburg
AT:Klagenfurt
AT:Innsbruck
HU:Hungary
GE:Republic of Georgia
GE:Georgia Republic
VA:Vatican City
PL:Poland
PL:Warsaw
PL:Warschau
KH:Cambodia
LA:Vientiane
LA:Lao People's Democratic Republic
LA:Lao Republic
VN:Vietnam
DK:Denmark
MM:Myanmar
@ -26,7 +26,6 @@ CZ:Czech
CH:Zurich
CH:Zürich
CH:St Gallen
CH:St. Gallen
CH:Basel
CH:Lucerne
CH:Luzern
@ -51,7 +50,7 @@ BR:Brazil
BR:Brasil
RU:Russia
UA:Ukraine
GB:UnitedKingdom
GB:United Kingdom
GB:London
GB:Scotland
GB:Edinburgh
@ -128,9 +127,7 @@ ZA:Pretoria
ZA:Kapstadt
ZA:Johannesburg
ZA:South Africa
ZA:Republic of South Africa
SZ:Eswatini
SZ:Kingdom of Eswatini
SZ:Swaziland
RO:Romania
EC:Ecuador
@ -138,7 +135,6 @@ MX:Mexico
CO:Colombia
US:California
US:Washington
US:The White House
US:New York
US:NYC
US:Florida
@ -168,8 +164,6 @@ US:Detroit
US:Nevada
US:Texas
US:USA
US:U.S.A.
US:U.S.
US:United States
MN:Mongolia
CL:Chile
@ -186,19 +180,18 @@ BG:Bulgaria
GR:Greece
GR:Hellas
KP:North Korea
KP:Democratic People's Republic of Korea
KP:DPRK
KP:DPR Korea
DZ:Algeria
TN:Tunisia
LY:Libya
MR:Mauritania
GM:The Gambia
GM:Gambia
SN:Senegal
GW:Guinea-Bissau
GW:Guinea Bissau
SL:Sierra Leone
GN:Guinea
CI:Côte d'Ivoire
CI:Ivory Coast
LR:Liberia
GH:Ghana
TG:Togo
@ -208,7 +201,7 @@ ML:Mali
NE:Niger
NG:Nigeria
SD:Sudan
CF:Central African Republic
CF:Central African
GQ:Equatorial Guinea
GA:Gabon
CG:Congo Brazzaville
@ -276,16 +269,15 @@ TL:East Timor
PK:Pakistan
SA:Saudi Arabia
KR:South Korea
AE:United Arab Emirates
AE:Emirates
AE:United Arab
AE:UAE
CY:Cyprus
DM:Dominica
HT:Haiti
HT:Hayti
CU:Cuba
PG:Papua New Guinea
PG:New Guinea
AM:Armenia
AM:Republic of Armenia
AZ:Azerbaijan
MT:Malta
IT:Italy
@ -300,7 +292,6 @@ IT:Venezia
IT:Venedig
IT:Italien
JE:Jersey Island
JE:Bailiwick of Jersey
BH:Bahrain
JP:Japan
JP:Tokyo
@ -377,7 +368,6 @@ CA:Ontario
CA:Alberta
CA:Niagara Falls
IL:Israel
IL:State of Israel
IL:Holy Land
EG:Egypt
EG:Ägypten
@ -393,12 +383,9 @@ BW:Gaborone
BW:Botswana
BW:Botsuana
SH:Saint Helena
SH:Ascension
SH:Tristan da Cunha
GS:South Sandwich Island
GS:Sandwich Island
BM:Bermuda
IO:British Indian Ocean
IO:British Indian Territory
IO:British Indian
TH:Thailand
XK:Kosovo
LS:Lesotho