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

Merge pull request #745 from lonvia/restrict-poi-queries-results

Browse Source 
limit number of considered places in POI queries
This commit is contained in:
Sarah Hoffmann
2017-06-06 20:55:15 +02:00
committed by GitHub
parent 0628aa887f c13094acfd
commit 6985abc3fd
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Geocode.php
View File

@@ -1555,8 +1555,9 @@ class Geocode
}
if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') { // & in
$sClassTable = 'place_classtype_'.$aSearch['sClass'].'_'.$aSearch['sType'];
$sSQL = "SELECT count(*) FROM pg_tables ";
$sSQL .= "WHERE tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
$sSQL .= "WHERE tablename = '$sClassTable'";
$bCacheTable = chksql($this->oDB->getOne($sSQL));
$sSQL = "SELECT min(rank_search) FROM placex WHERE place_id in ($sPlaceIDs)";
@@ -1604,7 +1605,8 @@ class Geocode
$sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
}
$sSQL = "select distinct l.place_id".($sOrderBySQL?','.$sOrderBySQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
$sSQL = "select distinct i.place_id".($sOrderBySQL?', i.order_term':'')." from (";
$sSQL .= "select l.place_id".($sOrderBySQL?','.$sOrderBySQL.' as order_term':'')." from ".$sClassTable." as l";
if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";
if ($sPlaceIDs) {
$sSQL .= ",placex as f where ";
@@ -1618,7 +1620,8 @@ class Geocode
$sSQL .= " and l.place_id not in (".join(',', $this->aExcludePlaceIDs).")";
}
if ($sCountryCodesSQL) $sSQL .= " and lp.country_code in ($sCountryCodesSQL)";
if ($sOrderBySQL) $sSQL .= "order by ".$sOrderBySQL." asc";
$sSQL .= 'limit 300) i ';
if ($sOrderBySQL) $sSQL .= "order by order_term asc";
if ($this->iOffset) $sSQL .= " offset $this->iOffset";
$sSQL .= " limit $this->iLimit";
if (CONST_Debug) var_dump($sSQL);

2
test/bdd/api/search/queries.feature
View File

@@ -52,7 +52,7 @@ Feature: Search queries
| way |
Scenario: Search with class-type feature
When sending jsonv2 search query "Hotel California"
When sending jsonv2 search query "Hotel in California"
Then results contain
| place_rank |
| 30 |