osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-28 05:48:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

allow for offset paramater in amenity searches

Browse Source
This commit is contained in:
Brian Quinion 2011-05-23 16:36:36 +00:00
parent 4dfbf2517b
commit 616c7e2b40
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
website/search.php
View File

@ -896,9 +896,14 @@
if ($bCacheTable) if ($bCacheTable)
{ {
// More efficient - can make the range bigger // More efficient - can make the range bigger
$fRange = 0.05; $fRange = 0.05;
$sSQL = "select l.place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l"; $sOrderBySQL = '';
if ($sNearPointSQL) $sOrderBySQL .= "ST_Distance($sNearPointSQL, l.centroid)";
else if ($sPlaceIDs) $sOrderBySQL .= "ST_Distance(l.centroid, f.geometry)";
else if ($sPlaceGeom) $sOrderBysSQL .= "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
$sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)"; if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";
if ($sPlaceIDs) if ($sPlaceIDs)
{ {
@ -915,10 +920,8 @@
$sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")"; $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
} }
if ($sCountryCodesSQL) $sSQL .= " and lp.country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " and lp.country_code in ($sCountryCodesSQL)";
if ($sNearPointSQL) $sSQL .= " order by ST_Distance($sNearPointSQL, l.centroid) ASC"; if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";
else if ($sPlaceIDs) $sSQL .= " order by ST_Distance(l.centroid, f.geometry) asc"; if ($iOffset) $sSQL .= " offset $iOffset";
else if ($sPlaceGeom) $sSQL .= " order by ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid) asc";
$sSQL .= " limit $iLimit"; $sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = $oDB->getCol($sSQL); $aPlaceIDs = $oDB->getCol($sSQL);
@ -926,7 +929,12 @@
else else
{ {
if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius']; if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius'];
$sSQL = "select l.place_id from placex as l,placex as f where ";
$sOrderBySQL = '';
if ($sNearPointSQL) $sOrderBySQL .= "ST_Distance($sNearPointSQL, l.geometry)";
else $sOrderBySQL .= "ST_Distance(l.geometry, f.geometry)";
$sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from placex as l,placex as f where ";
$sSQL .= "f.place_id in ( $sPlaceIDs) and ST_DWithin(l.geometry, st_centroid(f.geometry), $fRange) "; $sSQL .= "f.place_id in ( $sPlaceIDs) and ST_DWithin(l.geometry, st_centroid(f.geometry), $fRange) ";
$sSQL .= "and l.class='".$aSearch['sClass']."' and l.type='".$aSearch['sType']."' "; $sSQL .= "and l.class='".$aSearch['sClass']."' and l.type='".$aSearch['sType']."' ";
if (sizeof($aExcludePlaceIDs)) if (sizeof($aExcludePlaceIDs))
@ -934,8 +942,8 @@
$sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")"; $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
} }
if ($sCountryCodesSQL) $sSQL .= " and l.country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " and l.country_code in ($sCountryCodesSQL)";
if ($sNearPointSQL) $sSQL .= " order by ST_Distance($sNearPointSQL, l.geometry) ASC"; if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";
else $sSQL .= " order by ST_Distance(l.geometry, f.geometry) asc, l.rank_search ASC"; if ($iOffset) $sSQL .= " offset $iOffset";
$sSQL .= " limit $iLimit"; $sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = $oDB->getCol($sSQL); $aPlaceIDs = $oDB->getCol($sSQL);