X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/dcab7a19e540ff22a49e8322d775f13657edc3bd..a489ac07cd74c970cd2d964290e3f8bec53ceccc:/lib/ReverseGeocode.php?ds=inline diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index b3899e3b..27f8c89c 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -2,6 +2,8 @@ namespace Nominatim; +require_once(CONST_BasePath.'/lib/Result.php'); + class ReverseGeocode { protected $oDB; @@ -53,38 +55,39 @@ class ReverseGeocode protected function lookupInterpolation($sPointSQL, $fSearchDiam) { $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,'; - $sSQL .= ' ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction'; - $sSQL .= ' , ST_Distance(linegeo,'.$sPointSQL.') as distance'; + $sSQL .= ' ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,'; + $sSQL .= ' startnumber, endnumber, interpolationtype,'; + $sSQL .= ' ST_Distance(linegeo,'.$sPointSQL.') as distance'; $sSQL .= ' FROM location_property_osmline'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; - $sSQL .= ' and indexed_status = 0 '; - $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', linegeo) ASC limit 1'; + $sSQL .= ' and indexed_status = 0 and startnumber is not NULL '; + $sSQL .= ' ORDER BY distance ASC limit 1'; return chksql( $this->oDB->getRow($sSQL), - "Could not determine closest housenumber on an osm interpolation line." + 'Could not determine closest housenumber on an osm interpolation line.' ); } - /* lookup() - * returns { place_id =>, type => '(osm|tiger)' } - * fails if no place was found - */ - - public function lookup($fLat, $fLon, $bDoInterpolation = true) { - $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)'; + return $this->lookupPoint( + 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)', + $bDoInterpolation + ); + } + + public function lookupPoint($sPointSQL, $bDoInterpolation = true) + { $iMaxRank = $this->iMaxRank; // Find the nearest point $fSearchDiam = 0.0004; - $iPlaceID = null; + $oResult = null; + $aPlace = null; $fMaxAreaDistance = 1; - $bIsInUnitedStates = false; - $bPlaceIsTiger = false; - $bPlaceIsLine = false; - while (!$iPlaceID && $fSearchDiam < $fMaxAreaDistance) { + $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 @@ -99,16 +102,14 @@ class ReverseGeocode if ($fSearchDiam > 0.001 && $iMaxRank > 26) { // try with interpolations before continuing if ($bDoInterpolation) { - // no house found, try with interpolations - $aPlaceLine = $this->lookupInterpolation($sPointSQL, $fSearchDiam/2); - - if ($aPlaceLine) { - // interpolation is closer to point than placex house - $bPlaceIsLine = true; - $aPlace = $aPlaceLine; - $iPlaceID = $aPlaceLine['place_id']; - $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street - $fFraction = $aPlaceLine['fraction']; + $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; @@ -118,106 +119,105 @@ class ReverseGeocode $iMaxRank = 26; } - $sSQL = 'select place_id,parent_place_id,rank_search,calculated_country_code'; - $sSQL .= ' FROM placex'; - $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; - $sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank; - $sSQL .= ' and (name is not null or housenumber is not null)'; + $sSQL = 'select place_id,parent_place_id,rank_search,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 .= ' or rank_search between 26 and 27)'; $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; - $sSQL .= ' and indexed_status = 0 '; + $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 ST_distance('.$sPointSQL.', geometry) ASC limit 1'; + $sSQL .= ' ORDER BY distance ASC limit 1'; if (CONST_Debug) var_dump($sSQL); $aPlace = chksql( $this->oDB->getRow($sSQL), - "Could not determine closest place." + 'Could not determine closest place.' ); - $iPlaceID = $aPlace['place_id']; - $iParentPlaceID = $aPlace['parent_place_id']; - $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us'); - } - - // If a house was found make sure there isn't an interpolation line - // that is closer - if ($bDoInterpolation && !$bPlaceIsLine && $aPlace && $aPlace['rank_search'] == 30) { - // get the distance of the house to the search point - $sSQL = 'SELECT ST_distance('.$sPointSQL.', house.geometry)'; - $sSQL .= ' FROM placex as house WHERE house.place_id='.$iPlaceID; - - $fDistancePlacex = chksql( - $this->oDB->getOne($sSQL), - "Could not determine distance between searched point and placex house." - ); - - // look for an interpolation that is closer - $aPlaceLine = $this->lookupInterpolation($sPointSQL, $fDistancePlacex); - - if ($aPlaceLine) { - // interpolation is closer to point than placex house - $bPlaceIsLine = true; - $aPlace = $aPlaceLine; - $iPlaceID = $aPlaceLine['place_id']; - $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street - $fFraction = $aPlaceLine['fraction']; + if ($aPlace) { + $oResult = new Result($aPlace['place_id']); + $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? If it's in the US we can check TIGER data for nearest housenumber - if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $this->iMaxRank >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) { - $fSearchDiam = 0.001; - $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction'; - //if (CONST_Debug) { $sSQL .= ', housenumber, ST_distance('.$sPointSQL.', centroid) as distance, st_y(centroid) as lat, st_x(centroid) as lon'; } - $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$iPlaceID; - $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; //no centroid anymore in Tiger data, now we have lines - $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', linegeo) ASC limit 1'; - - if (CONST_Debug) { - $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL); - var_dump($sSQL); - - $aAllHouses = chksql($this->oDB->getAll($sSQL)); - foreach ($aAllHouses as $i) { - echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "
\n"; - } - } + // 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 (CONST_Debug) var_dump($sSQL); $aPlaceTiger = chksql( $this->oDB->getRow($sSQL), - "Could not determine closest Tiger place." + 'Could not determine closest Tiger place.' ); if ($aPlaceTiger) { if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger); - $bPlaceIsTiger = true; $aPlace = $aPlaceTiger; - $iPlaceID = $aPlaceTiger['place_id']; - $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street - $fFraction = $aPlaceTiger['fraction']; + $oResult = new Result($aPlace['place_id'], Result::TABLE_TIGER); + $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger); + $iParentPlaceID = $aPlace['parent_place_id']; $iMaxRank = 30; } } // The point we found might be too small - use the address to find what it is a child of - if ($iPlaceID && $iMaxRank < 28) { - if (($aPlace['rank_search'] > 28 || $bPlaceIsTiger || $bPlaceIsLine) && $iParentPlaceID) { + if ($oResult !== null && $iMaxRank < 28) { + if ($aPlace['rank_search'] > 28 && $iParentPlaceID) { $iPlaceID = $iParentPlaceID; - $bPlaceIsLine = false; - $bPlaceIsTiger = false; + } else { + $iPlaceID = $oResult->iId; } - $sSQL = 'select address_place_id'; - $sSQL .= ' FROM place_addressline'; - $sSQL .= " WHERE place_id = $iPlaceID"; + $sSQL = 'select a.address_place_id'; + $sSQL .= ' FROM place_addressline a, placex p'; + $sSQL .= " WHERE a.place_id = $iPlaceID and a.address_place_id = p.place_id"; + $sSQL .= ' AND p.linked_place_id is null'; $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) { - $iPlaceID = $aPlace['place_id']; + $iPlaceID = chksql($this->oDB->getOne($sSQL), 'Could not get parent for place.'); + if ($iPlaceID) { + $oResult = new Result($iPlaceID); } } - return array( - 'place_id' => $iPlaceID, - 'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'), - 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1 - ); + + return $oResult; } }