]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 8bc3bb1)
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 28 Feb 2017 20:41:38 +0000 (21:41 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 28 Feb 2017 20:41:38 +0000 (21:41 +0100)
lib/Geocode.php patch | blob | history
lib/template/includes/html-header.php patch | blob | history
test/bdd/api/search/queries.feature patch | blob | history

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 1f4eebef44611d77d996898ec623a9be75b1e807..537f179c6982bea2ab0dd82f5020f1497e2340f2 100644 (file)
--- 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 405efd7f8439ce1a5f6f1a78abf867adf6dd7700..251e9037a06ed3971ccbc1ce7337c8a55c54c512 100644 (file)
--- a/lib/template/includes/html-header.php
+++ b/lib/template/includes/html-header.php
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
     <title>OpenStreetMap Nominatim: Search</title>
+    <meta content="IE=edge" http-equiv="x-ua-compatible" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <base href="<?php echo CONST_Website_BaseURL;?>" />
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
-    @Fail
     Scenario: housenumbers are ordered by complete match first
         When sending json search query "6395 geminis, montevideo" with address
         Then result addresses contain
Open Source search based on OpenStreetMap data