enable exact search of GB postcodes in aux postcode data,

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 4803599837843d5fb4f0598ff257b1dbf0c544fb..37ddd23c4118c9885cfc54397745f4c7a270bc9a 100755 (executable)
--- 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];
@@ -354,7 +354,7 @@
                                }
                        }
                        if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);
-/*
+
                        // Try and calculate GB postcodes we might be missing
                        foreach($aTokens as $sToken)
                        {
@@ -372,7 +372,6 @@
                                        }
                                }
                        }
-*/
 
                        foreach($aTokens as $sToken)
                        {
@@ -1161,7 +1160,7 @@
                                }
 
                                // Output data suitable for display (points and a bounding box)
-                               if ($bShowPolygons)
+                               if ($bShowPolygons && isset($aPolyPoints))
                                {
                                        $aResult['aPolyPoints'] = array();
                                        foreach($aPolyPoints as $aPoint)