hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

deleted query for place nodes search if no polygon is found and added search for interpolation lines

Browse Source
This commit is contained in:
gemo1011
2018-05-17 14:24:03 +02:00
parent 4d073b0350
commit 10897787af
1 changed files with 17 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/ReverseGeocode.php
View File

@@ -68,51 +68,7 @@ class ReverseGeocode
'Could not determine closest housenumber on an osm interpolation line.'
);
}
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)
{
@@ -171,8 +127,6 @@ class ReverseGeocode
return $aPlacNode;
}
}
}else{
return $this->noPolygonfound ($sPointSQL, $iMaxRank);
}
return $aPoly;
}
@@ -197,6 +151,22 @@ class ReverseGeocode
$fMaxAreaDistance = 1;
$bIsTigerStreet = false;
// try with interpolations before continuing
if ($bDoInterpolation && $iMaxRank >= 30 ) {
$aHouse = $this->lookupInterpolation($sPointSQL, $fSearchDiam/3);
if ($aHouse) {
$oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
$oResult->iHouseNumber = closestHouseNumber($aHouse);
$aPlace = $aHouse;
$iParentPlaceID = $aHouse['parent_place_id']; // the street
$iMaxRank = 30;
return $oResult;
}
}// no interpolation found, continue search
// for POI or street level
if ($iMaxRank >= 26) {
$sSQL = 'select place_id,parent_place_id,rank_address,country_code,';