hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 02:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

internally use higher result limits

Browse Source 
Avoids that too few results are returned when there are duplicates
in the results due to linked places.
This commit is contained in:
Sarah Hoffmann
2012-11-17 21:16:47 +01:00
parent e02c9b6e69
commit 8d96e87b93
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/search.php
View File

@@ -17,10 +17,11 @@
$sSuggestion = $sSuggestionURL = false; $sSuggestion = $sSuggestionURL = false;
$bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true; $bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true;
$bReverseInPlan = false; $bReverseInPlan = false;
$iLimit = isset($_GET['limit'])?(int)$_GET['limit']:10; $iFinalLimit = isset($_GET['limit'])?(int)$_GET['limit']:10;
$iOffset = isset($_GET['offset'])?(int)$_GET['offset']:0; $iOffset = isset($_GET['offset'])?(int)$_GET['offset']:0;
$iMaxRank = 20; $iMaxRank = 20;
if ($iLimit > 100) $iLimit = 100; if ($iFinalLimit > 50) $iFinalLimit = 50;
$iLimit = $iFinalLimit + min($iFinalLimit, 10);
$iMinAddressRank = 0; $iMinAddressRank = 0;
$iMaxAddressRank = 30; $iMaxAddressRank = 30;
@@ -864,7 +865,7 @@
else else
$sSQL .= " limit ".$iLimit; $sSQL .= " limit ".$iLimit;
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) { var_dump($sSQL); }
$aViewBoxPlaceIDs = $oDB->getAll($sSQL); $aViewBoxPlaceIDs = $oDB->getAll($sSQL);
if (PEAR::IsError($aViewBoxPlaceIDs)) if (PEAR::IsError($aViewBoxPlaceIDs))
{ {
@@ -1418,7 +1419,7 @@
} }
// Absolute limit on number of results // Absolute limit on number of results
if (sizeof($aSearchResults) >= $iLimit) break; if (sizeof($aSearchResults) >= $iFinalLimit) break;
} }
$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '1 day'::interval,'YYYY/MM/DD') from import_status limit 1"); $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '1 day'::interval,'YYYY/MM/DD') from import_status limit 1");