From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 25 Oct 2017 18:26:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~356
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/62dbbbede6ac6b75d0bd75a0d21016bcdfc61742?hp=08f77067cb4b32c91f991924ff718a0508f0fbef

Merge remote-tracking branch 'upstream/master'
---

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index a48f5597..6d190c2a 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -187,7 +187,7 @@ class PlaceLookup
             $sSQL .= '    rank_address,';
             $sSQL .= '    min(place_id) AS place_id,';
             $sSQL .= '    min(parent_place_id) AS parent_place_id,';
-            $sSQL .= '    housenumber,';
+            $sSQL .= '    -1 as housenumber,';
             $sSQL .= '    country_code,';
             $sSQL .= $this->langAddressSql('-1');
             $sSQL .= '    get_name_by_language(name,'.$this->aLangPrefOrderSql.') AS placename,';
diff --git a/lib/SearchDescription.php b/lib/SearchDescription.php
index 702e7dea..edf4d059 100644
--- a/lib/SearchDescription.php
+++ b/lib/SearchDescription.php
@@ -465,7 +465,7 @@ class SearchDescription
                 if ($aFilteredPlaceIDs) {
                     $aNewResults = array();
                     foreach ($aFilteredPlaceIDs as $iPlaceId) {
-                        $aNewResults[$iPlaceId] = $aResults[$iPLaceId];
+                        $aNewResults[$iPlaceId] = $aResults[$iPlaceId];
                     }
                     $aResults = $aNewResults;
                     if (CONST_Debug) {
diff --git a/test/bdd/api/reverse/queries.feature b/test/bdd/api/reverse/queries.feature
index b860823e..bc88db06 100644
--- a/test/bdd/api/reverse/queries.feature
+++ b/test/bdd/api/reverse/queries.feature
@@ -32,3 +32,16 @@ Feature: Reverse geocoding
         And result addresses contain
           | house_number | road |
           | 1410         | Juan Antonio Lavalleja |
+
+    Scenario: Address with non-numerical house number
+        When sending jsonv2 reverse coordinates 53.579805460944,9.9475670458196
+        Then result addresses contain
+          | house_number | road |
+          | 43 Haus 4    | Stellinger Weg |
+
+
+    Scenario: Address with numerical house number
+        When sending jsonv2 reverse coordinates 53.580206752486,9.9502944945198
+        Then result addresses contain
+          | house_number | road |
+          | 5            | Clasingstraße |
diff --git a/test/bdd/api/search/structured.feature b/test/bdd/api/search/structured.feature
index f45a1a6d..ec7eb1be 100644
--- a/test/bdd/api/search/structured.feature
+++ b/test/bdd/api/search/structured.feature
@@ -31,6 +31,22 @@ Feature: Structured search queries
           | attr        | value |
           | querystring | Old Palace Road, GU2 7UP, United Kingdom |
 
+    Scenario: Street with housenumber, city and postcode
+        When sending xml search query "" with address
+          | street             | city  | postalcode |
+          | 19 Am schrägen Weg | Vaduz | 9490       |
+        Then result addresses contain
+          | house_number | road |
+          | 19           | Am Schrägen Weg |
+
+    Scenario: Street with housenumber, city and bad postcode
+        When sending xml search query "" with address
+          | street             | city  | postalcode |
+          | 19 Am schrägen Weg | Vaduz | 9491       |
+        Then result addresses contain
+          | house_number | road |
+          | 19           | Am Schrägen Weg |
+
     Scenario: Amenity, city
         When sending json search query "" with address
           | city  | amenity |