Support housenumber=0 in interpolations

diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index f52935863ce0c37d1a219fddb229d18efb1ff3a2..7b30d915843d413f0517eaa239467b98bd86e98a 100644 (file)
--- 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 61e0f46303b19a2bc0fafcfbe6b08266f669c2e2..52971295c5ced00253e7f39b6151f3640fe51fb2 100644 (file)
--- 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 |
+