X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/4d073b0350b5314698286becc4c0faf13b54bf1a..be091b17d9a46dcf4741d7e13c5c30b10c2e9962:/lib/ReverseGeocode.php diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index a6d4b76f..b2c2d170 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -52,7 +52,7 @@ class ReverseGeocode * * @return Record of the interpolation or null. */ - protected function lookupInterpolation($sPointSQL, $fSearchDiam) + protected function lookupInterpolation($sPointSQL, $fSearchDiam, $iParentPlaceID = null) { $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,'; $sSQL .= ' ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,'; @@ -61,6 +61,9 @@ class ReverseGeocode $sSQL .= ' FROM location_property_osmline'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; $sSQL .= ' and indexed_status = 0 and startnumber is not NULL '; + if (isset($iParentPlaceID)) { + $sSQL .= ' and parent_place_id = '.$iParentPlaceID; + } $sSQL .= ' ORDER BY distance ASC limit 1'; return chksql( @@ -69,36 +72,29 @@ class ReverseGeocode ); } - protected function noPolygonfound($sPointSQL, $iMaxRank) + 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, - ); + // searches for polygon in table country_osm_grid which contains the searchpoint + $sSQL = 'SELECT * FROM country_osm_grid'; + $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.' )'; - 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'; + $aPoly = chksql( + $this->oDB->getRow($sSQL), + 'Could not determine polygon containing the point.' + ); + if ($aPoly) { + $sCountryCode = $aPoly['country_code']; + + $sSQL = 'SELECT *, ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' FROM placex'; $sSQL .= ' WHERE osm_type = \'N\''; + $sSQL .= ' AND country_code = \''.$sCountryCode.'\''; $sSQL .= ' AND rank_address > 0'; - $sSQL .= ' AND rank_address <= ' .$key; + $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); $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 .= ' ORDER BY distance ASC, rank_address DESC'; $sSQL .= ' LIMIT 1'; if (CONST_Debug) var_dump($sSQL); @@ -108,7 +104,6 @@ class ReverseGeocode ); if ($aPlacNode) { return $aPlacNode; - break; } } } @@ -120,7 +115,7 @@ class ReverseGeocode $aPlace = null; $sSQL = 'SELECT * FROM'; - $sSQL .= '(select place_id,parent_place_id,rank_address,country_code, geometry'; + $sSQL .= '(select place_id,parent_place_id,rank_address, rank_search, country_code, geometry'; $sSQL .= ' FROM placex'; $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')'; $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); @@ -139,6 +134,7 @@ class ReverseGeocode if ($aPoly) { $iParentPlaceID = $aPoly['parent_place_id']; $iRankAddress = $aPoly['rank_address']; + $iRankSearch = $aPoly['rank_search']; $iPlaceID = $aPoly['place_id']; if ($iRankAddress != $iMaxRank) { @@ -148,8 +144,15 @@ class ReverseGeocode $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' FROM placex'; $sSQL .= ' WHERE osm_type = \'N\''; - $sSQL .= ' AND rank_address > '.$iRankAddress; - $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); + if ($iRankAddress = 16) { + // using rank_search because of a better differentiation for place nodes at rank_address 16 + $sSQL .= ' AND rank_search > '.$iRankSearch; + $sSQL .= ' AND rank_search <= ' .Min(25, $iMaxRank); + $sSQL .= ' AND class = \'place\''; + } else { + $sSQL .= ' AND rank_address > '.$iRankAddress; + $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); + } $sSQL .= ' AND type != \'postcode\''; $sSQL .= ' AND name IS NOT NULL '; $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; @@ -171,8 +174,6 @@ class ReverseGeocode return $aPlacNode; } } - }else{ - return $this->noPolygonfound ($sPointSQL, $iMaxRank); } return $aPoly; } @@ -196,7 +197,7 @@ class ReverseGeocode $aPlace = null; $fMaxAreaDistance = 1; $bIsTigerStreet = false; - + // for POI or street level if ($iMaxRank >= 26) { $sSQL = 'select place_id,parent_place_id,rank_address,country_code,'; @@ -227,10 +228,21 @@ class ReverseGeocode ); if ($aPlace) { - $iPlaceID = $aPlace['place_id']; - $oResult = new Result($iPlaceID); - $iParentPlaceID = $aPlace['parent_place_id']; - // if street and maxrank > streetlevel + + $iDistance = $aPlace['distance']; + $iPlaceID = $aPlace['place_id']; + $oResult = new Result($iPlaceID); + $iParentPlaceID = $aPlace['parent_place_id']; + + if ($bDoInterpolation && $iMaxRank >= 30) { + $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance); + + if ($aHouse) { + $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); + $oResult->iHouseNumber = closestHouseNumber($aHouse); + } + } + // if street and maxrank > streetlevel if (($aPlace['rank_address'] == 26 || $aPlace['rank_address'] == 27)&& $iMaxRank > 27) { // find the closest object (up to a certain radius) of which the street is a parent of $sSQL = ' select place_id,parent_place_id,rank_address,country_code,'; @@ -252,15 +264,31 @@ class ReverseGeocode 'Could not determine closest place.' ); if ($aStreet) { + $iDistance = $aPlace['distance']; $iPlaceID = $aStreet['place_id']; $oResult = new Result($iPlaceID); $iParentPlaceID = $aStreet['parent_place_id']; + + if ($bDoInterpolation && $iMaxRank >= 30) { + $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance, $iParentPlaceID); + + if ($aHouse) { + $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); + $oResult->iHouseNumber = closestHouseNumber($aHouse); + } + } } } + // if no POI or street is found ... } else { $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); if ($aPlace) { $oResult = new Result($aPlace['place_id']); + } elseif (!$aPlace && $iMaxRank > 4) { + $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank); + if ($aPlace) { + $oResult = new Result($aPlace['place_id']); + } } } // lower than street level ($iMaxRank < 26 ) @@ -268,6 +296,11 @@ class ReverseGeocode $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); if ($aPlace) { $oResult = new Result($aPlace['place_id']); + } elseif (!$aPlace && $iMaxRank > 4) { + $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank); + if ($aPlace) { + $oResult = new Result($aPlace['place_id']); + } } } return $oResult;