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

if doing structured query limit the types of osm place returned

Browse Source
This commit is contained in:
Brian Quinion
2012-12-08 21:40:20 +00:00
parent 274f381052
commit 0dafda7327
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/search.php
View File

@@ -23,9 +23,10 @@
$iOffset = isset($_GET['offset'])?(int)$_GET['offset']:0; $iOffset = isset($_GET['offset'])?(int)$_GET['offset']:0;
$iMaxRank = 20; $iMaxRank = 20;
if ($iFinalLimit > 50) $iFinalLimit = 50; if ($iFinalLimit > 50) $iFinalLimit = 50;
$iLimit = $iFinalLimit + min($iFinalLimit, 10); $iLimit = $iFinalLimit + min($iFinalLimit, 10);
$iMinAddressRank = 0; $iMinAddressRank = 0;
$iMaxAddressRank = 30; $iMaxAddressRank = 30;
$sAllowedTypesSQLList = false;
// Format for output // Format for output
if (isset($_GET['format']) && ($_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2')) if (isset($_GET['format']) && ($_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
@@ -154,12 +155,14 @@
array('postalcode', 16, 25), array('postalcode', 16, 25),
); );
$aStructuredQuery = array(); $aStructuredQuery = array();
$sAllowedTypesSQLList = '';
foreach($aStructuredOptions as $aStructuredOption) foreach($aStructuredOptions as $aStructuredOption)
{ {
loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2]); loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2]);
} }
if (sizeof($aStructuredQuery) > 0) { if (sizeof($aStructuredQuery) > 0) {
$sQuery = join(', ', $aStructuredQuery); $sQuery = join(', ', $aStructuredQuery);
$sAllowedTypesSQLList = '(\'place\',\'boundary\')';
} }
if ($sQuery) if ($sQuery)
@@ -1133,6 +1136,7 @@
$sSQL .= "coalesce(importance,0.9-(rank_search::float/30)) as importance "; $sSQL .= "coalesce(importance,0.9-(rank_search::float/30)) as importance ";
$sSQL .= "from placex where place_id in ($sPlaceIDs) "; $sSQL .= "from placex where place_id in ($sPlaceIDs) ";
$sSQL .= "and placex.rank_address between $iMinAddressRank and $iMaxAddressRank "; $sSQL .= "and placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
$sSQL .= "and linked_place_id is null "; $sSQL .= "and linked_place_id is null ";
$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,country_code,importance"; $sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,country_code,importance";
if (!$bDeDupe) $sSQL .= ",place_id"; if (!$bDeDupe) $sSQL .= ",place_id";