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

better place node search with rank_search

Browse Source
This commit is contained in:
gemo1011
2018-05-24 13:45:45 +02:00
parent f0e5cf53b8
commit 82b6245aaa
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/ReverseGeocode.php
View File

@@ -70,7 +70,8 @@ class ReverseGeocode
} }
protected function noPolygonFound($sPointSQL, $iMaxRank) protected function noPolygonFound($sPointSQL, $iMaxRank)
{ {
// searches for polygon in table country_osm_grid which contains the searchpoint
$sSQL = 'SELECT * FROM country_osm_grid'; $sSQL = 'SELECT * FROM country_osm_grid';
$sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.' )'; $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.' )';
@@ -111,7 +112,7 @@ class ReverseGeocode
$aPlace = null; $aPlace = null;
$sSQL = 'SELECT * FROM'; $sSQL = 'SELECT * FROM';
$sSQL .= '(select place_id,parent_place_id,rank_address,country_code, geometry'; $sSQL .= '(select place_id,parent_place_id,rank_address, rank_search, country_code, geometry';
$sSQL .= ' FROM placex'; $sSQL .= ' FROM placex';
$sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')'; $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')';
$sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank);
@@ -130,6 +131,7 @@ class ReverseGeocode
if ($aPoly) { if ($aPoly) {
$iParentPlaceID = $aPoly['parent_place_id']; $iParentPlaceID = $aPoly['parent_place_id'];
$iRankAddress = $aPoly['rank_address']; $iRankAddress = $aPoly['rank_address'];
$iRankSearch = $aPoly['rank_search'];
$iPlaceID = $aPoly['place_id']; $iPlaceID = $aPoly['place_id'];
if ($iRankAddress != $iMaxRank) { if ($iRankAddress != $iMaxRank) {
@@ -139,8 +141,15 @@ class ReverseGeocode
$sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
$sSQL .= ' FROM placex'; $sSQL .= ' FROM placex';
$sSQL .= ' WHERE osm_type = \'N\''; $sSQL .= ' WHERE osm_type = \'N\'';
$sSQL .= ' AND rank_address > '.$iRankAddress; if ($iRankAddress = 16){
$sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); // using rank_search beacause of a better differentiation for place nodes at rank_address 16
$sSQL .= ' AND rank_search > '.$iRankSearch;
$sSQL .= ' AND rank_search <= ' .Min(25, $iMaxRank);
$sSQL .= ' AND class = \'place\'';
}else{
$sSQL .= ' AND rank_address > '.$iRankAddress;
$sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank);
}
$sSQL .= ' AND type != \'postcode\''; $sSQL .= ' AND type != \'postcode\'';
$sSQL .= ' AND name IS NOT NULL '; $sSQL .= ' AND name IS NOT NULL ';
$sSQL .= ' and indexed_status = 0 and linked_place_id is null'; $sSQL .= ' and indexed_status = 0 and linked_place_id is null';