Compare commits

...

2 Commits

Author SHA1 Message Date
fgerber
72b2148e4b Change some country names 2024-04-07 22:21:08 +02:00
fgerber
513660b3a4 Reorganize countries in 'Others' group 2024-04-07 22:04:33 +02:00
3 changed files with 38 additions and 41 deletions

View File

@ -170,7 +170,7 @@ ARG_SL|ARG|San Luis|76041
ARG_SC|ARG|Santa Cruz|242689
ARG_SF|ARG|Santa Fe|133534
ARG_SE|ARG|Santiagodel Estero|137431
ARG_TF|ARG|Tierradel Fuego|20841
ARG_TF|ARG|Tierra del Fuego|20841
ARG_TM|ARG|Tucumán|22628
ARM_AG|ARM|Aragatsotn|2884
ARM_AR|ARM|Ararat|2227
@ -291,7 +291,7 @@ BMU_HC|BMU|Hamilton Municipality|1
BMU_PA|BMU|Paget|6
BMU_PE|BMU|Pembroke|7
BMU_SC|BMU|Saint George's|10
BMU_SG|BMU|Saint Georgemunicipality|2
BMU_SG|BMU|Saint George municipality|2
BMU_SA|BMU|Sandys|9
BMU_SM|BMU|Smiths|5
BMU_SO|BMU|Southampton|6
@ -499,7 +499,7 @@ CPV_CT|CPV|Santa Catarinado Fogo|55
CPV_CZ|CPV|Santa Cruz|116
CPV_SD|CPV|São Domingos|159
CPV_FP|CPV|São Filipe|340
CPV_LO|CPV|São Lourençodos Órgãos|36
CPV_LO|CPV|São Lourenço dos Órgãos|36
CPV_SM|CPV|São Miguel|81
CPV_SS|CPV|São Salvadordo Mundo|31
CPV_SV|CPV|São Vicente|271
@ -555,7 +555,7 @@ CHL_AN|CHL|Antofagasta|126678
CHL_AR|CHL|Araucanía|31844
CHL_AP|CHL|Aricay Parinacota|16931
CHL_AT|CHL|Atacama|75995
CHL_AI|CHL|Ayséndel General Ibañezdel Cam|106476
CHL_AI|CHL|Ayséndel General Ibañez del Cam|106476
CHL_BI|CHL|Bío-Bío|24032
CHL_CO|CHL|Coquimbo|40711
CHL_LI|CHL|Libertador General Bernardo O'Hi|16389
@ -626,11 +626,11 @@ COL_NS|COL|Norte de Santander|22077
COL_PU|COL|Putumayo|26063
COL_QD|COL|Quindío|1947
COL_RI|COL|Risaralda|3562
COL_SA|COL|San Andrésy Providencia|52
COL_SA|COL|San Andrés y Providencia|52
COL_ST|COL|Santander|30788
COL_SU|COL|Sucre|10787
COL_TO|COL|Tolima|24131
COL_VC|COL|Valledel Cauca|21034
COL_VC|COL|Valle del Cauca|21034
COL_VP|COL|Vaupés|53546
COL_VD|COL|Vichada|100014
COM_MO|COM|Mwali|220
@ -812,7 +812,7 @@ ECU_OR|ECU|Orellana|21738
ECU_PA|ECU|Pastaza|29671
ECU_PI|ECU|Pichincha|9512
ECU_SE|ECU|Santa Elena|3720
ECU_SD|ECU|Santo Domingodelos Tsachilas|3803
ECU_SD|ECU|Santo Domingo de los Tsachilas|3803
ECU_SU|ECU|Sucumbios|18069
ECU_TU|ECU|Tungurahua|3405
ECU_ZC|ECU|Zamora Chinchipe|10605
@ -924,17 +924,17 @@ FRA_IF|FRA|Île-de-France|12058
FRA_ND|FRA|Normandie|30143
FRA_AC|FRA|Nouvelle-Aquitaine|84800
FRA_LP|FRA|Occitanie|73302
FRA_PL|FRA|Paysdela Loire|32365
FRA_PR|FRA|Provence-Alpes-Côted'Azur|31952
FRA_PL|FRA|Pays de la Loire|32365
FRA_PR|FRA|Provence-Alpes-Côte d'Azur|31952
GUF_CY|GUF|Cayenne|42886
GUF_SL|GUF|Saint-Laurent-du-Maroni|40970
PYF_TI|PYF|Îles Australes|373
PYF_WI|PYF|Îlesdu Vent|1216
PYF_WI|PYF|Îles du Vent|1216
PYF_MI|PYF|Îles Marquises|996
PYF_LI|PYF|Îles Sous-le-Vent|429
PYF_TG|PYF|Îles Tuamotu-Gambier|1039
ATF_CR|ATF|Îles Crozet|372
ATF_NA|ATF|ÎlesÉparses|44
ATF_NA|ATF|Îles Éparses|44
ATF_AS|ATF|Îles Saint Paulet Amsterdam|64
ATF_KG|ATF|Kerguelen|7372
GAB_ES|GAB|Estuaire|20024
@ -1896,7 +1896,7 @@ MAR_FB|MAR|Fès-Boulemane|19366
MAR_GB|MAR|Gharb-Chrarda-Béni Hssen|8782
MAR_GC|MAR|Grand Casablanca|879
MAR_GE|MAR|Guelmim-Es-Semara|64701
MAR_LB|MAR|Laâyoune-Boujdour-Sakia El H|5763
MAR_LB|MAR|Laâyoune-Boujdour-Sakia El Hamra|5763
MAR_MK|MAR|Marrakech-Tensift-Al Haouz|32483
MAR_MT|MAR|Meknès-Tafilalet|60303
MAR_OR|MAR|Oriental|59914
@ -2131,7 +2131,7 @@ PLW_NW|PLW|Ngiwal|18
PLW_SO|PLW|Sonsorol|3
PSE_GZ|PSE|Gaza|344
PSE_WE|PSE|West Bank|5895
PAN_BC|PAN|Bocasdel Toro|4718
PAN_BC|PAN|Bocas del Toro|4718
PAN_CH|PAN|Chiriquí|6676
PAN_CC|PAN|Coclé|4939
PAN_CL|PAN|Colón|4711
@ -3295,7 +3295,7 @@ ARE_UQ|ARE|Ummal-Qaywayn|746
GBR_NIR|GBR|Northern Ireland|14134
GBR_SCT|GBR|Scotland|78704
GBR_WLS|GBR|Wales|20818
GBR_NA|GBR|NA|130659
GBR_NA|GBR|England|130659
USA_AL|USA|Alabama|133995
USA_AK|USA|Alaska|1501231
USA_AZ|USA|Arizona|296082
@ -3532,4 +3532,3 @@ Z05_UT|IND|Uttarakhand|259
Z09_UT|IND|Uttarakhand|987
Z06_JK|PAK|Azad Kashmir|13931
Z06_NA|PAK|Gilgit-Baltistan|68053
GBR_NA|GBR|England|417

