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

avoid local variable assignment

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-07-11 23:22:16 +02:00
parent 000d133af6
commit 128ca800cd
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib-php/ReverseGeocode.php
View File

@@ -243,26 +243,24 @@ class ReverseGeocode
public function lookupPoint($sPointSQL, $bDoInterpolation = true) public function lookupPoint($sPointSQL, $bDoInterpolation = true)
{ {
Debug::newFunction('lookupPoint'); Debug::newFunction('lookupPoint');
// starts if the search is on POI or street level,
// searches for the nearest POI or street,
// if a street is found and a POI is searched for,
// the nearest POI which the found street is a parent of is choosen.
$iMaxRank = $this->iMaxRank;
// Find the nearest point // Find the nearest point
$fSearchDiam = 0.006; $fSearchDiam = 0.006;
$oResult = null; $oResult = null;
$aPlace = null; $aPlace = null;
// for POI or street level // for POI or street level
if ($iMaxRank >= 26) { if ($this->iMaxRank >= 26) {
// starts if the search is on POI or street level,
// searches for the nearest POI or street,
// if a street is found and a POI is searched for,
// the nearest POI which the found street is a parent of is choosen.
$sSQL = 'select place_id,parent_place_id,rank_address,country_code,'; $sSQL = 'select place_id,parent_place_id,rank_address,country_code,';
$sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
$sSQL .= ' FROM '; $sSQL .= ' FROM ';
$sSQL .= ' placex'; $sSQL .= ' placex';
$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
$sSQL .= ' AND'; $sSQL .= ' AND';
$sSQL .= ' rank_address between 26 and '.$iMaxRank; $sSQL .= ' rank_address between 26 and '.$this->iMaxRank;
$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 (rank_address between 26 and 27'; $sSQL .= ' and (rank_address between 26 and 27';
@@ -285,7 +283,7 @@ class ReverseGeocode
if ($aPlace) { if ($aPlace) {
// if street and maxrank > streetlevel // if street and maxrank > streetlevel
if ($iRankAddress <= 27 && $iMaxRank > 27) { if ($iRankAddress <= 27 && $this->iMaxRank > 27) {
// find the closest object (up to a certain radius) of which the street is a parent of // find the closest object (up to a certain radius) of which the street is a parent of
$sSQL = ' select place_id,'; $sSQL = ' select place_id,';
$sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
@@ -339,7 +337,7 @@ class ReverseGeocode
} }
} }
if ($bDoInterpolation && $iMaxRank >= 30) { if ($bDoInterpolation && $this->iMaxRank >= 30) {
$fDistance = $fSearchDiam; $fDistance = $fSearchDiam;
if ($aPlace) { if ($aPlace) {
// We can't reliably go from the closest street to an // We can't reliably go from the closest street to an
@@ -366,7 +364,7 @@ class ReverseGeocode
} }
} else { } else {
// lower than street level ($iMaxRank < 26 ) // lower than street level ($iMaxRank < 26 )
$oResult = $this->lookupLargeArea($sPointSQL, $iMaxRank); $oResult = $this->lookupLargeArea($sPointSQL, $this->iMaxRank);
} }
Debug::printVar('Final result', $oResult); Debug::printVar('Final result', $oResult);