X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cf39e07dba72373302e2d1a48de3083339d0decb..02550cc4dc5c015940fb8ba4babd7a760124e764:/lib/ReverseGeocode.php diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index b7ee36b4..509ec0a8 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -78,8 +78,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'); @@ -102,8 +104,10 @@ 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) { @@ -111,14 +115,18 @@ class ReverseGeocode // 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 @@ -160,8 +168,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,8 +193,7 @@ 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']; }