X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7879ad44cd1e36ae1235c3dcdfd9e477491813e4..a766240c063ea516c4f17497e4093d3d4758b7ff:/lib/ReverseGeocode.php diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 57131434..0c684a4e 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -108,7 +108,7 @@ // returns { place_id =>, type => '(osm|tiger)' } // fails if no place was found - function lookup() + function lookup($bDoInterpolation = true) { $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)'; $iMaxRank = $this->iMaxRank; @@ -148,70 +148,35 @@ $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 ($iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 || $aPlace['rank_search'] == 30)) + if ($bDoInterpolation && $iMaxRank_orig >= 28 && $aPlace && $aPlace['rank_search'] >= 26) { - $fSearchDiam = 0.001; - if ($aPlace['rank_search'] == 30) - { - // if a house was found, the closest road needs to be searched, to use its place id as parent_place_id of the interpolation line - // because a road can be closer to the point than the house from above - $iRoadID = null; - while(!$iRoadID && $fSearchDiam < $fMaxAreaDistance) - { - $fSearchDiam = $fSearchDiam * 2; - $sSQL = 'select place_id '; - $sSQL .= ' FROM placex'; - $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; - $sSQL .= ' and (rank_search = 26 or rank_search = 27)'; - $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; - $sSQL .= ' and indexed_status = 0 '; - $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1'; - $aPlaceRoad = $this->oDB->getRow($sSQL); - if (PEAR::IsError($aPlace)) - { - failInternalError("Could not determine closest place.", $sSQL, $aPlace); - } - $iRoadID = $aPlaceRoad['place_id']; - $iTempPlaceID = $iRoadID; - } - } - else - { - // if a street was found, we can take its place_id as parent_place_id - $iTempPlaceID = $iPlaceID; - } + // 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'; - //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_osmline WHERE parent_place_id = '.$iTempPlaceID; - $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.') AND indexed_status = 0'; + $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 = $this->oDB->getAll($sSQL); + $aAllHouses = chksql($this->oDB->getAll($sSQL)); foreach($aAllHouses as $i) { echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "
\n"; } } - $aPlaceLine = $this->oDB->getRow($sSQL); - if (PEAR::IsError($aPlaceLine)) - { - failInternalError("Could not determine closest housenumber on an osm interpolation line.", $sSQL, $aPlaceLine); - } - $iInterpolationLinePlaceID = $aPlaceLine['place_id']; + $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); @@ -221,29 +186,24 @@ // 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 = $this->oDB->getRow($sSQL); - if (PEAR::IsError($aDistancePlacex)) - { - failInternalError("Could not determine distance between searched point and placex house.", $sSQL, $aDistancePlacex); - } + $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 = '.$iInterpolationLinePlaceID; - $aDistanceInterpolation = $this->oDB->getRow($sSQL); - if (PEAR::IsError($aDistanceInterpolation)) - { - failInternalError("Could not determine distance between searched point and interpolated house.", $sSQL, $aDistanceInterpolation); - } + $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 = $iInterpolationLinePlaceID; + $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 } @@ -254,12 +214,13 @@ $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 ($bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) + if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $iMaxRank_orig >= 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'; @@ -273,18 +234,15 @@ $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL); var_dump($sSQL); - $aAllHouses = $this->oDB->getAll($sSQL); + $aAllHouses = chksql($this->oDB->getAll($sSQL)); foreach($aAllHouses as $i) { echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "
\n"; } } - $aPlaceTiger = $this->oDB->getRow($sSQL); - if (PEAR::IsError($aPlaceTiger)) - { - failInternalError("Could not determine closest Tiger place.", $sSQL, $aPlaceTiger); - } + $aPlaceTiger = chksql($this->oDB->getRow($sSQL), + "Could not determine closest Tiger place."); if ($aPlaceTiger) { if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger); @@ -293,6 +251,7 @@ $iPlaceID = $aPlaceTiger['place_id']; $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street $fFraction = $aPlaceTiger['fraction']; + $iMaxRank = 30; } } @@ -308,18 +267,15 @@ $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 = $this->oDB->getOne($sSQL); - if (PEAR::IsError($iPlaceID)) - { - failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); - } + $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', + 'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'), 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1); }