fix: manage multi word names (#70)

12rambau · May 31, 2024 · 29008f8 · 29008f8
2 parents bcc3466 + 50fc6e2
commit 29008f8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/pygadm/__init__.py b/pygadm/__init__.py
@@ -230,16 +230,17 @@ def _items(self, name: str = "", admin: str = "", content_level: int = -1) -> gp
 
         level_gdf = gpd.GeoDataFrame.from_features(data)
         level_gdf.rename(columns={"COUNTRY": "NAME_0"}, inplace=True)
-        gdf = level_gdf[level_gdf[column.format(level)].str.fullmatch(id, case=False)]
 
         # workaround for the wrong naming convention in the geojson files
         # https://gis.stackexchange.com/questions/467848/how-to-get-back-spaces-in-administrative-names-in-gadm-4-1
         # it should disappear in the next version of GADM
         # we are forced to retrieve all the names from the df (sourced from.gpkg) to replace the one from
         # the geojson that are all in camelCase
-        complete_df = Names(name, admin, content_level=content_level, complete=True)
+        complete_df = Names(admin=iso_3, content_level=content_level, complete=True)
         for i in range(int(content_level) + 1):
-            gdf.loc[:, (f"NAME_{i}")] = complete_df[f"NAME_{i}"].values
+            level_gdf.loc[:, f"NAME_{i}"] = complete_df[f"NAME_{i}"].values
+
+        gdf = level_gdf[level_gdf[column.format(level)].str.fullmatch(id, case=False)]
 
         return gdf
 

diff --git a/tests/test_items.py b/tests/test_items.py
@@ -48,6 +48,12 @@ def test_too_high(data_regression):
         data_regression.check(gdf.GID_1.tolist())
 
 
+def test_multi_word_name(dataframe_regression):
+    """Request a multi-word area."""
+    gdf = pygadm.Items(name="United States")
+    dataframe_regression.check(gdf[["NAME_0", "GID_0"]])
+
+
 def test_too_low(data_regression):
     """Request a sublevel lower than available in the area."""
     # request a level too low
@@ -109,3 +115,9 @@ def test_adm_items():
     with pytest.warns(DeprecationWarning):
         gdf2 = pygadm.AdmItems(name="Singapore")
         assert gdf1.equals(gdf2)
+
+
+def test_sub_admin(dataframe_regression):
+    """Request a sublevel."""
+    gdf = pygadm.Items(admin="SGP.1_1")
+    dataframe_regression.check(gdf[["GID_1", "NAME_1", "GID_0", "NAME_0"]])
diff --git a/tests/test_items/test_multi_word_name.csv b/tests/test_items/test_multi_word_name.csv
@@ -0,0 +1,2 @@
+,NAME_0,GID_0
+0,United States,USA
diff --git a/tests/test_items/test_sub_admin.csv b/tests/test_items/test_sub_admin.csv
@@ -0,0 +1,2 @@
+,GID_1,NAME_1,GID_0,NAME_0
+0,SGP.1_1,Central,SGP,Singapore