Merge pull request #65 from SheffieldSolar/59-add-support-for-switching-between-2011-and-2021-lsoa-boundary-definitions-when-geocodingreverse-geocoding

add support for switching between 2011 and 2021 version of llsoa

Author: Herald-TUOS

Tests/test_geocode.py

@@ -37,7 +37,7 @@ def test_force_setup(self):
             geo.force_setup()
         cache_dir = geo.cache_manager.cache_dir
         assert cache_dir.is_dir()
-        assert len([c for c in cache_dir.glob("*.p") if "gmaps" not in c.name]) == 15
+        assert len([c for c in cache_dir.glob("*.p") if "gmaps" not in c.name]) == 17
 
     def test_geocode_llsoa(self):
         """
@@ -50,14 +50,16 @@ def test_geocode_llsoa(self):
             "W01000323",
             "S00101253",
             "S01008087",
+            "S01020873",
         ]
         centroids = [
-            (54.547776537068664, -1.195629080286167),
-            (53.666095344794648, -1.703771184460476),
-            (51.578729873335718, -0.068445270723745),
-            (53.207256254835059, -3.13247635788833),
-            (55.94492620443608, -4.333451009831742),
-            (55.91836588770352, -4.21934323024909),
+            (54.5477949315505, -1.19562636315068),
+            (53.6669451917253, -1.70300404181518),
+            (51.5787798943552, -0.06847625193368),
+            (53.2072680650806, -3.13215047150594),
+            (55.9449262044360, -4.33345100983174),
+            (55.9183658877035, -4.21934323024909),
+            (55.9341580155129, -3.46004249282003),
         ]
         with Geocoder() as geo:
             assert_almost_equal(geo.geocode_llsoa(llsoas), centroids)

geocode/geocode.py

@@ -297,7 +297,10 @@ def reverse_geocode(self, latlons, entity, **kwargs):
             version = kwargs.pop("version", "20251204")
             return self.neso.reverse_geocode_gsp(latlons, version, **kwargs)
         elif entity == "llsoa":
-            return self.ons_nrs.reverse_geocode_llsoa(latlons=latlons, **kwargs)
+            version = kwargs.pop("version", "2011")
+            return self.ons_nrs.reverse_geocode_llsoa(
+                latlons, version=version, **kwargs
+            )
         elif entity == "nuts":
             return self.eurostat.reverse_geocode_nuts(latlons=latlons, **kwargs)
         else: