'Pacific Island' no longer matches Iceland (IS)

CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [5.3.0] - 2024-11-04
+
+### Changed
+
+- "Island" no longer matches Iceland when language is not set.
+
+### Fixed
+
+- "Pacific Island" no longer matches Iceland.
+
 ## [5.2.2] - 2024-08-23
 
 - Detection for "moldavie" as "MD" in French.

geoconvert/convert.py

@@ -9,6 +9,7 @@
     DE_POSTCODE_RANGE,
     NUTS_CODES_BY_COUNTRY,
     all_nuts_regex,
+    ambiguous_country_names,
     br_postcode_regex,
     br_state_code_regex,
     br_state_name_regex,
@@ -413,8 +414,13 @@ def _full_name_to_country_code(text, lang, language_to_full_names):
         # If the language is unknown, just do not use any language.
         language_to_full_names = {}
 
-    for lang, full_names in language_to_full_names.items():
-        country_code = _full_name_to_country_code_for_lang(text, lang, full_names)
+    for language, full_names in language_to_full_names.items():
+        # When no language is set, remove ambiguous country names from the countries list.
+        if not lang:
+            full_names = full_names.copy()
+            for name in ambiguous_country_names:
+                full_names.pop(name, None)
+        country_code = _full_name_to_country_code_for_lang(text, language, full_names)
         if country_code:
             return country_code
 

geoconvert/data/__init__.py

@@ -1,5 +1,6 @@
 from .capitals import capitals_de, capitals_en, capitals_fr, language_to_capital_names
 from .countries import (
+    ambiguous_country_names,
     countries_de,
     countries_en,
     countries_fr,

geoconvert/data/countries.py

@@ -48,6 +48,17 @@
     "haute vienne": "FR",  # fr
 }
 
+# We want to make sure pacific island is not registered as IS (Iceland) in German.
+# Other languages doesn't have issues with it and we shouldn't prevent them from retrieving
+# other countries like FJ (Fiji) in "Fiji/Pacific Island"
+special_countries_de = {
+    "pacific island": None,  # en
+}
+
+# We register here names matching common words in other languages to prevent
+# matching them when language is not defined
+ambiguous_country_names = ["island"]
+
 
 countries_fr = {
     **special_countries,
@@ -597,6 +608,7 @@
 
 
 countries_de = {
+    **special_countries_de,
     **special_countries,
     **{
         "agypten": "EG",

geoconvert/utils.py

@@ -40,10 +40,12 @@ def safe_string(text):
     'how are you'
     >>> safe_string("l’ocean")
     "l'ocean"
+    >>> safe_string('Fiji/Pacific Island')
+    'fiji pacific island'
     """
     text = remove_accents(text)
-    # Replace "-" and ":" with a whitespace
-    text = re.sub(r"[-:]", " ", text)
+    # Replace "-", ":" and "/" with a whitespace
+    text = re.sub(r"[-:/]", " ", text)
     # Replace weird '
     text = re.sub(r"[ʼ]", "'", text)
     # Only keep word or space characters as well as "_", and "'".

tests/test_countries.py

@@ -63,11 +63,14 @@ class TestCountries:
             ("Heard Island", {}, "HM"),  # en
             ("Norfolk Island", {}, "NF"),  # en
             ("Solomon Islands", {}, "SB"),  # en
-            ("Prince Edward Island", {}, "CA"),  # en
-            ("Rhode Island", {}, "US"),  # en
             # However, in cases where island is singular instead of plural,
             # there can be confusion.
-            ("Solomon Island Nationals", {}, "IS"),  # en
+            ("Solomon Island Nationals", {}, None),  # en
+            ("Prince Edward Island", {}, "CA"),  # en
+            ("Rhode Island", {}, "US"),  # en
+            ("Pacific island", {}, None),  # en
+            ("Fiji/Pacific island", {}, "FJ"),  # en
+            ("island", {}, None),  # en
             # Any capitalization for lang works
             ("Germany", {"lang": "en"}, "DE"),
             ("Germany", {"lang": "En"}, "DE"),
@@ -164,6 +167,7 @@ def test_country_name_to_country_code_fr(self, input_data, expected):
             ("state of palestine", "PS"),
             ("palestine, state of", "PS"),
             ("Irak", None),
+            ("island", None),
         ],
     )
     def test_country_name_to_country_code_en(self, input_data, expected):
@@ -191,6 +195,8 @@ def test_country_name_to_country_code_en(self, input_data, expected):
             ("   Land der Hinrichtung : Deutschland", "DE"),
             ("Dschibuti-Stadt", "DJ"),
             ("elfenbeinküste und ecuador    ", "CI"),
+            ("Fiji/Pacific island", None),  # en
+            ("island", "IS"),
         ],
     )
     def test_country_name_to_country_code_de(self, input_data, expected):