X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0d9fe6e49c3cee131d2fd0c2c0ad2e59065621f9..c4b13f2b7fffa410074e2c54428645135ef2ee72:/lib-php/ReverseGeocode.php diff --git a/lib-php/ReverseGeocode.php b/lib-php/ReverseGeocode.php index cf396b7a..2aea9038 100644 --- a/lib-php/ReverseGeocode.php +++ b/lib-php/ReverseGeocode.php @@ -1,4 +1,12 @@ 4) { $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); if ($aPlace) { @@ -113,6 +122,7 @@ class ReverseGeocode $sSQL .= ' FROM placex'; $sSQL .= ' WHERE osm_type = \'N\''; $sSQL .= ' AND country_code = \''.$sCountryCode.'\''; + $sSQL .= ' AND rank_search < 26 '; // needed to select right index $sSQL .= ' AND rank_search between 5 and ' .min(25, $iMaxRank); $sSQL .= ' AND class = \'place\' AND type != \'postcode\''; $sSQL .= ' AND name IS NOT NULL '; @@ -167,9 +177,13 @@ class ReverseGeocode { Debug::newFunction('lookupPolygon'); // polygon search begins at suburb-level - if ($iMaxRank > 25) $iMaxRank = 25; + if ($iMaxRank > 25) { + $iMaxRank = 25; + } // no polygon search over country-level - if ($iMaxRank < 5) $iMaxRank = 5; + if ($iMaxRank < 5) { + $iMaxRank = 5; + } // search for polygon $sSQL = 'SELECT place_id, parent_place_id, rank_address, rank_search FROM'; $sSQL .= '(select place_id, parent_place_id, rank_address, rank_search, country_code, geometry'; @@ -190,7 +204,6 @@ class ReverseGeocode if ($aPoly) { // if a polygon is found, search for placenodes begins ... - $iParentPlaceID = $aPoly['parent_place_id']; $iRankAddress = $aPoly['rank_address']; $iRankSearch = $aPoly['rank_search']; $iPlaceID = $aPoly['place_id']; @@ -205,6 +218,7 @@ class ReverseGeocode // for place nodes at rank_address 16 $sSQL .= ' AND rank_search > '.$iRankSearch; $sSQL .= ' AND rank_search <= '.$iMaxRank; + $sSQL .= ' AND rank_search < 26 '; // needed to select right index $sSQL .= ' AND rank_address > 0'; $sSQL .= ' AND class = \'place\''; $sSQL .= ' AND type != \'postcode\''; @@ -242,26 +256,24 @@ class ReverseGeocode public function lookupPoint($sPointSQL, $bDoInterpolation = true) { 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 $fSearchDiam = 0.006; $oResult = null; $aPlace = null; // 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 chosen. $sSQL = 'select place_id,parent_place_id,rank_address,country_code,'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' FROM '; $sSQL .= ' placex'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; $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 .= ' or rank_address between 26 and 27)'; $sSQL .= ' and (rank_address between 26 and 27'; @@ -284,7 +296,7 @@ class ReverseGeocode if ($aPlace) { // 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 $sSQL = ' select place_id,'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; @@ -318,9 +330,9 @@ class ReverseGeocode && $this->iMaxRank >= 28 ) { $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search,'; - $sSQL .= 'ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,'; - $sSQL .= 'ST_distance('.$sPointSQL.', linegeo) as distance,'; - $sSQL .= 'startnumber,endnumber,interpolationtype'; + $sSQL .= ' (endnumber - startnumber) * ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fhnr,'; + $sSQL .= ' startnumber, endnumber, step,'; + $sSQL .= ' ST_Distance('.$sPointSQL.', linegeo) as distance'; $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$oResult->iId; $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, 0.001)'; $sSQL .= ' ORDER BY distance ASC limit 1'; @@ -332,19 +344,23 @@ class ReverseGeocode if ($aPlaceTiger) { $aPlace = $aPlaceTiger; $oResult = new Result($aPlaceTiger['place_id'], Result::TABLE_TIGER); - $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger); + $iRndNum = max(0, round($aPlaceTiger['fhnr'] / $aPlaceTiger['step']) * $aPlaceTiger['step']); + $oResult->iHouseNumber = $aPlaceTiger['startnumber'] + $iRndNum; + if ($oResult->iHouseNumber > $aPlaceTiger['endnumber']) { + $oResult->iHouseNumber = $aPlaceTiger['endnumber']; + } $iRankAddress = 30; } } } - if ($bDoInterpolation && $iMaxRank >= 30) { + if ($bDoInterpolation && $this->iMaxRank >= 30) { $fDistance = $fSearchDiam; if ($aPlace) { // We can't reliably go from the closest street to an // interpolation line because the closest interpolation // may have a different street segments as a parent. - // Therefore allow an interpolation line to take precendence + // Therefore allow an interpolation line to take precedence // even when the street is closer. $fDistance = $iRankAddress < 28 ? 0.001 : $aPlace['distance']; } @@ -354,9 +370,12 @@ class ReverseGeocode if ($aHouse) { $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); - $oResult->iHouseNumber = closestHouseNumber($aHouse); + $iRndNum = max(0, round($aHouse['fhnr'] / $aHouse['step']) * $aHouse['step']); + $oResult->iHouseNumber = $aHouse['startnumber'] + $iRndNum; + if ($oResult->iHouseNumber > $aHouse['endnumber']) { + $oResult->iHouseNumber = $aHouse['endnumber']; + } $aPlace = $aHouse; - $iRankAddress = 30; } } @@ -366,7 +385,7 @@ class ReverseGeocode } } else { // lower than street level ($iMaxRank < 26 ) - $oResult = $this->lookupLargeArea($sPointSQL, $iMaxRank); + $oResult = $this->lookupLargeArea($sPointSQL, $this->iMaxRank); } Debug::printVar('Final result', $oResult);