View File

@ -8,8 +8,6 @@ enum class Country(
HKG("Hong Kong", 1104),
MAC("Macao", 32),
ANT("Netherlands Antilles", 800),
AFG("Afghanistan", 645487),
XAD("Akrotiri and Dhekelia", 234),
ALA("Åland", 1483),
@ -217,7 +215,7 @@ enum class Country(
SLB("Solomon Islands", 28686),
SOM("Somalia", 637672),
ZAF("South Africa", 1224059),
SGS("South Georgia and the South Sand", 4085),
SGS("South Georgia and the South Sandwich Islands", 4085),
KOR("South Korea", 100721),
SSD("South Sudan", 632186),
ESP("Spain", 506617),
@ -248,7 +246,7 @@ enum class Country(
ARE("United Arab Emirates", 71429),
GBR("United Kingdom", 244732),
USA("United States", 9477483),
UMI("United States Minor Outlying Isl", 47),
UMI("United States Minor Outlying Islands", 47),
URY("Uruguay", 178103),
UZB("Uzbekistan", 447894),
VUT("Vanuatu", 12384),

View File

@ -6,6 +6,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
EEE(
"Europe", listOf(
XAD,
ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
ALB,
AND,
AUT,
@ -18,14 +20,19 @@ enum class Group(override val fullName: String, override val children: List<GeoL
CZE,
DNK,
EST,
FRO, // Faroe Islands: an autonomous region of Denmark
FIN,
FRA,
DEU,
GIB, // Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
GRC,
GGY, // Guernsey: a British Crown dependency in the English Channel
HUN,
ISL,
IRL,
IMN, // Isle of Man: a British Crown dependency located in the Irish Sea
ITA,
JEY, // Jersey: a British Crown dependency located in the English Channel
KAZ,
XKO,
LVA,
@ -48,12 +55,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
SVK,
SVN,
ESP,
SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
SWE,
CHE,
UKR,
GBR,
VAT,
XAD,
)
),
ABB(
@ -64,9 +71,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
BHR,
BGD,
BTN,
IOT, // British Indian Ocean Territory: a British overseas territory in the Indian Ocean
BRN,
KHM,
CCK, // Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
CHN,
CXR, // Christmas Island: an Australian external territory in the Indian Ocean
GEO,
HKG,
IND,
@ -131,8 +141,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
EGY,
GNQ,
ERI,
SWZ,
ETH,
ATF, // French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
GAB,
GMB,
GHA,
@ -165,6 +175,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
SSD,
SHN,
SDN,
SWZ,
TZA,
TGO,
TUN,
@ -184,9 +195,11 @@ enum class Group(override val fullName: String, override val children: List<GeoL
BRB,
BLZ,
BMU,
BES, // Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
VGB,
CAN,
CYM,
XCL,
CRI,
CUB,
CUW,
@ -208,15 +221,18 @@ enum class Group(override val fullName: String, override val children: List<GeoL
NIC,
PAN,
PRI,
BLM, // Saint Barthélemy: an overseas collectivity of France in the Caribbean
KNA,
LCA,
MAF,
SPM,
VCT,
SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
TTO,
TCA,
USA,
XCL,
UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
)
),
SRR(
@ -257,6 +273,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
PLW,
PNG,
PCN,
WSM, // Samoa: an independent island nation in the South Pacific
SLB,
TKL,
TON,
@ -269,26 +286,9 @@ enum class Group(override val fullName: String, override val children: List<GeoL
XXX(
"Others", listOf(
ATA, // Antarctica: not in any other region
ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
BES,// Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
BVT,// Bouvet Island: an uninhabited territory of Norway in the South Atlantic
IOT,// British Indian Ocean Territory: a British overseas territory in the Indian Ocean
CXR,// Christmas Island: an Australian external territory in the Indian Ocean
CCK,// Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
FRO,// Faroe Islands: an autonomous region of Denmark
ATF,// French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
GIB,// Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
GGY,// Guernsey: a British Crown dependency in the English Channel
HMD,// Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
IMN,// Isle of Man: a British Crown dependency located in the Irish Sea
JEY,// Jersey: a British Crown dependency located in the English Channel
BLM,// Saint Barthélemy: an overseas collectivity of France in the Caribbean
WSM, // Samoa: an independent island nation in the South Pacific
SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
)
),