mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-03-11 05:14:07 +00:00
remove trailing spaces
This commit is contained in:
@@ -72,12 +72,12 @@ class ReverseGeocode
|
|||||||
'Could not determine closest housenumber on an osm interpolation line.'
|
'Could not determine closest housenumber on an osm interpolation line.'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function polygonFunctions($sPointSQL, $iMaxRank)
|
protected function polygonFunctions($sPointSQL, $iMaxRank)
|
||||||
{
|
{
|
||||||
// starts the nopolygonFound function if no polygon is found with the lookupPolygon function
|
// starts the nopolygonFound function if no polygon is found with the lookupPolygon function
|
||||||
$oResult = null;
|
$oResult = null;
|
||||||
|
|
||||||
$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']);
|
||||||
@@ -91,21 +91,21 @@ class ReverseGeocode
|
|||||||
}
|
}
|
||||||
return $oResult;
|
return $oResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function noPolygonFound($sPointSQL, $iMaxRank)
|
protected function noPolygonFound($sPointSQL, $iMaxRank)
|
||||||
{
|
{
|
||||||
// searches for polygon in table country_osm_grid which contains the searchpoint
|
// searches for polygon in table country_osm_grid which contains the searchpoint
|
||||||
// and searches for the nearest place node to the searchpoint in this polygon
|
// and searches for the nearest place node to the searchpoint in this polygon
|
||||||
$sSQL = 'SELECT country_code FROM country_osm_grid';
|
$sSQL = 'SELECT country_code FROM country_osm_grid';
|
||||||
$sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.') limit 1';
|
$sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.') limit 1';
|
||||||
|
|
||||||
$aPoly = chksql(
|
$aPoly = chksql(
|
||||||
$this->oDB->getRow($sSQL),
|
$this->oDB->getRow($sSQL),
|
||||||
'Could not determine polygon containing the point.'
|
'Could not determine polygon containing the point.'
|
||||||
);
|
);
|
||||||
if ($aPoly) {
|
if ($aPoly) {
|
||||||
$sCountryCode = $aPoly['country_code'];
|
$sCountryCode = $aPoly['country_code'];
|
||||||
|
|
||||||
$sSQL = 'SELECT place_id, ST_distance('.$sPointSQL.', geometry) as distance';
|
$sSQL = 'SELECT place_id, ST_distance('.$sPointSQL.', geometry) as distance';
|
||||||
$sSQL .= ' FROM placex';
|
$sSQL .= ' FROM placex';
|
||||||
$sSQL .= ' WHERE osm_type = \'N\'';
|
$sSQL .= ' WHERE osm_type = \'N\'';
|
||||||
@@ -118,7 +118,7 @@ class ReverseGeocode
|
|||||||
$sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, 1.0)';
|
$sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, 1.0)';
|
||||||
$sSQL .= ' ORDER BY distance ASC, rank_address DESC';
|
$sSQL .= ' ORDER BY distance ASC, rank_address DESC';
|
||||||
$sSQL .= ' LIMIT 1';
|
$sSQL .= ' LIMIT 1';
|
||||||
|
|
||||||
if (CONST_Debug) var_dump($sSQL);
|
if (CONST_Debug) var_dump($sSQL);
|
||||||
$aPlacNode = chksql(
|
$aPlacNode = chksql(
|
||||||
$this->oDB->getRow($sSQL),
|
$this->oDB->getRow($sSQL),
|
||||||
@@ -129,12 +129,12 @@ class ReverseGeocode
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function lookupPolygon($sPointSQL, $iMaxRank)
|
protected function lookupPolygon($sPointSQL, $iMaxRank)
|
||||||
{
|
{
|
||||||
// searches for polygon where the searchpoint is within
|
// searches for polygon where the searchpoint is within
|
||||||
// if a polygon is found, placenodes with a higher rank are searched inside the polygon
|
// if a polygon is found, placenodes with a higher rank are searched inside the polygon
|
||||||
|
|
||||||
// polygon search begins at suburb-level
|
// polygon search begins at suburb-level
|
||||||
if ($iMaxRank > 25) $iMaxRank = 25;
|
if ($iMaxRank > 25) $iMaxRank = 25;
|
||||||
// no polygon search over country-level
|
// no polygon search over country-level
|
||||||
@@ -163,7 +163,7 @@ class ReverseGeocode
|
|||||||
$iRankAddress = $aPoly['rank_address'];
|
$iRankAddress = $aPoly['rank_address'];
|
||||||
$iRankSearch = $aPoly['rank_search'];
|
$iRankSearch = $aPoly['rank_search'];
|
||||||
$iPlaceID = $aPoly['place_id'];
|
$iPlaceID = $aPoly['place_id'];
|
||||||
|
|
||||||
if ($iRankAddress != $iMaxRank) {
|
if ($iRankAddress != $iMaxRank) {
|
||||||
//search diameter for the place node search
|
//search diameter for the place node search
|
||||||
if ($iMaxRank <= 4) {
|
if ($iMaxRank <= 4) {
|
||||||
@@ -209,7 +209,7 @@ class ReverseGeocode
|
|||||||
$sSQL .= ' WHERE ST_CONTAINS((SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.'), geometry )';
|
$sSQL .= ' WHERE ST_CONTAINS((SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.'), geometry )';
|
||||||
$sSQL .= ' ORDER BY distance ASC, rank_address DESC';
|
$sSQL .= ' ORDER BY distance ASC, rank_address DESC';
|
||||||
$sSQL .= ' LIMIT 1';
|
$sSQL .= ' LIMIT 1';
|
||||||
|
|
||||||
if (CONST_Debug) var_dump($sSQL);
|
if (CONST_Debug) var_dump($sSQL);
|
||||||
$aPlacNode = chksql(
|
$aPlacNode = chksql(
|
||||||
$this->oDB->getRow($sSQL),
|
$this->oDB->getRow($sSQL),
|
||||||
@@ -222,7 +222,7 @@ class ReverseGeocode
|
|||||||
}
|
}
|
||||||
return $aPoly;
|
return $aPoly;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function lookup($fLat, $fLon, $bDoInterpolation = true)
|
public function lookup($fLat, $fLon, $bDoInterpolation = true)
|
||||||
{
|
{
|
||||||
@@ -246,7 +246,7 @@ class ReverseGeocode
|
|||||||
$aPlace = null;
|
$aPlace = null;
|
||||||
$fMaxAreaDistance = 1;
|
$fMaxAreaDistance = 1;
|
||||||
$bIsTigerStreet = false;
|
$bIsTigerStreet = false;
|
||||||
|
|
||||||
// for POI or street level
|
// for POI or street level
|
||||||
if ($iMaxRank >= 26) {
|
if ($iMaxRank >= 26) {
|
||||||
$sSQL = 'select place_id,parent_place_id,rank_address,country_code,';
|
$sSQL = 'select place_id,parent_place_id,rank_address,country_code,';
|
||||||
@@ -275,14 +275,14 @@ class ReverseGeocode
|
|||||||
$this->oDB->getRow($sSQL),
|
$this->oDB->getRow($sSQL),
|
||||||
'Could not determine closest place.'
|
'Could not determine closest place.'
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($aPlace) {
|
if ($aPlace) {
|
||||||
|
|
||||||
$iDistance = $aPlace['distance'];
|
$iDistance = $aPlace['distance'];
|
||||||
$iPlaceID = $aPlace['place_id'];
|
$iPlaceID = $aPlace['place_id'];
|
||||||
$oResult = new Result($iPlaceID);
|
$oResult = new Result($iPlaceID);
|
||||||
$iParentPlaceID = $aPlace['parent_place_id'];
|
$iParentPlaceID = $aPlace['parent_place_id'];
|
||||||
|
|
||||||
if ($bDoInterpolation && $iMaxRank >= 30) {
|
if ($bDoInterpolation && $iMaxRank >= 30) {
|
||||||
if ($aPlace['rank_address'] <=27) {
|
if ($aPlace['rank_address'] <=27) {
|
||||||
$iDistance = 0.001;
|
$iDistance = 0.001;
|
||||||
@@ -294,7 +294,7 @@ class ReverseGeocode
|
|||||||
$oResult->iHouseNumber = closestHouseNumber($aHouse);
|
$oResult->iHouseNumber = closestHouseNumber($aHouse);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if street and maxrank > streetlevel
|
// if street and maxrank > streetlevel
|
||||||
if (($aPlace['rank_address'] <=27)&& $iMaxRank > 27) {
|
if (($aPlace['rank_address'] <=27)&& $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
|
||||||
@@ -320,7 +320,7 @@ class ReverseGeocode
|
|||||||
$iPlaceID = $aStreet['place_id'];
|
$iPlaceID = $aStreet['place_id'];
|
||||||
$oResult = new Result($iPlaceID);
|
$oResult = new Result($iPlaceID);
|
||||||
$iParentPlaceID = $aStreet['parent_place_id'];
|
$iParentPlaceID = $aStreet['parent_place_id'];
|
||||||
|
|
||||||
if ($bDoInterpolation && $iMaxRank >= 30) {
|
if ($bDoInterpolation && $iMaxRank >= 30) {
|
||||||
$aHouse = $this->lookupInterpolation($sPointSQL, $iDistance, $iParentPlaceID);
|
$aHouse = $this->lookupInterpolation($sPointSQL, $iDistance, $iParentPlaceID);
|
||||||
|
|
||||||
@@ -331,7 +331,7 @@ class ReverseGeocode
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// In the US we can check TIGER data for nearest housenumber
|
// In the US we can check TIGER data for nearest housenumber
|
||||||
if (CONST_Use_US_Tiger_Data && $aPlace['country_code'] == 'us' && $this->iMaxRank >= 28) {
|
if (CONST_Use_US_Tiger_Data && $aPlace['country_code'] == 'us' && $this->iMaxRank >= 28) {
|
||||||
$fSearchDiam = $aPlace['rank_address'] > 28 ? $aPlace['distance'] : 0.001;
|
$fSearchDiam = $aPlace['rank_address'] > 28 ? $aPlace['distance'] : 0.001;
|
||||||
|
|||||||
Reference in New Issue
Block a user