Metadata: Remove ambiguous location names from countries.go

Signed-off-by: Michael Mayer <michael@photoprism.app>

pkg/txt/countries.go

@@ -12,7 +12,6 @@ var Countries = map[string]string{
 	"hallstatt":          "at",
 	"wörthersee":         "at",
 	"österreich":         "at",
-	"vienna":             "at",
 	"wien":               "at",
 	"salzburg":           "at",
 	"sölden":             "at",
@@ -65,7 +64,6 @@ var Countries = map[string]string{
 	"russia":             "ru",
 	"ukraine":            "ua",
 	"united kingdom":     "gb",
-	"london":             "gb",
 	"scotland":           "gb",
 	"edinburgh":          "gb",
 	"england":            "gb",
@@ -184,7 +182,6 @@ var Countries = map[string]string{
 	"perth":              "au",
 	"tasmania":           "au",
 	"tasmanien":          "au",
-	"sydney":             "au",
 	"capetown":           "za",
 	"durban":             "za",
 	"pretoria":           "za",
@@ -210,8 +207,6 @@ var Countries = map[string]string{
 	"seattle":            "us",
 	"chicago":            "us",
 	"miami":              "us",
-	"dallas":             "us",
-	"houston":            "us",
 	"las vegas":          "us",
 	"minneapolis":        "us",
 	"kansas":             "us",
@@ -223,7 +218,6 @@ var Countries = map[string]string{
 	"connecticut":        "us",
 	"new jersey":         "us",
 	"delaware":           "us",
-	"orlando":            "us",
 	"detroit":            "us",
 	"nevada":             "us",
 	"texas":              "us",
@@ -256,7 +250,6 @@ var Countries = map[string]string{
 	"dhaka":              "bd",
 	"chattogram":         "bd",
 	"khulna":             "bd",
-	"jordan":             "jo",
 	"amman":              "jo",
 	"عَمَّان":            "jo",
 	"zarqa":              "jo",
@@ -320,7 +313,6 @@ var Countries = map[string]string{
 	"baalbeck":           "lb",
 	"بعلبك":              "lb",
 	"quobeiyat":          "lb",
-	"rafic hariri":       "lb",
 	"kafarkila":          "lb",
 	"kfarkila":           "lb",
 	"kfarkela":           "lb",
@@ -338,7 +330,6 @@ var Countries = map[string]string{
 	"bulgaria":           "bg",
 	"koprivshtitsa":      "bg",
 	"melnik":             "bg",
-	"sofia":              "bg",
 	"corfu":              "gr",
 	"greece":             "gr",
 	"hellas":             "gr",
@@ -504,8 +495,6 @@ var Countries = map[string]string{
 	"persia":             "ir",
 	"yemen":              "ye",
 	"اليمن":              "ye",
-	"sana'a":             "ye",
-	"sanaa":              "ye",
 	"سناء":               "ye",
 	"al hudaydah":        "ye",
 	"hodeda":             "ye",
@@ -523,8 +512,6 @@ var Countries = map[string]string{
 	"pakistan":           "pk",
 	"islamabad":          "pk",
 	"saudi arabia":       "sa",
-	"riad":               "sa",
-	"riyadh":             "sa",
 	"الرياض":             "sa",
 	"south korea":        "kr",
 	"seoul":              "kr",
@@ -573,7 +560,6 @@ var Countries = map[string]string{
 	"como":               "it",
 	"cortina d'ampezzo":  "it",
 	"italy":              "it",
-	"milan":              "it",
 	"milano":             "it",
 	"mailand":            "it",
 	"neapel":             "it",
@@ -583,7 +569,6 @@ var Countries = map[string]string{
 	"bologna":            "it",
 	"venezia":            "it",
 	"venedig":            "it",
-	"venice":             "it",
 	"italien":            "it",
 	"sicily":             "it",
 	"trieste":            "it",
@@ -624,7 +609,6 @@ var Countries = map[string]string{
 	"grenada":            "gd",
 	"saint lucia":        "lc",
 	"jamaica":            "jm",
-	"trinidad":           "tt",
 	"tobago":             "tt",
 	"new zealand":        "nz",
 	"kiribati":           "ki",
@@ -649,7 +633,6 @@ var Countries = map[string]string{
 	"seville":            "es",
 	"málaga":             "es",
 	"bilbao":             "es",
-	"valencia":           "es",
 	"españa":             "es",
 	"espana":             "es",
 	"canada":             "ca",
@@ -661,7 +644,6 @@ var Countries = map[string]string{
 	"ottawa":             "ca",
 	"quebec":             "ca",
 	"ontario":            "ca",
-	"alberta":            "ca",
 	"israel":             "il",
 	"israeli":            "il",
 	"israelis":           "il",
@@ -670,11 +652,9 @@ var Countries = map[string]string{
 	"yisrael":            "il",
 	"tel aviv":           "il",
 	"תֵּל אָבִיב-יָפוֹ":  "il",
-	"ben gurion":         "il",
 	"caesarea":           "il",
 	"netanya":            "il",
 	"קֵיסָרְיָה":         "il",
-	"haifa":              "il",
 	"חֵיפָה":             "il",
 	"bethlehem":          "il",
 	"بيت لحم":            "il",
@@ -748,7 +728,6 @@ var Countries = map[string]string{
 	"strassburg":         "fr",
 	"strasbourg":         "fr",
 	"straßburg":          "fr",
-	"paris":              "fr",
 	"amsterdam":          "nl",
 	"rotterdam":          "nl",
 	"den haag":           "nl",
@@ -762,7 +741,6 @@ var Countries = map[string]string{
 	"nederlands":         "nl",
 	"nederlanden":        "nl",
 	"holland":            "nl",
-	"chad":               "td",
 	"bosnia":             "ba",
 	"herzegovina":        "ba",
 	"norway":             "no",
@@ -784,7 +762,6 @@ var Countries = map[string]string{
 	"al-aqsa":            "ps",
 	"المسجد":             "ps",
 	"west bank":          "ps",
-	"samaria":            "ps",
 	"judea":              "ps",
 	"nablus":             "ps",
 	"rafah":              "ps",

pkg/txt/country.go

@@ -9,7 +9,7 @@ var UnknownStateCode = "zz"
 var UnknownCountryCode = "zz"
 var CountryWordsRegexp = regexp.MustCompile("[\\p{L}]{2,}")
 
-// CountryCode tries to find a matching country code for a given string e.g. from a file or directory name.
+// CountryCode attempts to find a matching country code for a given string.
 func CountryCode(s string) (code string) {
 	code = UnknownCountryCode
 

pkg/txt/resources/countries.txt

@@ -7,7 +7,6 @@ AT:Austria
 AT:Hallstatt
 AT:Wörthersee
 AT:Österreich
-AT:Vienna
 AT:Wien
 AT:Salzburg
 AT:Sölden
@@ -60,7 +59,6 @@ BR:Brasil
 RU:Russia
 UA:Ukraine
 GB:United Kingdom
-GB:London
 GB:Scotland
 GB:Edinburgh
 GB:England
@@ -179,7 +177,6 @@ AU:Melbourne
 AU:Perth
 AU:Tasmania
 AU:Tasmanien
-AU:Sydney
 ZA:Capetown
 ZA:Durban
 ZA:Pretoria
@@ -205,8 +202,6 @@ US:Los Angeles
 US:Seattle
 US:Chicago
 US:Miami
-US:Dallas
-US:Houston
 US:Las Vegas
 US:Minneapolis
 US:Kansas
@@ -218,7 +213,6 @@ US:Massachusetts
 US:Connecticut
 US:New Jersey
 US:Delaware
-US:Orlando
 US:Detroit
 US:Nevada
 US:Texas
@@ -251,7 +245,6 @@ BD:Bangladesh
 BD:Dhaka
 BD:Chattogram
 BD:Khulna
-JO:Jordan
 JO:Amman
 JO:عَمَّان
 JO:Zarqa
@@ -315,7 +308,6 @@ LB:Baalbek
 LB:Baalbeck
 LB:بعلبك
 LB:Quobeiyat
-LB:Rafic Hariri
 LB:Kafarkila
 LB:Kfarkila
 LB:Kfarkela
@@ -333,7 +325,6 @@ LB:صُور
 BG:Bulgaria
 BG:Koprivshtitsa
 BG:Melnik
-BG:Sofia
 GR:Corfu
 GR:Greece
 GR:Hellas
@@ -499,8 +490,6 @@ IR:Mashhad
 IR:Persia
 YE:Yemen
 YE:اليمن
-YE:Sana'a
-YE:Sanaa
 YE:سناء
 YE:Al Hudaydah
 YE:Hodeda
@@ -518,8 +507,6 @@ TL:East Timor
 PK:Pakistan
 PK:Islamabad
 SA:Saudi Arabia
-SA:Riad
-SA:Riyadh
 SA:الرياض
 KR:South Korea
 KR:Seoul
@@ -568,7 +555,6 @@ MT:Valletta
 IT:Como
 IT:Cortina d'Ampezzo
 IT:Italy
-IT:Milan
 IT:Milano
 IT:Mailand
 IT:Neapel
@@ -578,7 +564,6 @@ IT:Florenz
 IT:Bologna
 IT:Venezia
 IT:Venedig
-IT:Venice
 IT:Italien
 IT:Sicily
 IT:Trieste
@@ -619,7 +604,6 @@ VC:Saint Vincent
 GD:Grenada
 LC:Saint Lucia
 JM:Jamaica
-TT:Trinidad
 TT:Tobago
 NZ:New Zealand
 KI:Kiribati
@@ -644,7 +628,6 @@ ES:Córdoba
 ES:Seville
 ES:Málaga
 ES:Bilbao
-ES:Valencia
 ES:España
 ES:Espana
 CA:Canada
@@ -656,7 +639,6 @@ CA:Toronto
 CA:Ottawa
 CA:Quebec
 CA:Ontario
-CA:Alberta
 IL:Israel
 IL:Israeli
 IL:Israelis
@@ -665,11 +647,9 @@ IL:Yisra'el
 IL:Yisrael
 IL:Tel Aviv
 IL:תֵּל אָבִיב-יָפוֹ
-IL:Ben Gurion
 IL:Caesarea
 IL:Netanya
 IL:קֵיסָרְיָה
-IL:Haifa
 IL:חֵיפָה
 IL:Bethlehem
 IL:بيت لحم
@@ -743,7 +723,6 @@ FR:Réunion
 FR:Strassburg
 FR:Strasbourg
 FR:Straßburg
-FR:Paris
 NL:Amsterdam
 NL:Rotterdam
 NL:Den Haag
@@ -757,7 +736,6 @@ NL:Nederland
 NL:Nederlands
 NL:Nederlanden
 NL:Holland
-TD:Chad
 BA:Bosnia
 BA:Herzegovina
 NO:Norway
@@ -779,7 +757,6 @@ PS:جنين
 PS:Al-Aqsa
 PS:المسجد
 PS:West Bank
-PS:Samaria
 PS:Judea
 PS:Nablus
 PS:Rafah