From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 22 Apr 2022 12:32:19 +0000 (+0200)
Subject: further tweaking of address distance
X-Git-Tag: v4.1.0~58^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a515761193f4e01db1294777e5547e5e973b4f78

further tweaking of address distance

For point features, keep using the distance to centroid.
For area features, add a tie breaker for the case where the
center point falls on the boundary.
---

diff --git a/lib-sql/functions/partition-functions.sql b/lib-sql/functions/partition-functions.sql
index 5eb1aef1..e5d356e1 100644
--- a/lib-sql/functions/partition-functions.sql
+++ b/lib-sql/functions/partition-functions.sql
@@ -51,7 +51,11 @@ BEGIN
   IF in_partition = {{ partition }} THEN
     FOR r IN
       SELECT place_id, keywords, rank_address, rank_search,
-             min(ST_Distance(feature_centroid, geometry)) as distance,
+             CASE WHEN isguess THEN ST_Distance(feature, centroid)
+                  ELSE min(ST_Distance(feature_centroid, geometry))
+                       -- tie breaker when distance is the same (i.e. way is on boundary)
+                       + 0.00001 * ST_Distance(feature, centroid)
+             END as distance,
              isguess, postcode, centroid
       FROM location_area_large_{{ partition }}
       WHERE geometry && feature