include housenumbers and postcodes when rechecking for exact matches

diff --git a/lib/Geocode.php b/lib/Geocode.php
index c634182939ca3e43ef0e4f33ad1aeb636c7728e2..b12f96079c5d9f9295d6c15ca192bd0dce72a227 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1737,7 +1737,7 @@ class Geocode
         $aClassType = getClassTypesWithImportance();
         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {
         $aClassType = getClassTypesWithImportance();
         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {

-            if (!preg_match('/\pL/', $sWord)) unset($aRecheckWords[$i]);
+            if (!preg_match('/[\pL\pN]/', $sWord)) unset($aRecheckWords[$i]);

         }
 
         if (CONST_Debug) {
         }
 
         if (CONST_Debug) {

diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature
index c9b33701759f63292e0884deb8400cdf6e7c5839..0074e3344fe5301f0523742d190394713be36f75 100644 (file)
--- a/test/bdd/api/search/queries.feature
+++ b/test/bdd/api/search/queries.feature
@@ -58,7 +58,6 @@ Feature: Search queries
           | 30 |
 
     # https://trac.openstreetmap.org/ticket/5094
           | 30 |
 
     # https://trac.openstreetmap.org/ticket/5094

-    @Fail

     Scenario: housenumbers are ordered by complete match first
         When sending json search query "6395 geminis, montevideo" with address
         Then result addresses contain
     Scenario: housenumbers are ordered by complete match first
         When sending json search query "6395 geminis, montevideo" with address
         Then result addresses contain