X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b0521f5150093d7b1481bf2739e89a909ec18a56..37bf7bc20e2e3524b00514752f55ec9a3e7e01b4:/website/search.php diff --git a/website/search.php b/website/search.php index afc4748a..95d0cadd 100755 --- a/website/search.php +++ b/website/search.php @@ -17,7 +17,6 @@ $aSearchResults = array(); $aExcludePlaceIDs = array(); $sCountryCodesSQL = false; - $sSuggestion = $sSuggestionURL = false; $bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true; $bReverseInPlan = false; $iFinalLimit = isset($_GET['limit'])?(int)$_GET['limit']:10; @@ -446,35 +445,6 @@ } if (CONST_Debug) var_Dump($aPhrases, $aValidTokens); - $aSuggestion = array(); - $bSuggestion = false; - if (CONST_Suggestions_Enabled) - { - foreach($aPhrases as $iPhrase => $aPhrase) - { - if (!isset($aValidTokens[' '.$aPhrase['wordsets'][0][0]])) - { - $sQuotedPhrase = getDBQuoted(' '.$aPhrase['wordsets'][0][0]); - $aSuggestionWords = getWordSuggestions($oDB, $aPhrase['wordsets'][0][0]); - $aRow = $aSuggestionWords[0]; - if ($aRow && $aRow['word']) - { - $aSuggestion[] = $aRow['word']; - $bSuggestion = true; - } - else - { - $aSuggestion[] = $aPhrase['string']; - } - } - else - { - $aSuggestion[] = $aPhrase['string']; - } - } - } - if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion); - // Try and calculate GB postcodes we might be missing foreach($aTokens as $sToken) { @@ -1598,10 +1568,6 @@ if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1'; if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']); if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon']; - if ($sSuggestion) - { - $sSuggestionURL = $sMoreURL.'&q='.urlencode($sSuggestion); - } $sMoreURL .= '&q='.urlencode($sQuery); if (CONST_Debug) exit;