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

Allow for tiger addresses when filtering by rank

Browse Source
This commit is contained in:
Brian Quinion
2013-06-11 17:28:30 +01:00
parent e26da936b3
commit 464fb913a8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/search.php
View File

@@ -144,10 +144,10 @@
array('amenity', 26, 30, false), array('amenity', 26, 30, false),
array('street', 26, 30, false), array('street', 26, 30, false),
array('city', 14, 24, false), array('city', 14, 24, false),
array('postalcode', 5, 11, array(5, 11)),
array('county', 9, 13, false), array('county', 9, 13, false),
array('state', 8, 8, false), array('state', 8, 8, false),
array('country', 4, 4, false), array('country', 4, 4, false),
array('postalcode', 5, 11, array(5, 11)),
); );
$aStructuredQuery = array(); $aStructuredQuery = array();
$sAllowedTypesSQLList = ''; $sAllowedTypesSQLList = '';
@@ -1157,7 +1157,10 @@
$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank "; $sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'"; if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")"; if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
$sSQL .= ") "; $sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',$aResultPlaceIDs).") ";
$sSQL .= "and (30 between $iMinAddressRank and $iMaxAddressRank ";
if ($aAddressRankList) $sSQL .= " OR 30 in (".join(',',$aAddressRankList).")";
$sSQL .= ")";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aResultPlaceIDs = $oDB->getCol($sSQL); $aResultPlaceIDs = $oDB->getCol($sSQL);
} }