X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e65f1c0c1ab4796ae5342907a76fd6f659b5bf72..edb1e89be30f6b9dec33a36d8a48f6c10fa6297f:/website/search.php?ds=sidebyside diff --git a/website/search.php b/website/search.php index 48035998..4a75c768 100755 --- a/website/search.php +++ b/website/search.php @@ -101,7 +101,6 @@ $aPhrases = array_reverse($aPhrases); $sQuery = join(', ',$aPhrases); } - if ($sQuery) { $hLog = logStart($oDB, 'search', $sQuery, $aLangPrefOrder); @@ -113,6 +112,7 @@ $sQuery = preg_replace('/\\bil\\b/','illinois', $sQuery); $sQuery = preg_replace('/\\bal\\b/','alabama', $sQuery); $sQuery = preg_replace('/\\bla\\b/','louisiana', $sQuery); + $sQuery = preg_replace('/\\bde louisiana\\b/','de la', $sQuery); } // If we have a view box create the SQL @@ -191,7 +191,7 @@ $_GET['nearlon'] = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60); $sQuery = trim(str_replace($aData[0], ' ', $sQuery)); } - elseif (preg_match('/(\\[|\\b)(-?[0-9]+[0-9.]*)[, ]+(-?[0-9]+[0-9.]*)(\\]|\\b)/', $sQuery, $aData)) + elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9.]*)[, ]+(-?[0-9]+[0-9.]*)(\\]|$|\\b)/', $sQuery, $aData)) { $_GET['nearlat'] = $aData[2]; $_GET['nearlon'] = $aData[3];