From: marc tobias Date: Sun, 3 Mar 2019 19:44:22 +0000 (+0100) Subject: Support housenumber=0 in interpolations X-Git-Tag: v3.3.0~6^2 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/7d9dbd62c7b600eea005b2626c1e6c2f70329619 Support housenumber=0 in interpolations --- diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php index f5293586..7b30d915 100644 --- a/lib/AddressDetails.php +++ b/lib/AddressDetails.php @@ -17,7 +17,7 @@ class AddressDetails $mLangPref = 'ARRAY['.join(',', array_map('getDBQuoted', $mLangPref)).']'; } - if (!$sHousenumber) { + if (!isset($sHousenumber)) { $sHousenumber = -1; } diff --git a/test/bdd/db/import/interpolation.feature b/test/bdd/db/import/interpolation.feature index 61e0f463..52971295 100644 --- a/test/bdd/db/import/interpolation.feature +++ b/test/bdd/db/import/interpolation.feature @@ -344,3 +344,23 @@ Feature: Import of address interpolations When importing Then W1 expands to no interpolation + Scenario: Two point interpolation starting at 0 + Given the places + | osm | class | type | housenr | geometry | + | N1 | place | house | 0 | 1 1 | + | N2 | place | house | 2 | 1 1.001 | + And the places + | osm | class | type | addr+interpolation | geometry | + | W1 | place | houses | even | 1 1, 1 1.001 | + And the ways + | id | nodes | + | 1 | 1,2 | + When importing + Then W1 expands to interpolation + | start | end | geometry | + | 0 | 2 | 1 1, 1 1.001 | + When sending jsonv2 reverse coordinates 1,1 + Then results contain + | ID | osm_type | osm_id | type | display_name | + | 0 | way | 1 | house | 0 | +