From: Sarah Hoffmann Date: Tue, 28 Feb 2017 20:41:38 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~401 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/2c6b17f772fec2db0a8a8bac7462efecef92337e?hp=8bc3bb16a116f0152b49b00dff53fb1f37f0fb31 Merge remote-tracking branch 'upstream/master' --- diff --git a/lib/Geocode.php b/lib/Geocode.php index 1f4eebef..537f179c 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -1738,7 +1738,7 @@ class Geocode $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) { diff --git a/lib/template/includes/html-header.php b/lib/template/includes/html-header.php index 405efd7f..251e9037 100644 --- a/lib/template/includes/html-header.php +++ b/lib/template/includes/html-header.php @@ -2,6 +2,7 @@ OpenStreetMap Nominatim: Search + diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature index c9b33701..0074e334 100644 --- 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 - @Fail Scenario: housenumbers are ordered by complete match first When sending json search query "6395 geminis, montevideo" with address Then result addresses contain