Merge pull request #71 from SheffieldSolar/70-add-support-for-the-new-version-of-gsp-boundaries

add support for new version of NESO GSP boundaries

Author: Herald-TUOS

Tests/test_geocode.py

@@ -76,7 +76,7 @@ def mock_neso_force_setup():
                     },
                     crs="EPSG:4326",
                 )
-                for version in ["20220314", "20250109", "20251204"]:
+                for version in ["20220314", "20250109", "20251204", "20260209"]:
                     geo.cache_manager.write(f"gsp_boundaries_{version}", gsp_boundaries)
                 geo.cache_manager.write("dno_boundaries", gpd.GeoDataFrame({}))
 

geocode/geocode.py

@@ -294,7 +294,7 @@ def reverse_geocode(self, latlons, entity, **kwargs):
         """
         entity = entity.lower()
         if entity == "gsp":
-            version = kwargs.pop("version", "20251204")
+            version = kwargs.pop("version", "20260209")
             return self.neso.reverse_geocode_gsp(latlons, version, **kwargs)
         elif entity == "llsoa":
             version = kwargs.pop("version", "2011")

geocode/neso.py

@@ -54,7 +54,7 @@ def force_setup(self):
         """
         Function to setup lookup files.
         """
-        for version in ["20220314", "20250109", "20251204"]:
+        for version in ["20220314", "20250109", "20251204", "20260209"]:
             self.load_gsp_boundaries(version)
         self._load_dno_boundaries()
 
@@ -112,6 +112,7 @@ def _load_gsp_boundaries(self, version: str):
         data_url = {
             "20250109": "https://api.neso.energy/dataset/2810092e-d4b2-472f-b955-d8bea01f9ec0/resource/d95e8c1b-9cd9-41dd-aacb-4b53b8c07c20/download/gsp_regions_20250109.zip",
             "20251204": "https://api.neso.energy/dataset/2810092e-d4b2-472f-b955-d8bea01f9ec0/resource/c5647312-afab-4a58-8158-2f1efed1d7fc/download/gsp_regions_20251204.zip",
+            "20260209": "https://api.neso.energy/dataset/2810092e-d4b2-472f-b955-d8bea01f9ec0/resource/5dfab3dd-f192-40ab-b97f-b365a594293c/download/gsp_regions_20260209.zip",
         }
         gsp_boundaries_cache_contents = self.cache_manager.retrieve(
             f"gsp_boundaries_{version}"
@@ -209,7 +210,7 @@ def load_gsp_boundaries(self, version: str):
         """
         if version == "20220314":
             return self._load_gsp_boundaries_20220314()
-        elif version in ["20250109", "20251204"]:
+        elif version in ["20250109", "20251204", "20260209"]:
             return self._load_gsp_boundaries(version=version)
         else:
             raise ValueError(f"GSP boundaries version {version} is not supported.")