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

recheck the rank limits before dropping out of the search loop - otherwise we can drop out too soon

Browse Source
This commit is contained in:
Brian Quinion
2013-06-11 17:13:37 +01:00
parent aa8c6e5f13
commit e26da936b3
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/search.php
View File

@@ -931,7 +931,9 @@
if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END"; if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
$aOrder[] = "$sImportanceSQL DESC"; $aOrder[] = "$sImportanceSQL DESC";
if (sizeof($aSearch['aFullNameAddress'])) if (sizeof($aSearch['aFullNameAddress']))
{
$aOrder[] = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) DESC'; $aOrder[] = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) DESC';
}
if (sizeof($aTerms)) if (sizeof($aTerms))
{ {
@@ -1148,6 +1150,19 @@
if ($iQueryLoop > 20) break; if ($iQueryLoop > 20) break;
} }
if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($iMinAddressRank != 0 || $iMaxAddressRank != 30))
{
// Need to verify passes rank limits before dropping out of the loop (yuk!)
$sSQL = "select place_id from placex where place_id in (".join(',',$aResultPlaceIDs).") ";
$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
$sSQL .= ") ";
if (CONST_Debug) var_dump($sSQL);
$aResultPlaceIDs = $oDB->getCol($sSQL);
}
//exit; //exit;
if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break; if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
if ($iGroupLoop > 4) break; if ($iGroupLoop > 4) break;