X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cb76635da768d0ba63f12eb8e8d53b6d0d29c373..ee54ebfe77ef4c52a51c5326952f6a98299a3a68:/lib/ReverseGeocode.php diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 83f6c7e3..42215931 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -69,39 +69,30 @@ class ReverseGeocode ); } - protected function lookupPolygon($sPointSQL, $iMaxRank) + protected function noPolygonFound($sPointSQL, $iMaxRank) { - $sSQL = 'select place_id,parent_place_id,rank_search,country_code, geometry'; - $sSQL .= ' FROM placex'; - $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\',\'ST_MultiPolygon\')'; - $sSQL .= ' AND rank_search <= LEAST(25, '.$iMaxRank.')'; - $sSQL .= ' AND ST_CONTAINS(geometry, '.$sPointSQL.' )'; - $sSQL .= ' AND type != \'postcode\' '; - $sSQL .= ' AND name IS NOT NULL '; - $sSQL .= ' ORDER BY rank_search DESC LIMIT 1'; - + $sSQL = 'SELECT * FROM country_osm_grid'; + $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.' )'; + $aPoly = chksql( $this->oDB->getRow($sSQL), 'Could not determine polygon containing the point.' ); if ($aPoly) { - $iParentPlaceID = $aPoly['parent_place_id']; - $iRankSearch = $aPoly['rank_search']; - $iPlaceID = $aPoly['place_id']; + $sCountryCode = $aPoly['country_code']; - $sSQL = 'select place_id,parent_place_id,rank_search,country_code, linked_place_id,'; - $sSQL .=' ST_distance('.$sPointSQL.', geometry) as distance'; + $sSQL = 'SELECT *, ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' FROM placex'; $sSQL .= ' WHERE osm_type = \'N\''; - $sSQL .= ' AND rank_search >= '.$iRankSearch; - $sSQL .= ' AND rank_search <= LEAST(25, '.$iMaxRank.')'; - $sSQL .= ' AND ST_CONTAINS((SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.'), geometry )'; + $sSQL .= ' AND country_code = \''.$sCountryCode.'\''; + $sSQL .= ' AND rank_address > 0'; + $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank); $sSQL .= ' AND type != \'postcode\''; $sSQL .= ' AND name IS NOT NULL '; - $sSQL .= ' AND class not in ( \'waterway\')'; - $sSQL .= ' ORDER BY distance ASC,'; - $sSQL .= ' rank_search DESC'; - $sSQL .= ' limit 1'; + $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; + $sSQL .= ' ORDER BY distance ASC, rank_address DESC'; + $sSQL .= ' LIMIT 1'; + if (CONST_Debug) var_dump($sSQL); $aPlacNode = chksql( $this->oDB->getRow($sSQL), @@ -111,6 +102,67 @@ class ReverseGeocode return $aPlacNode; } } + } + + protected function lookupPolygon($sPointSQL, $iMaxRank) + { + + $oResult = null; + $aPlace = null; + + $sSQL = 'SELECT * FROM'; + $sSQL .= '(select place_id,parent_place_id,rank_address,country_code, geometry'; + $sSQL .= ' FROM placex'; + $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')'; + $sSQL .= ' AND rank_address <= ' .Min(25, $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'; + + $aPoly = chksql( + $this->oDB->getRow($sSQL), + 'Could not determine polygon containing the point.' + ); + if ($aPoly) { + $iParentPlaceID = $aPoly['parent_place_id']; + $iRankAddress = $aPoly['rank_address']; + $iPlaceID = $aPoly['place_id']; + + if ($iRankAddress != $iMaxRank) { + $sSQL = 'SELECT *'; + $sSQL .= ' FROM ('; + $sSQL .= ' SELECT place_id, rank_address,country_code, geometry,'; + $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); + $sSQL .= ' AND type != \'postcode\''; + $sSQL .= ' AND name IS NOT NULL '; + $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; + // preselection through bbox + $sSQL .= ' AND (SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.') && geometry'; + $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 .= ' ORDER BY distance ASC, rank_address DESC'; + $sSQL .= ' LIMIT 1'; + + if (CONST_Debug) var_dump($sSQL); + $aPlacNode = chksql( + $this->oDB->getRow($sSQL), + 'Could not determine place node.' + ); + if ($aPlacNode) { + return $aPlacNode; + } + } + } return $aPoly; } @@ -134,10 +186,25 @@ class ReverseGeocode $fMaxAreaDistance = 1; $bIsTigerStreet = false; + // try with interpolations before continuing + if ($bDoInterpolation && $iMaxRank >= 30) { + $aHouse = $this->lookupInterpolation($sPointSQL, $fSearchDiam/3); + + 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; + + return $oResult; + } + }// no interpolation found, continue search + // for POI or street level - if ( $iMaxRank >= 26 ) { - - $sSQL = 'select place_id,parent_place_id,rank_search,country_code,'; + if ($iMaxRank >= 26) { + $sSQL = 'select place_id,parent_place_id,rank_address,country_code,'; $sSQL .= 'CASE WHEN ST_GeometryType(geometry) in (\'ST_Polygon\',\'ST_MultiPolygon\') THEN ST_distance('.$sPointSQL.', centroid)'; $sSQL .= ' ELSE ST_distance('.$sPointSQL.', geometry) '; $sSQL .= ' END as distance'; @@ -147,13 +214,12 @@ class ReverseGeocode $sSQL .= ' AND'; // only streets if ($iMaxRank == 26) { - $sSQL .= ' rank_search != 28 and rank_search = 26'; + $sSQL .= ' rank_address = 26'; } else { - $sSQL .= ' rank_search != 28 and rank_search >= 26'; + $sSQL .= ' rank_address >= 26'; } $sSQL .= ' and (name is not null or housenumber is not null'; - $sSQL .= ' or rank_search between 26 and 27)'; - $sSQL .= ' and type not in (\'proposed\')'; + $sSQL .= ' or rank_address between 26 and 27)'; $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; $sSQL .= ' and indexed_status = 0 and linked_place_id is null'; $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') '; @@ -170,52 +236,55 @@ class ReverseGeocode $oResult = new Result($iPlaceID); $iParentPlaceID = $aPlace['parent_place_id']; // if street and maxrank > streetlevel - if (($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 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_search,country_code,'; - $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; - $sSQL .= ' FROM '; - $sSQL .= ' placex'; - // radius ? - $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, 0.003)'; - $sSQL .= ' AND parent_place_id = '.$iPlaceID; - $sSQL .= ' and (name is not null or housenumber is not 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.' - ); - if ($aStreet) { - $iPlaceID = $aStreet['place_id']; - $oResult = new Result($iPlaceID); - $iParentPlaceID = $aStreet['parent_place_id']; - } - } - }else{ - $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); - if ($aPlace) { - // if place node is found adress goes over linked_place_id - if (!empty($aPlace['linked_place_id'])) { - $oResult = new Result($aPlace['linked_place_id']); - }else{ - $oResult = new Result($aPlace['place_id']); - } + 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,'; + $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 (name is not null or housenumber is not null'; + $sSQL .= ' or rank_address between 26 and 27)'; + $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; + $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.' + ); + if ($aStreet) { + $iPlaceID = $aStreet['place_id']; + $oResult = new Result($iPlaceID); + $iParentPlaceID = $aStreet['parent_place_id']; } } - // lower than street level ($iMaxRank < 26 ) - }else{ + } else { $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); if ($aPlace) { - // if place node is found adress goes over linked_place_id - if (!empty($aPlace['linked_place_id'])) { - $oResult = new Result($aPlace['linked_place_id']); - }else{ + $oResult = new Result($aPlace['place_id']); + } else { + $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank); + if ($aPlace) { $oResult = new Result($aPlace['place_id']); } } } + // lower than street level ($iMaxRank < 26 ) + } else { + $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); + if ($aPlace) { + $oResult = new Result($aPlace['place_id']); + } else { + $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank); + if ($aPlace) { + $oResult = new Result($aPlace['place_id']); + } + } + } return $oResult; } - -} \ No newline at end of file +}