From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 20 Aug 2024 07:03:52 +0000 (+0200)
Subject: Merge pull request #3520 from lonvia/restrict-interpolation-range
X-Git-Tag: deploy~1^2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/f535340d5af0b59c1bbdfde885b62dd483a9e38e?hp=c7d80a2cc8cacb7dba95f023c2f480d25f7bf6b1

Merge pull request #3520 from lonvia/restrict-interpolation-range

Restrict interpolation housenumbers to 0-999999
---

diff --git a/lib-sql/functions/interpolation.sql b/lib-sql/functions/interpolation.sql
index 8bc9ad42..b0797df2 100644
--- a/lib-sql/functions/interpolation.sql
+++ b/lib-sql/functions/interpolation.sql
@@ -222,10 +222,11 @@ BEGIN
           -- formatted postcode and therefore 'postcode' contains a derived
           -- variant.
           CASE WHEN address ? 'postcode' THEN placex.postcode ELSE NULL::text END as postcode,
-          substring(address->'housenumber','[0-9]+')::integer as hnr
+          (address->'housenumber')::integer as hnr
         FROM placex, generate_series(1, array_upper(waynodes, 1)) nodeidpos
         WHERE osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT
               and address is not NULL and address ? 'housenumber'
+              and address->'housenumber' ~ '^[0-9]{1,6}$'
               and ST_Distance(NEW.linegeo, geometry) < 0.0005
         ORDER BY nodeidpos
     LOOP