Merge branch 'release/1.7.1'

Herald-TUOS · Herald-TUOS · commit d128e61e75d9 · 2026-05-06T18:02:09.000+01:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Geocode various geographical entities including postcodes and LLSOAs. Reverse-geocode to LLSOA or GSP/GNode.
 
-*Latest Version: 1.7*
+*Latest Version: 1.7.1*
 
 ## What is this repository for?
 
diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file records the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 529ebc42fc9ec0baa73bfe78e5e5915c
+config: f5ff24d730e65c65efd5048dbf0dee40
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/.buildinfo.bak b/docs/build/html/.buildinfo.bak
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file records the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: cb5e8ee6c6c3627b70b88682e4333544
+config: 529ebc42fc9ec0baa73bfe78e5e5915c
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/_modules/index.html b/docs/build/html/_modules/index.html
@@ -5,14 +5,14 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Overview: module code &mdash; Geocode 1.7 documentation</title>
+  <title>Overview: module code &mdash; Geocode 1.7.1 documentation</title>
       <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b86133f3" />
       <link rel="stylesheet" type="text/css" href="../_static/css/theme.css?v=e59714d7" />
 
   
       <script src="../_static/jquery.js?v=5d32c60e"></script>
       <script src="../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
-      <script src="../_static/documentation_options.js?v=392da36c"></script>
+      <script src="../_static/documentation_options.js?v=a77542ef"></script>
       <script src="../_static/doctools.js?v=9bcbadda"></script>
       <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="../_static/js/theme.js"></script>
diff --git a/docs/build/html/_static/documentation_options.js b/docs/build/html/_static/documentation_options.js
@@ -1,5 +1,5 @@
 const DOCUMENTATION_OPTIONS = {
-    VERSION: '1.7',
+    VERSION: '1.7.1',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',
diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html
@@ -5,14 +5,14 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Index &mdash; Geocode 1.7 documentation</title>
+  <title>Index &mdash; Geocode 1.7.1 documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b86133f3" />
       <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
 
   
       <script src="_static/jquery.js?v=5d32c60e"></script>
       <script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
-      <script src="_static/documentation_options.js?v=392da36c"></script>
+      <script src="_static/documentation_options.js?v=a77542ef"></script>
       <script src="_static/doctools.js?v=9bcbadda"></script>
       <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/js/theme.js"></script>
diff --git a/docs/build/html/index.html b/docs/build/html/index.html
@@ -6,14 +6,14 @@
   <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Welcome to Geocode’s documentation! &mdash; Geocode 1.7 documentation</title>
+  <title>Welcome to Geocode’s documentation! &mdash; Geocode 1.7.1 documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b86133f3" />
       <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
 
   
       <script src="_static/jquery.js?v=5d32c60e"></script>
       <script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
-      <script src="_static/documentation_options.js?v=392da36c"></script>
+      <script src="_static/documentation_options.js?v=a77542ef"></script>
       <script src="_static/doctools.js?v=9bcbadda"></script>
       <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/js/theme.js"></script>
diff --git a/docs/build/html/modules.html b/docs/build/html/modules.html
@@ -6,14 +6,14 @@
   <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Modules &mdash; Geocode 1.7 documentation</title>
+  <title>Modules &mdash; Geocode 1.7.1 documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b86133f3" />
       <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
 
   
       <script src="_static/jquery.js?v=5d32c60e"></script>
       <script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
-      <script src="_static/documentation_options.js?v=392da36c"></script>
+      <script src="_static/documentation_options.js?v=a77542ef"></script>
       <script src="_static/doctools.js?v=9bcbadda"></script>
       <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/js/theme.js"></script>
diff --git a/docs/build/html/search.html b/docs/build/html/search.html
@@ -5,15 +5,15 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Search &mdash; Geocode 1.7 documentation</title>
+  <title>Search &mdash; Geocode 1.7.1 documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b86133f3" />
       <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
 
   
     
       <script src="_static/jquery.js?v=5d32c60e"></script>
       <script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
-      <script src="_static/documentation_options.js?v=392da36c"></script>
+      <script src="_static/documentation_options.js?v=a77542ef"></script>
       <script src="_static/doctools.js?v=9bcbadda"></script>
       <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/js/theme.js"></script>
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -23,7 +23,7 @@
 author = "Jamie Taylor"
 
 # The full version, including alpha/beta/rc tags
-release = "1.7"
+release = "1.7.1"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/geocode/utilities.py b/geocode/utilities.py
@@ -265,6 +265,8 @@ def reverse_geocode(
     ).to_crs(regions.crs)
     regions.set_index("region_id", inplace=True)
     joined = regions.sjoin(coords, how="right").to_crs(regions.crs)
+    # Remove coords which fall on the boundary of multiple regions by deduplicating
+    joined = joined[~joined.index.duplicated(keep="first")]
     # Perform sjoin nearest on coords that wasn't reverse-geocoded to a region
     na_geolocations = joined[joined["region_id"].isna()].copy()
     if not na_geolocations.empty and max_distance is not None:
diff --git a/geocode/version.py b/geocode/version.py
@@ -1 +1 @@
-__version__ = "1.7"
+__version__ = "1.7.1"
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="1.7",
+    version="1.7.1",
     description="Geocode postcodes, addresses or LLSOA using the Code Point Open database and GMaps API.",
     long_description=long_description.replace("\r", ""),
     long_description_content_type="text/markdown",
@@ -79,6 +79,7 @@
         "pyshp",
         "pyproj",
         "geopandas",
+        "py7zr",
     ],
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
