safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

remove suggestion code, no longer works

Browse Source
This commit is contained in:
Sarah Hoffmann
2013-05-08 20:23:47 +02:00
parent 93b1089866
commit 9cec989882
3 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/lib.php
View File

@@ -785,20 +785,6 @@
}
function getWordSuggestions(&$oDB, $sWord)
{
$sWordQuoted = getDBQuoted(trim($sWord));
$sSQL = "select *,levenshtein($sWordQuoted,word) from test_token ";
$sSQL .= "where (metaphone = dmetaphone($sWordQuoted) or metaphonealt = dmetaphone($sWordQuoted) or ";
$sSQL .= "metaphone = dmetaphone_alt($sWordQuoted) or metaphonealt = dmetaphone_alt($sWordQuoted)) ";
$sSQL .= "and len between length($sWordQuoted)-2 and length($sWordQuoted)+2 ";
$sSQL .= "and levenshtein($sWordQuoted,word) < 3 ";
$sSQL .= "order by levenshtein($sWordQuoted,word) asc, abs(len - length($sWordQuoted)) asc limit 20";
$aSimilar = $oDB->getAll($sSQL);
return $aSimilar;
}
function geocodeReverse($fLat, $fLon, $iZoom=18)
{
$oDB =& getDB();

2
settings/settings.php
View File

@@ -64,8 +64,6 @@
@define('CONST_Search_AreaPolygons_Enabled', true);
@define('CONST_Search_AreaPolygons', true);
@define('CONST_Suggestions_Enabled', false);
@define('CONST_Search_TryDroppedAddressTerms', false);
@define('CONST_Search_NameOnlySearchFrequencyThreshold', false);

34
website/search.php
View File

@@ -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;
@@ -445,35 +444,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)
{
@@ -1587,10 +1557,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;