X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2e1590ed89e16eea79c9c1f140b979b2533ea212..c2b68c337b398aff21bc04d51b83f42608bbbbc8:/lib/ReverseGeocode.php?ds=sidebyside

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index ae83af1e..e40ce6cc 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -9,8 +9,6 @@
 
 		protected $aLangPrefOrder = array();
 
-		protected $bShowAddressDetails = true;
-
 		function ReverseGeocode(&$oDB)
 		{
 			$this->oDB =& $oDB;
@@ -21,11 +19,6 @@
 			$this->aLangPrefOrder = $aLangPref;
 		}
 
-		function setIncludeAddressDetails($bAddressDetails = true)
-		{
-			$this->bAddressDetails = $bAddressDetails;
-		}
-
 		function setLatLon($fLat, $fLon)
 		{
 			$this->fLat = (float)$fLat;
@@ -97,7 +90,7 @@
 				$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 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.'))';
@@ -171,13 +164,8 @@
 				}
 			}
 
-			$oPlaceLookup = new PlaceLookup($this->oDB);
-			$oPlaceLookup->setLanguagePreference($this->aLangPrefOrder);
-			$oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails);
-			$oPlaceLookup->setPlaceId($iPlaceID);
-			$oPlaceLookup->setIsTiger($bPlaceIsTiger);
-
-			return $oPlaceLookup->lookup();
+			return array('place_id' => $iPlaceID,
+					     'type' => $bPlaceIsTiger ? 'tiger' : 'osm');
 		}
 	}
 ?>