diff --git a/Cargo.toml b/Cargo.toml index d012a47..a1d39b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust_iso3166" -version = "0.1.14" +version = "0.1.15" edition = "2021" description="ISO 3166-1 (Codes for the representation of names of countries and their subdivisions – Part 1: Country codes) is a standard defining codes for the names of countries, dependent territories, and special areas of geographical interest. It is the first part of the ISO 3166 standard published by the International Organization for Standardization." repository="https://github.com/rust-iso/rust_iso3166" @@ -14,7 +14,7 @@ keywords=["ISO3166", "ISO3166-1", "ISO3166-2", "ISO3166-3"] crate-type = ["cdylib", "rlib"] [dependencies] -phf = { version = "^0.11.1", features = ["macros"] } +phf = { version = "0.12.1", features = ["macros"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] prettytable-rs = "^0.10" diff --git a/scripts/lib.py b/scripts/lib.py index 2fd03e6..5488e1c 100755 --- a/scripts/lib.py +++ b/scripts/lib.py @@ -440,7 +440,25 @@ print( """ -///CountryCode map with alpha2 Code key +///CountryCode map with name key +pub const NAME_MAP: Map<&str, CountryCode> = phf_map! { +""" +) +for x in a.split("\n"): + ts = x.split("\t") + if len(ts) < 2: + print(x) + continue + print('"%s" => %s,' % (ts[0], ts[1])) +print( + """ +}; +""" +) + +print( + """ +///CountryCode map with alpha2 Code key pub const ALPHA2_MAP: Map<&str, CountryCode> = phf_map! { """ ) @@ -458,7 +476,7 @@ print( """ -///CountryCode map with alpha3 Code key +///CountryCode map with alpha3 Code key pub const ALPHA3_MAP: Map<&str, CountryCode> = phf_map! { """ ) @@ -476,7 +494,7 @@ print( """ -///CountryCode map with 3 len numeric str Code key +///CountryCode map with 3 len numeric str Code key pub const NUMERIC_MAP: Map<&str, CountryCode> = phf_map! { """ ) @@ -494,7 +512,7 @@ print( """ -///ALL the names of Countrys +///ALL the names of Countries pub const ALL_NAME: & [&str] = &[ """ ) @@ -512,7 +530,7 @@ print( """ -///ALL the alpha2 codes of Countrys +///ALL the alpha2 codes of Countries pub const ALL_ALPHA2: & [&str] = &[ """ ) @@ -529,7 +547,7 @@ ) print( """ -///ALL the alpha3 codes of Countrys +///ALL the alpha3 codes of Countries pub const ALL_ALPHA3: & [&str] = &[ """ ) @@ -547,7 +565,7 @@ print( """ -///ALL the 3 length numeric str codes of Countrys +///ALL the 3 length numeric str codes of Countries pub const ALL_NUMERIC_STR: & [&str] = &[ """ ) @@ -565,7 +583,7 @@ print( """ -///ALL the numeric codes of Countrys +///ALL the numeric codes of Countries pub const ALL_NUMERIC: & [i32] = &[ """ ) @@ -583,7 +601,7 @@ print( """ -///ALL the Countrys struct +///ALL the Countries struct pub const ALL: & [CountryCode] = &[ """ ) diff --git a/src/lib.rs b/src/lib.rs index 2d16f2e..93a6178 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2158,7 +2158,265 @@ pub const ZW: CountryCode = CountryCode { -///CountryCode map with alpha2 Code key +///CountryCode map with name key +pub const NAME_MAP: Map<&str, CountryCode> = phf_map! { + + +"Afghanistan" => AF, +"Åland Islands" => AX, +"Albania" => AL, +"Algeria" => DZ, +"American Samoa" => AS, +"Andorra" => AD, +"Angola" => AO, +"Anguilla" => AI, +"Antarctica" => AQ, +"Antigua and Barbuda" => AG, +"Argentina" => AR, +"Armenia" => AM, +"Aruba" => AW, +"Australia" => AU, +"Austria" => AT, +"Azerbaijan" => AZ, +"Bahamas" => BS, +"Bahrain" => BH, +"Bangladesh" => BD, +"Barbados" => BB, +"Belarus" => BY, +"Belgium" => BE, +"Belize" => BZ, +"Benin" => BJ, +"Bermuda" => BM, +"Bhutan" => BT, +"Bolivia (Plurinational State of)" => BO, +"Bonaire, Sint Eustatius and Saba[c]" => BQ, +"Bosnia and Herzegovina" => BA, +"Botswana" => BW, +"Bouvet Island" => BV, +"Brazil" => BR, +"British Indian Ocean Territory" => IO, +"Brunei Darussalam" => BN, +"Bulgaria" => BG, +"Burkina Faso" => BF, +"Burundi" => BI, +"Cabo Verde" => CV, +"Cambodia" => KH, +"Cameroon" => CM, +"Canada" => CA, +"Cayman Islands" => KY, +"Central African Republic" => CF, +"Chad" => TD, +"Chile" => CL, +"China" => CN, +"Christmas Island" => CX, +"Cocos (Keeling) Islands" => CC, +"Colombia" => CO, +"Comoros" => KM, +"Congo" => CG, +"Congo, Democratic Republic of the" => CD, +"Cook Islands" => CK, +"Costa Rica" => CR, +"Côte d'Ivoire" => CI, +"Croatia" => HR, +"Cuba" => CU, +"Curaçao" => CW, +"Cyprus" => CY, +"Czechia" => CZ, +"Denmark" => DK, +"Djibouti" => DJ, +"Dominica" => DM, +"Dominican Republic" => DO, +"Ecuador" => EC, +"Egypt" => EG, +"El Salvador" => SV, +"Equatorial Guinea" => GQ, +"Eritrea" => ER, +"Estonia" => EE, +"Eswatini" => SZ, +"Ethiopia" => ET, +"Falkland Islands (Malvinas)" => FK, +"Faroe Islands" => FO, +"Fiji" => FJ, +"Finland" => FI, +"France" => FR, +"French Guiana" => GF, +"French Polynesia" => PF, +"French Southern Territories" => TF, +"Gabon" => GA, +"Gambia" => GM, +"Georgia" => GE, +"Germany" => DE, +"Ghana" => GH, +"Gibraltar" => GI, +"Greece" => GR, +"Greenland" => GL, +"Grenada" => GD, +"Guadeloupe" => GP, +"Guam" => GU, +"Guatemala" => GT, +"Guernsey" => GG, +"Guinea" => GN, +"Guinea-Bissau" => GW, +"Guyana" => GY, +"Haiti" => HT, +"Heard Island and McDonald Islands" => HM, +"Holy See" => VA, +"Honduras" => HN, +"Hong Kong" => HK, +"Hungary" => HU, +"Iceland" => IS, +"India" => IN, +"Indonesia" => ID, +"Iran (Islamic Republic of)" => IR, +"Iraq" => IQ, +"Ireland" => IE, +"Isle of Man" => IM, +"Israel" => IL, +"Italy" => IT, +"Jamaica" => JM, +"Japan" => JP, +"Jersey" => JE, +"Jordan" => JO, +"Kazakhstan" => KZ, +"Kenya" => KE, +"Kiribati" => KI, +"Korea (Democratic People's Republic of)" => KP, +"Korea, Republic of" => KR, +"Kuwait" => KW, +"Kyrgyzstan" => KG, +"Lao People's Democratic Republic" => LA, +"Latvia" => LV, +"Lebanon" => LB, +"Lesotho" => LS, +"Liberia" => LR, +"Libya" => LY, +"Liechtenstein" => LI, +"Lithuania" => LT, +"Luxembourg" => LU, +"Macao" => MO, +"Madagascar" => MG, +"Malawi" => MW, +"Malaysia" => MY, +"Maldives" => MV, +"Mali" => ML, +"Malta" => MT, +"Marshall Islands" => MH, +"Martinique" => MQ, +"Mauritania" => MR, +"Mauritius" => MU, +"Mayotte" => YT, +"Mexico" => MX, +"Micronesia (Federated States of)" => FM, +"Moldova, Republic of" => MD, +"Monaco" => MC, +"Mongolia" => MN, +"Montenegro" => ME, +"Montserrat" => MS, +"Morocco" => MA, +"Mozambique" => MZ, +"Myanmar" => MM, +"Namibia" => NA, +"Nauru" => NR, +"Nepal" => NP, +"Netherlands" => NL, +"New Caledonia" => NC, +"New Zealand" => NZ, +"Nicaragua" => NI, +"Niger" => NE, +"Nigeria" => NG, +"Niue" => NU, +"Norfolk Island" => NF, +"North Macedonia" => MK, +"Northern Mariana Islands" => MP, +"Norway" => NO, +"Oman" => OM, +"Pakistan" => PK, +"Palau" => PW, +"Palestine, State of" => PS, +"Panama" => PA, +"Papua New Guinea" => PG, +"Paraguay" => PY, +"Peru" => PE, +"Philippines" => PH, +"Pitcairn" => PN, +"Poland" => PL, +"Portugal" => PT, +"Puerto Rico" => PR, +"Qatar" => QA, +"Réunion" => RE, +"Romania" => RO, +"Russian Federation" => RU, +"Rwanda" => RW, +"Saint Barthélemy" => BL, +"Saint Helena, Ascension and Tristan da Cunha[d]" => SH, +"Saint Kitts and Nevis" => KN, +"Saint Lucia" => LC, +"Saint Martin (French part)" => MF, +"Saint Pierre and Miquelon" => PM, +"Saint Vincent and the Grenadines" => VC, +"Samoa" => WS, +"San Marino" => SM, +"Sao Tome and Principe" => ST, +"Saudi Arabia" => SA, +"Senegal" => SN, +"Serbia" => RS, +"Seychelles" => SC, +"Sierra Leone" => SL, +"Singapore" => SG, +"Sint Maarten (Dutch part)" => SX, +"Slovakia" => SK, +"Slovenia" => SI, +"Solomon Islands" => SB, +"Somalia" => SO, +"South Africa" => ZA, +"South Georgia and the South Sandwich Islands" => GS, +"South Sudan" => SS, +"Spain" => ES, +"Sri Lanka" => LK, +"Sudan" => SD, +"Suriname" => SR, +"Svalbard and Jan Mayen[e]" => SJ, +"Sweden" => SE, +"Switzerland" => CH, +"Syrian Arab Republic" => SY, +"Taiwan, Province of China" => TW, +"Tajikistan" => TJ, +"Tanzania, United Republic of" => TZ, +"Thailand" => TH, +"Timor-Leste" => TL, +"Togo" => TG, +"Tokelau" => TK, +"Tonga" => TO, +"Trinidad and Tobago" => TT, +"Tunisia" => TN, +"Turkey" => TR, +"Turkmenistan" => TM, +"Turks and Caicos Islands" => TC, +"Tuvalu" => TV, +"Uganda" => UG, +"Ukraine" => UA, +"United Arab Emirates" => AE, +"United Kingdom of Great Britain and Northern Ireland" => GB, +"United States of America" => US, +"United States Minor Outlying Islands[f]" => UM, +"Uruguay" => UY, +"Uzbekistan" => UZ, +"Vanuatu" => VU, +"Venezuela (Bolivarian Republic of)" => VE, +"Viet Nam" => VN, +"Virgin Islands (British)" => VG, +"Virgin Islands (U.S.)" => VI, +"Wallis and Futuna" => WF, +"Western Sahara" => EH, +"Yemen" => YE, +"Zambia" => ZM, +"Zimbabwe" => ZW, + + +}; + + +///CountryCode map with alpha2 Code key pub const ALPHA2_MAP: Map<&str, CountryCode> = phf_map! { @@ -2416,7 +2674,7 @@ pub const ALPHA2_MAP: Map<&str, CountryCode> = phf_map! { }; -///CountryCode map with alpha3 Code key +///CountryCode map with alpha3 Code key pub const ALPHA3_MAP: Map<&str, CountryCode> = phf_map! { @@ -2674,7 +2932,7 @@ pub const ALPHA3_MAP: Map<&str, CountryCode> = phf_map! { }; -///CountryCode map with 3 len numeric str Code key +///CountryCode map with 3 len numeric str Code key pub const NUMERIC_MAP: Map<&str, CountryCode> = phf_map! { @@ -2932,7 +3190,7 @@ pub const NUMERIC_MAP: Map<&str, CountryCode> = phf_map! { }; -///ALL the names of Countrys +///ALL the names of Countries pub const ALL_NAME: & [&str] = &[ @@ -3190,7 +3448,7 @@ pub const ALL_NAME: & [&str] = &[ ]; -///ALL the alpha2 codes of Countrys +///ALL the alpha2 codes of Countries pub const ALL_ALPHA2: & [&str] = &[ @@ -3448,7 +3706,7 @@ pub const ALL_ALPHA2: & [&str] = &[ ]; -///ALL the alpha3 codes of Countrys +///ALL the alpha3 codes of Countries pub const ALL_ALPHA3: & [&str] = &[ @@ -3706,7 +3964,7 @@ pub const ALL_ALPHA3: & [&str] = &[ ]; -///ALL the 3 length numeric str codes of Countrys +///ALL the 3 length numeric str codes of Countries pub const ALL_NUMERIC_STR: & [&str] = &[ @@ -3964,7 +4222,7 @@ pub const ALL_NUMERIC_STR: & [&str] = &[ ]; -///ALL the numeric codes of Countrys +///ALL the numeric codes of Countries pub const ALL_NUMERIC: & [i32] = &[ @@ -4222,7 +4480,7 @@ pub const ALL_NUMERIC: & [i32] = &[ ]; -///ALL the Countrys struct +///ALL the Countries struct pub const ALL: & [CountryCode] = &[