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

apply rank restrictions already when scanning search_name table

Browse Source 
fixes #176
This commit is contained in:
Sarah Hoffmann
2014-09-03 21:00:37 +02:00
parent 0b545ba093
commit 5f79cca558
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Geocode.php
View File

@@ -1262,7 +1262,21 @@
}
}
if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank between 16 and 27";
if ($aSearch['sHouseNumber'])
{
$aTerms[] = "address_rank between 16 and 27";
}
else
{
if ($this->iMinAddressRank > 0)
{
$aTerms[] = "address_rank >= ".$this->iMinAddressRank;
}
if ($this->iMaxAddressRank < 30)
{
$aTerms[] = "address_rank <= ".$this->iMaxAddressRank;
}
}
if ($aSearch['fLon'] && $aSearch['fLat'])
{
$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";