X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f05ea577f42c5ad4a62ff25ec62fbb60c550ee26..cecbfb8e4c8c3265a9d9222d7dadeb11ebdd034c:/lib/ReverseGeocode.php diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index a1915c50..d9554920 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -1,46 +1,55 @@ oDB =& $oDB; } - function setZoom($iZoom) + + public function setZoom($iZoom) { // Zoom to rank, this could probably be calculated but a lookup gives fine control $aZoomRank = array( - 0 => 2, // Continent / Sea - 1 => 2, - 2 => 2, - 3 => 4, // Country - 4 => 4, - 5 => 8, // State - 6 => 10, // Region - 7 => 10, - 8 => 12, // County - 9 => 12, - 10 => 17, // City - 11 => 17, - 12 => 18, // Town / Village - 13 => 18, - 14 => 22, // Suburb - 15 => 22, - 16 => 26, // Street, TODO: major street? - 17 => 26, - 18 => 30, // or >, Building - 19 => 30, // or >, Building - ); + 0 => 2, // Continent / Sea + 1 => 2, + 2 => 2, + 3 => 4, // Country + 4 => 4, + 5 => 8, // State + 6 => 10, // Region + 7 => 10, + 8 => 12, // County + 9 => 12, + 10 => 17, // City + 11 => 17, + 12 => 18, // Town / Village + 13 => 18, + 14 => 22, // Suburb + 15 => 22, + 16 => 26, // Street, TODO: major street? + 17 => 26, + 18 => 30, // or >, Building + 19 => 30, // or >, Building + ); $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28; } - // returns { place_id =>, type => '(osm|tiger)' } - // fails if no place was found - function lookup($fLat, $fLon, $bDoInterpolation = true) + + /* 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)'; $iMaxRank = $this->iMaxRank; @@ -78,8 +87,10 @@ class ReverseGeocode $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))'; $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1'; if (CONST_Debug) var_dump($sSQL); - $aPlace = chksql($this->oDB->getRow($sSQL), - "Could not determine closest place."); + $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'); @@ -87,7 +98,7 @@ class ReverseGeocode // 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 = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction'; $sSQL .= ' FROM location_property_osmline'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; $sSQL .= ' and indexed_status = 0 '; @@ -102,23 +113,29 @@ class ReverseGeocode 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."); + $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 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."); + $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."); + $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 @@ -144,7 +161,7 @@ class ReverseGeocode // 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'; + $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 @@ -160,8 +177,10 @@ class ReverseGeocode } } - $aPlaceTiger = chksql($this->oDB->getRow($sSQL), - "Could not determine closest Tiger place."); + $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; @@ -183,15 +202,15 @@ class ReverseGeocode $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."); + $iPlaceID = chksql($this->oDB->getOne($sSQL), "Could not get parent for place."); if (!$iPlaceID) { $iPlaceID = $aPlace['place_id']; } } - return array('place_id' => $iPlaceID, - 'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'), - 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1); + return array( + 'place_id' => $iPlaceID, + 'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'), + 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1 + ); } - }