From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Feb 2015 19:29:38 +0000 (+0100)
Subject: actually write back the reversed final phrase when reversing the query
X-Git-Tag: v2.4.0~42
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/0f84371748c34bc278eb9d66097e0f8316ebbc52

actually write back the reversed final phrase when reversing the query
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 22ad4332..e441e886 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1054,7 +1054,7 @@
 						if (sizeof($aPhrases) > 1)
 						{
 							$aFinalPhrase = end($aPhrases);
-							$aFinalPhrase['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
+							$aPhrases[sizeof($aPhrases)-1]['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
 						}
 						$aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
 
diff --git a/tests/features/api/regression.feature b/tests/features/api/regression.feature
index f5a94d30..cd9e8477 100644
--- a/tests/features/api/regression.feature
+++ b/tests/features/api/regression.feature
@@ -1,19 +1,6 @@
 Feature: API regression tests
     Tests error cases reported in tickets.
 
-    @poldi-only
-    Scenario Outline: github #36
-        When sending json search query "<query>" with address
-        Then result addresses contain
-         | ID | road     | city
-         | 0  | Seegasse | Wieselburg-Land
-
-    Examples:
-         | query
-         | Seegasse, Gemeinde Wieselburg-Land
-         | Seegasse, Wieselburg-Land
-         | Seegasse, Wieselburg
-
     Scenario: trac #2430
         When sending json search query "89 River Avenue, Hoddesdon, Hertfordshire, EN11 0JT"
         Then at least 1 result is returned
@@ -185,6 +172,25 @@ Feature: API regression tests
         When sending json search query "sy"
         Then exactly 0 results are returned
 
+    Scenario: trac #5274
+        When sending json search query "Goedestraat 41-BS, Utrecht" with address
+        Then result addresses contain
+          | house_number | road        | city
+          | 41-BS        | Goedestraat | Utrecht
+
+    @poldi-only
+    Scenario Outline: github #36
+        When sending json search query "<query>" with address
+        Then result addresses contain
+         | ID | road     | city
+         | 0  | Seegasse | Wieselburg-Land
+
+    Examples:
+         | query
+         | Seegasse, Gemeinde Wieselburg-Land
+         | Seegasse, Wieselburg-Land
+         | Seegasse, Wieselburg
+
     Scenario: github #190
         When looking up place N257363453
         Then the results contain