X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/de8888ec5885012afb03bafac3f577573fd64f64..3604d0d913ca99acd48f2f6d852e5971da8d8bae:/lib/ReverseGeocode.php diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 58baac79..032f442e 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -36,8 +36,8 @@ class ReverseGeocode 13 => 18, 14 => 22, // Suburb 15 => 22, - 16 => 26, // Street, TODO: major street? - 17 => 26, + 16 => 26, // major street + 17 => 27, // minor street 18 => 30, // or >, Building 19 => 30, // or >, Building ); @@ -47,14 +47,14 @@ class ReverseGeocode /** * Find the closest interpolation with the given search diameter. * - * @param string $sPointSQL Reverse geocoding point as SQL - * @param float $fSearchDiam Search diameter - * @param integer $iParentPlaceID Id of parent object + * @param string $sPointSQL Reverse geocoding point as SQL + * @param float $fSearchDiam Search diameter * * @return Record of the interpolation or null. */ - protected function lookupInterpolation($sPointSQL, $fSearchDiam, $iParentPlaceID = null) + protected function lookupInterpolation($sPointSQL, $fSearchDiam) { + Debug::newFunction('lookupInterpolation'); $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,'; $sSQL .= ' ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,'; $sSQL .= ' startnumber, endnumber, interpolationtype,'; @@ -62,53 +62,49 @@ 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'; + Debug::printSQL($sSQL); - return chksql( - $this->oDB->getRow($sSQL), + return $this->oDB->getRow( + $sSQL, + null, 'Could not determine closest housenumber on an osm interpolation line.' ); } - protected function polygonFunctions($sPointSQL, $iMaxRank) + protected function lookupLargeArea($sPointSQL, $iMaxRank) { - // starts the nopolygonFound function if no polygon is found with the lookupPolygon function $oResult = null; if ($iMaxRank > 4) { $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); if ($aPlace) { - $oResult = new Result($aPlace['place_id']); + return new Result($aPlace['place_id']); } } - // if no polygon which contains the searchpoint is found, - // the noPolygonFound function searches in the country_osm_grid table for a polygon - if (!$oResult) { - $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank); - if ($aPlace) { - $oResult = new Result($aPlace['place_id']); - } - } - return $oResult; + + // If no polygon which contains the searchpoint is found, + // searches in the country_osm_grid table for a polygon. + return $this->lookupInCountry($sPointSQL, $iMaxRank); } - protected function noPolygonFound($sPointSQL, $iMaxRank) + protected function lookupInCountry($sPointSQL, $iMaxRank) { + Debug::newFunction('lookupInCountry'); // 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 $sSQL = 'SELECT country_code FROM country_osm_grid'; - $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.') limit 1'; + $sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.') LIMIT 1'; + Debug::printSQL($sSQL); - $aPoly = chksql( - $this->oDB->getRow($sSQL), + $sCountryCode = $this->oDB->getOne( + $sSQL, + null, 'Could not determine country polygon containing the point.' ); - if ($aPoly) { - $sCountryCode = $aPoly['country_code']; + Debug::printVar('Country code', $sCountryCode); + if ($sCountryCode) { if ($iMaxRank > 4) { // look for place nodes with the given country code $sSQL = 'SELECT place_id FROM'; @@ -125,14 +121,13 @@ class ReverseGeocode $sSQL .= 'WHERE distance <= reverse_place_diameter(rank_search)'; $sSQL .= ' ORDER BY rank_search DESC, distance ASC'; $sSQL .= ' LIMIT 1'; + Debug::printSQL($sSQL); - if (CONST_Debug) var_dump($sSQL); - $aPlacNode = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine place node.' - ); - if ($aPlacNode) { - return $aPlacNode; + $aPlace = $this->oDB->getRow($sSQL, null, 'Could not determine place node.'); + Debug::printVar('Country node', $aPlace); + + if ($aPlace) { + return new Result($aPlace['place_id']); } } @@ -142,24 +137,35 @@ class ReverseGeocode $sSQL .= ' WHERE country_code = \''.$sCountryCode.'\''; $sSQL .= ' AND rank_search = 4 AND rank_address = 4'; $sSQL .= ' AND class in (\'boundary\', \'place\')'; + $sSQL .= ' AND linked_place_id is null'; $sSQL .= ' ORDER BY distance ASC'; + Debug::printSQL($sSQL); - if (CONST_Debug) var_dump($sSQL); - $aPlacNode = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine place node.' - ); - if ($aPlacNode) { - return $aPlacNode; + $aPlace = $this->oDB->getRow($sSQL, null, 'Could not determine place node.'); + Debug::printVar('Country place', $aPlace); + if ($aPlace) { + return new Result($aPlace['place_id']); } } + + return null; } + /** + * Search for areas or nodes for areas or nodes between state and suburb level. + * + * @param string $sPointSQL Search point as SQL string. + * @param int $iMaxRank Maximum address rank of the feature. + * + * @return Record of the found feature or null. + * + * Searches first for polygon that contains the search point. + * If such a polygon is found, place nodes with a higher rank are + * searched inside the polygon. + */ protected function lookupPolygon($sPointSQL, $iMaxRank) { - // searches for polygon where the searchpoint is within - // if a polygon is found, placenodes with a higher rank are searched inside the polygon - + Debug::newFunction('lookupPolygon'); // polygon search begins at suburb-level if ($iMaxRank > 25) $iMaxRank = 25; // no polygon search over country-level @@ -177,11 +183,11 @@ class ReverseGeocode $sSQL .= ' ORDER BY rank_address DESC LIMIT 50 ) as a'; $sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.' )'; $sSQL .= ' ORDER BY rank_address DESC LIMIT 1'; + Debug::printSQL($sSQL); + + $aPoly = $this->oDB->getRow($sSQL, null, 'Could not determine polygon containing the point.'); + Debug::printVar('Polygon result', $aPoly); - $aPoly = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine polygon containing the point.' - ); if ($aPoly) { // if a polygon is found, search for placenodes begins ... $iParentPlaceID = $aPoly['parent_place_id']; @@ -199,6 +205,7 @@ class ReverseGeocode // for place nodes at rank_address 16 $sSQL .= ' AND rank_search > '.$iRankSearch; $sSQL .= ' AND rank_search <= '.$iMaxRank; + $sSQL .= ' AND rank_address > 0'; $sSQL .= ' AND class = \'place\''; $sSQL .= ' AND type != \'postcode\''; $sSQL .= ' AND name IS NOT NULL '; @@ -211,14 +218,12 @@ class ReverseGeocode $sSQL .= ' AND distance <= reverse_place_diameter(rank_search)'; $sSQL .= ' ORDER BY distance ASC, rank_search DESC'; $sSQL .= ' LIMIT 1'; + Debug::printSQL($sSQL); - if (CONST_Debug) var_dump($sSQL); - $aPlacNode = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine place node.' - ); - if ($aPlacNode) { - return $aPlacNode; + $aPlaceNode = $this->oDB->getRow($sSQL, null, 'Could not determine place node.'); + Debug::printVar('Nearest place node', $aPlaceNode); + if ($aPlaceNode) { + return $aPlaceNode; } } } @@ -236,6 +241,7 @@ 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, @@ -246,8 +252,6 @@ class ReverseGeocode $fSearchDiam = 0.006; $oResult = null; $aPlace = null; - $fMaxAreaDistance = 1; - $bIsTigerStreet = false; // for POI or street level if ($iMaxRank >= 26) { @@ -257,110 +261,110 @@ class ReverseGeocode $sSQL .= ' placex'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; $sSQL .= ' AND'; - // only streets - if ($iMaxRank == 26) { - $sSQL .= ' rank_address = 26'; - } else { - $sSQL .= ' rank_address between 26 and '.$iMaxRank; - } + $sSQL .= ' rank_address between 26 and '.$iMaxRank; $sSQL .= ' and (name is not null or housenumber is not null'; $sSQL .= ' or rank_address between 26 and 27)'; - $sSQL .= ' and class not in (\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; + $sSQL .= ' and (rank_address between 26 and 27'; + $sSQL .= ' or ST_GeometryType(geometry) != \'ST_LineString\')'; + $sSQL .= ' and class not in (\'boundary\')'; $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') '; $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))'; $sSQL .= ' ORDER BY distance ASC limit 1'; - if (CONST_Debug) var_dump($sSQL); - $aPlace = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine closest place.' - ); + Debug::printSQL($sSQL); + + $aPlace = $this->oDB->getRow($sSQL, null, 'Could not determine closest place.'); + Debug::printVar('POI/street level result', $aPlace); if ($aPlace) { - $iDistance = $aPlace['distance']; $iPlaceID = $aPlace['place_id']; $oResult = new Result($iPlaceID); + $iRankAddress = $aPlace['rank_address']; $iParentPlaceID = $aPlace['parent_place_id']; + } - if ($bDoInterpolation && $iMaxRank >= 30) { - if ($aPlace['rank_address'] <=27) { - $iDistance = 0.001; - } - $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance); + if ($bDoInterpolation && $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 + // even when the street is closer. + $fDistance = $iRankAddress < 28 ? 0.001 : $aPlace['distance']; + } - if ($aHouse) { - $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); - $oResult->iHouseNumber = closestHouseNumber($aHouse); - } + $aHouse = $this->lookupInterpolation($sPointSQL, $fDistance); + Debug::printVar('Interpolation result', $aPlace); + + if ($aHouse) { + $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); + $oResult->iHouseNumber = closestHouseNumber($aHouse); + $aPlace = $aHouse; + $iRankAddress = 30; } + } + if ($aPlace) { // if street and maxrank > streetlevel - if (($aPlace['rank_address'] <=27)&& $iMaxRank > 27) { + if ($iRankAddress <= 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,'; + $sSQL = ' select place_id,'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' FROM '; $sSQL .= ' placex'; // radius ? $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, 0.001)'; $sSQL .= ' AND parent_place_id = '.$iPlaceID; - $sSQL .= ' and rank_address != 28'; + $sSQL .= ' and rank_address > 28'; + $sSQL .= ' and ST_GeometryType(geometry) != \'ST_LineString\''; $sSQL .= ' and (name is not null or housenumber is not null)'; - $sSQL .= ' and class not in (\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; + $sSQL .= ' and class not in (\'boundary\')'; $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; $sSQL .= ' ORDER BY distance ASC limit 1'; - if (CONST_Debug) var_dump($sSQL); - $aStreet = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine closest place.' - ); + Debug::printSQL($sSQL); + + $aStreet = $this->oDB->getRow($sSQL, null, 'Could not determine closest place.'); + Debug::printVar('Closest POI result', $aStreet); + if ($aStreet) { - $iDistance = $aStreet['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); - } - } + $oResult = new Result($aStreet['place_id']); } } // In the US we can check TIGER data for nearest housenumber - if (CONST_Use_US_Tiger_Data && $aPlace['country_code'] == 'us' && $this->iMaxRank >= 28) { - $fSearchDiam = $aPlace['rank_address'] > 28 ? $aPlace['distance'] : 0.001; + if (CONST_Use_US_Tiger_Data + && $iRankAddress <= 27 + && $aPlace['country_code'] == 'us' + && $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 .= ' FROM location_property_tiger WHERE parent_place_id = '.$oResult->iId; - $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; + $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, 0.001)'; $sSQL .= ' ORDER BY distance ASC limit 1'; - if (CONST_Debug) var_dump($sSQL); - $aPlaceTiger = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine closest Tiger place.' - ); + Debug::printSQL($sSQL); + + $aPlaceTiger = $this->oDB->getRow($sSQL, null, 'Could not determine closest Tiger place.'); + Debug::printVar('Tiger house number result', $aPlaceTiger); + if ($aPlaceTiger) { - if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger); - $aPlace = $aPlaceTiger; - $oResult = new Result($aPlace['place_id'], Result::TABLE_TIGER); + $oResult = new Result($aPlaceTiger['place_id'], Result::TABLE_TIGER); $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger); } } - // if no POI or street is found ... } else { - $oResult = $this->PolygonFunctions($sPointSQL, $iMaxRank); + // if no POI or street is found ... + $oResult = $this->lookupLargeArea($sPointSQL, 25); } - // lower than street level ($iMaxRank < 26 ) } else { - $oResult = $this->PolygonFunctions($sPointSQL, $iMaxRank); + // lower than street level ($iMaxRank < 26 ) + $oResult = $this->lookupLargeArea($sPointSQL, $iMaxRank); } + + Debug::printVar('Final result', $oResult); return $oResult; } }