From 1206d1869d76b547ae56daf30a5c484b09bb3974 Mon Sep 17 00:00:00 2001 From: Herald-TUOS Date: Thu, 25 Sep 2025 12:31:58 +0100 Subject: [PATCH 1/3] return `GSPGroup` while reverse-geocoding to GSP --- geocode/utilities.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/geocode/utilities.py b/geocode/utilities.py index 33844d4..f08c7ad 100644 --- a/geocode/utilities.py +++ b/geocode/utilities.py @@ -278,6 +278,11 @@ def reverse_geocode( ) joined.update(nearest, overwrite=False) joined["region_id"] = joined["region_id"].where(pd.notna(joined["region_id"]), None) + if "GSPGroup" in joined.columns: + joined["GSPGroup"] = joined["GSPGroup"].where( + pd.notna(joined["GSPGroup"]), None + ) + return list(zip(joined["region_id"], joined["GSPGroup"])) return joined["region_id"].tolist() From 18f4390fb871b66cd7c582e4d33b25bc202c7bbf Mon Sep 17 00:00:00 2001 From: Herald-TUOS Date: Thu, 25 Sep 2025 12:46:48 +0100 Subject: [PATCH 2/3] fix broken tests --- Tests/test_geocode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_geocode.py b/Tests/test_geocode.py index f44a0ff..cbd2e18 100644 --- a/Tests/test_geocode.py +++ b/Tests/test_geocode.py @@ -100,7 +100,7 @@ def test_reverse_geocode_gsp(self): """ Test the `reverse_geocode_gsp` function with several test cases. """ - gsp_regions = ["BRED_1", "DEWP"] + gsp_regions = [("BRED_1", "_G"), ("DEWP", "_N")] latlons = [(53.33985, -2.051880), (55.950095, -3.178485)] with Geocoder() as geo: assert_equal( From d78404376fec6081a3ffb8fffbc0a2bfeb88fda3 Mon Sep 17 00:00:00 2001 From: Herald Olakkengil Date: Fri, 3 Oct 2025 13:59:16 +0100 Subject: [PATCH 3/3] Update geocode/utilities.py Co-authored-by: Jamie Taylor --- geocode/utilities.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/geocode/utilities.py b/geocode/utilities.py index f08c7ad..9a05264 100644 --- a/geocode/utilities.py +++ b/geocode/utilities.py @@ -279,9 +279,7 @@ def reverse_geocode( joined.update(nearest, overwrite=False) joined["region_id"] = joined["region_id"].where(pd.notna(joined["region_id"]), None) if "GSPGroup" in joined.columns: - joined["GSPGroup"] = joined["GSPGroup"].where( - pd.notna(joined["GSPGroup"]), None - ) + joined["GSPGroup"] = joined["GSPGroup"].replace({pd.NA: None}) return list(zip(joined["region_id"], joined["GSPGroup"])) return joined["region_id"].tolist()