X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8fd7d319b7ef6ee4d4f8cf3b61eb47903e7fb1eb..5464dec0570c2451d8607bc739c6f2b6f298bb75:/lib/ReverseGeocode.php diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 8503e1eb..b523d0aa 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -2,41 +2,13 @@ class ReverseGeocode { protected $oDB; - - protected $fLat; - protected $fLon; protected $iMaxRank = 28; - protected $aLangPrefOrder = array(); - - protected $bShowAddressDetails = true; - function ReverseGeocode(&$oDB) { $this->oDB =& $oDB; } - function setLanguagePreference($aLangPref) - { - $this->aLangPrefOrder = $aLangPref; - } - - function setIncludeAddressDetails($bAddressDetails = true) - { - $this->bAddressDetails = $bAddressDetails; - } - - function setLatLon($fLat, $fLon) - { - $this->fLat = (float)$fLat; - $this->fLon = (float)$fLon; - } - - function setRank($iRank) - { - $this->iMaxRank = $iRank; - } - function setZoom($iZoom) { // Zoom to rank, this could probably be calculated but a lookup gives fine control @@ -65,9 +37,11 @@ $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28; } - function lookup() + // returns { place_id =>, type => '(osm|tiger)' } + // fails if no place was found + function lookup($fLat, $fLon, $bDoInterpolation = true) { - $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)'; + $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)'; $iMaxRank = $this->iMaxRank; // Find the nearest point @@ -75,6 +49,9 @@ $iPlaceID = null; $aArea = false; $fMaxAreaDistance = 1; + $bIsInUnitedStates = false; + $bPlaceIsTiger = false; + $bPlaceIsLine = false; while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance) { $fSearchDiam = $fSearchDiam * 2; @@ -90,50 +67,147 @@ if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22; if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26; - $sSQL = 'select place_id,parent_place_id,rank_search from placex'; + $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 .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\')'; - $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') '; + $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; $sSQL .= ' and indexed_status = 0 '; + $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'; if (CONST_Debug) var_dump($sSQL); - $aPlace = $this->oDB->getRow($sSQL); - if (PEAR::IsError($aPlace)) - { - failInternalError("Could not determine closest place.", $sSQL, $aPlace); - } + $aPlace = chksql($this->oDB->getRow($sSQL), + "Could not determine closest place."); $iPlaceID = $aPlace['place_id']; $iParentPlaceID = $aPlace['parent_place_id']; + $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us'); + } + // if a street or house was found, look in interpolation lines table + if ($bDoInterpolation && $this->iMaxRank >= 28 && $aPlace && $aPlace['rank_search'] >= 26) + { + // if a house was found, search the interpolation line that is at least as close as the house + $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction'; + $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'; + + 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"; + } + } + $aPlaceLine = chksql($this->oDB->getRow($sSQL), + "Could not determine closest housenumber on an osm interpolation line."); + if ($aPlaceLine) + { + if (CONST_Debug) var_dump('found housenumber in interpolation lines table', $aPlaceLine); + if ($aPlace['rank_search'] == 30) + { + // if a house was already found in placex, we have to find out, + // if the placex house or the interpolated house are closer to the searched point + // distance between point and placex house + $sSQL = 'SELECT ST_distance('.$sPointSQL.', house.geometry) as distance FROM placex as house WHERE house.place_id='.$iPlaceID; + $aDistancePlacex = chksql($this->oDB->getRow($sSQL), + "Could not determine distance between searched point and placex house."); + $fDistancePlacex = $aDistancePlacex['distance']; + // distance between point and interpolated house (fraction on interpolation line) + $sSQL = 'SELECT ST_distance('.$sPointSQL.', ST_LineInterpolatePoint(linegeo, '.$aPlaceLine['fraction'].')) as distance'; + $sSQL .= ' FROM location_property_osmline WHERE place_id = '.$aPlaceLine['place_id']; + $aDistanceInterpolation = chksql($this->oDB->getRow($sSQL), + "Could not determine distance between searched point and interpolated house."); + $fDistanceInterpolation = $aDistanceInterpolation['distance']; + if ($fDistanceInterpolation < $fDistancePlacex) + { + // 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']; + $iMaxRank = 30; + } + // else: nothing to do, take placex house from above + } + else + { + $bPlaceIsLine = true; + $aPlace = $aPlaceLine; + $iPlaceID = $aPlaceLine['place_id']; + $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street + $fFraction = $aPlaceLine['fraction']; + $iMaxRank = 30; + } + } + } + + // 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_line_locate_point(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"; + } + } + + $aPlaceTiger = chksql($this->oDB->getRow($sSQL), + "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']; + $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 && $iParentPlaceID) + if (($aPlace['rank_search'] > 28 || $bPlaceIsTiger || $bPlaceIsLine) && $iParentPlaceID) { $iPlaceID = $iParentPlaceID; } - $sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1"; - $iPlaceID = $this->oDB->getOne($sSQL); - if (PEAR::IsError($iPlaceID)) - { - failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); - } + $sSQL = 'select address_place_id'; + $sSQL .= ' FROM place_addressline'; + $sSQL .= " WHERE place_id = $iPlaceID"; + $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']; } } - - $oPlaceLookup = new PlaceLookup($this->oDB); - $oPlaceLookup->setLanguagePreference($this->aLangPrefOrder); - $oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails); - $oPlaceLookup->setPlaceId($iPlaceID); - - return $oPlaceLookup->lookup(); + return array('place_id' => $iPlaceID, + 'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'), + 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1); } + } ?>