hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 05:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

new query to search place nodes if no polygon was found

Browse Source
This commit is contained in:
gemo1011
2018-05-16 13:17:56 +02:00
parent 625018b654
commit 4d073b0350
1 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/ReverseGeocode.php
View File

@@ -69,8 +69,56 @@ class ReverseGeocode
); );
} }
protected function noPolygonfound($sPointSQL, $iMaxRank)
{
// search_rank => search diameter
$aRankDiam = array(
18 => 0.2,
17 => 0.6,
12 => 0.8,
10 => 1,
8 => 2,
4 => 3,
);
foreach ($aRankDiam as $key => $value) {
if ($key > $iMaxRank) continue;
$sSQL = 'SELECT *';
$sSQL .= ' FROM (';
$sSQL .= ' SELECT place_id, rank_address,country_code, geometry,';
$sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
$sSQL .= ' FROM placex';
$sSQL .= ' WHERE osm_type = \'N\'';
$sSQL .= ' AND rank_address > 0';
$sSQL .= ' AND rank_address <= ' .$key;
$sSQL .= ' AND type != \'postcode\'';
$sSQL .= ' AND name IS NOT NULL ';
$sSQL .= ' and indexed_status = 0 and linked_place_id is null';
$sSQL .= ' ORDER BY rank_address DESC, distance ASC';
$sSQL .= ' limit 500) as a';
$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$value.')';
$sSQL .= ' ORDER BY rank_address DESC, distance ASC';
$sSQL .= ' LIMIT 1';
if (CONST_Debug) var_dump($sSQL);
$aPlacNode = chksql(
$this->oDB->getRow($sSQL),
'Could not determine place node.'
);
if ($aPlacNode) {
return $aPlacNode;
break;
}
}
}
protected function lookupPolygon($sPointSQL, $iMaxRank) protected function lookupPolygon($sPointSQL, $iMaxRank)
{ {
$oResult = 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,country_code, geometry';
$sSQL .= ' FROM placex'; $sSQL .= ' FROM placex';
@@ -79,7 +127,6 @@ class ReverseGeocode
$sSQL .= ' AND geometry && '.$sPointSQL; $sSQL .= ' AND geometry && '.$sPointSQL;
$sSQL .= ' AND type != \'postcode\' '; $sSQL .= ' AND type != \'postcode\' ';
$sSQL .= ' AND name is not null'; $sSQL .= ' AND name is not null';
$sSQL .= ' AND class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
$sSQL .= ' AND indexed_status = 0 and linked_place_id is null'; $sSQL .= ' AND indexed_status = 0 and linked_place_id is null';
$sSQL .= ' ORDER BY rank_address DESC LIMIT 50 ) as a'; $sSQL .= ' ORDER BY rank_address DESC LIMIT 50 ) as a';
$sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.' )'; $sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.' )';
@@ -105,7 +152,6 @@ class ReverseGeocode
$sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); $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 class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
$sSQL .= ' and indexed_status = 0 and linked_place_id is null'; $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
// preselection through bbox // preselection through bbox
$sSQL .= ' AND (SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.') && geometry'; $sSQL .= ' AND (SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.') && geometry';
@@ -125,6 +171,8 @@ class ReverseGeocode
return $aPlacNode; return $aPlacNode;
} }
} }
}else{
return $this->noPolygonfound ($sPointSQL, $iMaxRank);
} }
return $aPoly; return $aPoly;
} }
@@ -161,13 +209,12 @@ class ReverseGeocode
$sSQL .= ' AND'; $sSQL .= ' AND';
// only streets // only streets
if ($iMaxRank == 26) { if ($iMaxRank == 26) {
$sSQL .= ' rank_address != 28 and rank_address = 26'; $sSQL .= ' rank_address = 26';
} else { } else {
$sSQL .= ' rank_address != 28 and rank_address >= 26'; $sSQL .= ' rank_address >= 26';
} }
$sSQL .= ' and (name is not null or housenumber is not null'; $sSQL .= ' and (name is not null or housenumber is not null';
$sSQL .= ' or rank_address between 26 and 27)'; $sSQL .= ' or rank_address between 26 and 27)';
//$sSQL .= ' and type not in (\'proposed\')';
$sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
$sSQL .= ' and indexed_status = 0 and linked_place_id is null'; $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') '; $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
@@ -220,7 +267,7 @@ class ReverseGeocode
} else { } else {
$aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
if ($aPlace) { if ($aPlace) {
$oResult = new Result($aPlace['place_id']); $oResult = new Result($aPlace['place_id']);
} }
} }
return $oResult; return $oResult;