X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f7258e314d3592ade68c6a34dec319d67354b211..5a6da83577935cf4622efa6c7ec32baf80d370fc:/lib/ReverseGeocode.php?ds=inline diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index a7bfad63..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 ); @@ -54,6 +54,7 @@ class ReverseGeocode */ 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,13 +63,174 @@ class ReverseGeocode $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; $sSQL .= ' and indexed_status = 0 and startnumber is not NULL '; $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 lookupLargeArea($sPointSQL, $iMaxRank) + { + $oResult = null; + + if ($iMaxRank > 4) { + $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); + if ($aPlace) { + return new Result($aPlace['place_id']); + } + } + + // 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 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'; + Debug::printSQL($sSQL); + + $sCountryCode = $this->oDB->getOne( + $sSQL, + null, + 'Could not determine country polygon containing the point.' + ); + Debug::printVar('Country code', $sCountryCode); + + if ($sCountryCode) { + if ($iMaxRank > 4) { + // look for place nodes with the given country code + $sSQL = 'SELECT place_id FROM'; + $sSQL .= ' (SELECT place_id, rank_search,'; + $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; + $sSQL .= ' FROM placex'; + $sSQL .= ' WHERE osm_type = \'N\''; + $sSQL .= ' AND country_code = \''.$sCountryCode.'\''; + $sSQL .= ' AND rank_search between 5 and ' .min(25, $iMaxRank); + $sSQL .= ' AND class = \'place\' AND type != \'postcode\''; + $sSQL .= ' AND name IS NOT NULL '; + $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; + $sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, 1.8)) p '; + $sSQL .= 'WHERE distance <= reverse_place_diameter(rank_search)'; + $sSQL .= ' ORDER BY rank_search DESC, distance ASC'; + $sSQL .= ' LIMIT 1'; + Debug::printSQL($sSQL); + + $aPlace = $this->oDB->getRow($sSQL, null, 'Could not determine place node.'); + Debug::printVar('Country node', $aPlace); + + if ($aPlace) { + return new Result($aPlace['place_id']); + } + } + + // still nothing, then return the country object + $sSQL = 'SELECT place_id, ST_distance('.$sPointSQL.', centroid) as distance'; + $sSQL .= ' FROM placex'; + $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); + + $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) + { + Debug::newFunction('lookupPolygon'); + // polygon search begins at suburb-level + if ($iMaxRank > 25) $iMaxRank = 25; + // no polygon search over country-level + 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'; + $sSQL .= ' FROM placex'; + $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')'; + $sSQL .= ' AND rank_address Between 5 AND ' .$iMaxRank; + $sSQL .= ' AND geometry && '.$sPointSQL; + $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 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); + + 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']; + + if ($iRankAddress != $iMaxRank) { + $sSQL = 'SELECT place_id FROM '; + $sSQL .= '(SELECT place_id, rank_search, country_code, geometry,'; + $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; + $sSQL .= ' FROM placex'; + $sSQL .= ' WHERE osm_type = \'N\''; + // using rank_search because of a better differentiation + // 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 '; + $sSQL .= ' AND indexed_status = 0 AND linked_place_id is null'; + $sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, reverse_place_diameter('.$iRankSearch.'::smallint))'; + $sSQL .= ' ORDER BY distance ASC,'; + $sSQL .= ' rank_address DESC'; + $sSQL .= ' limit 500) as a'; + $sSQL .= ' WHERE ST_CONTAINS((SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.'), geometry )'; + $sSQL .= ' AND distance <= reverse_place_diameter(rank_search)'; + $sSQL .= ' ORDER BY distance ASC, rank_search DESC'; + $sSQL .= ' LIMIT 1'; + Debug::printSQL($sSQL); + + $aPlaceNode = $this->oDB->getRow($sSQL, null, 'Could not determine place node.'); + Debug::printVar('Nearest place node', $aPlaceNode); + if ($aPlaceNode) { + return $aPlaceNode; + } + } + } + return $aPoly; + } + + public function lookup($fLat, $fLon, $bDoInterpolation = true) { return $this->lookupPoint( @@ -79,143 +241,130 @@ 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.0004; + $fSearchDiam = 0.006; $oResult = null; $aPlace = null; - $fMaxAreaDistance = 1; - $bIsTigerStreet = false; - while ($oResult === null && $fSearchDiam < $fMaxAreaDistance) { - $fSearchDiam = $fSearchDiam * 2; - - // If we have to expand the search area by a large amount then we need a larger feature - // then there is a limit to how small the feature should be - if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4; - if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8; - if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10; - if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12; - if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17; - if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18; - if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22; - if ($fSearchDiam > 0.001 && $iMaxRank > 26) { - // try with interpolations before continuing - if ($bDoInterpolation) { - $aHouse = $this->lookupInterpolation($sPointSQL, $fSearchDiam/2); - - if ($aHouse) { - $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); - $oResult->iHouseNumber = closestHouseNumber($aHouse); - - $aPlace = $aHouse; - $iParentPlaceID = $aHouse['parent_place_id']; // the street - $iMaxRank = 30; - - break; - } - } - // no interpolation found, continue search - $iMaxRank = 26; - } - $sSQL = 'select place_id,parent_place_id,rank_search,country_code,'; - $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; + // for POI or street level + if ($iMaxRank >= 26) { + $sSQL = 'select place_id,parent_place_id,rank_address,country_code,'; + $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' FROM '; - if ($fSearchDiam < 0.01) { - $sSQL .= ' placex'; - $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; - $sSQL .= ' AND'; - } else { - $sSQL .= ' (SELECT * FROM placex '; - $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; - $sSQL .= ' LIMIT 1000) as p WHERE'; - } - $sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank; - $sSQL .= ' and (name is not null or housenumber is not null)'; - $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; + $sSQL .= ' placex'; + $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; + $sSQL .= ' AND'; + $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 (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) { - $oResult = new Result($aPlace['place_id']); + $iPlaceID = $aPlace['place_id']; + $oResult = new Result($iPlaceID); + $iRankAddress = $aPlace['rank_address']; $iParentPlaceID = $aPlace['parent_place_id']; - if ($bDoInterpolation) { - if ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27) { - $bIsTigerStreet = ($aPlace['country_code'] == 'us'); - } elseif ($aPlace['rank_search'] == 30) { - // If a house was found, make sure there isn't an - // interpolation line that is closer. - $aHouse = $this->lookupInterpolation( - $sPointSQL, - $aPlace['distance'] - ); - if ($aHouse && $aPlace['distance'] < $aHouse['distance']) { - $oResult = new Result( - $aHouse['place_id'], - Result::TABLE_OSMLINE - ); - $oResult->iHouseNumber = closestHouseNumber($aHouse); - - $aPlace = $aHouse; - $iParentPlaceID = $aHouse['parent_place_id']; - } - } - } } - } - // Only street found? In the US we can check TIGER data for nearest housenumber - if (CONST_Use_US_Tiger_Data && $bIsTigerStreet && $this->iMaxRank >= 28) { - $fSearchDiam = $aPlace['rank_search'] > 28 ? $aPlace['distance'] : 0.001; - $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 .= ' ORDER BY distance ASC limit 1'; + 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 (CONST_Debug) var_dump($sSQL); - - $aPlaceTiger = chksql( - $this->oDB->getRow($sSQL), - 'Could not determine closest Tiger place.' - ); - if ($aPlaceTiger) { - if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger); - $aPlace = $aPlaceTiger; - $oResult = new Result($aPlace['place_id'], Result::TABLE_TIGER); - $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger); - $iParentPlaceID = $aPlace['parent_place_id']; - $iMaxRank = 30; + $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; + } } - } - // The point we found might be too small - use the address to find what it is a child of - if ($oResult !== null && $iMaxRank < 28) { - if ($aPlace['rank_search'] > 28 && $iParentPlaceID) { - $iPlaceID = $iParentPlaceID; + if ($aPlace) { + // if street and maxrank > streetlevel + 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,'; + $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 ST_GeometryType(geometry) != \'ST_LineString\''; + $sSQL .= ' and (name is not null or housenumber is not null)'; + $sSQL .= ' and class not in (\'boundary\')'; + $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; + $sSQL .= ' ORDER BY distance ASC limit 1'; + Debug::printSQL($sSQL); + + $aStreet = $this->oDB->getRow($sSQL, null, 'Could not determine closest place.'); + Debug::printVar('Closest POI result', $aStreet); + + if ($aStreet) { + $oResult = new Result($aStreet['place_id']); + } + } + + // In the US we can check TIGER data for nearest housenumber + 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, 0.001)'; + $sSQL .= ' ORDER BY distance ASC limit 1'; + Debug::printSQL($sSQL); + + $aPlaceTiger = $this->oDB->getRow($sSQL, null, 'Could not determine closest Tiger place.'); + Debug::printVar('Tiger house number result', $aPlaceTiger); + + if ($aPlaceTiger) { + $oResult = new Result($aPlaceTiger['place_id'], Result::TABLE_TIGER); + $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger); + } + } } else { - $iPlaceID = $oResult->iId; - } - $sSQL = 'select coalesce(p.linked_place_id, a.address_place_id)'; - $sSQL .= ' FROM place_addressline a, placex p'; - $sSQL .= " WHERE a.place_id = $iPlaceID and a.place_id = p.place_id"; - $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc"; - $sSQL .= ' LIMIT 1'; - $iPlaceID = chksql($this->oDB->getOne($sSQL), 'Could not get parent for place.'); - if ($iPlaceID) { - $oResult = new Result($iPlaceID); + // if no POI or street is found ... + $oResult = $this->lookupLargeArea($sPointSQL, 25); } + } else { + // lower than street level ($iMaxRank < 26 ) + $oResult = $this->lookupLargeArea($sPointSQL, $iMaxRank); } + Debug::printVar('Final result', $oResult); return $oResult; } }