X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e90087a063698139beb087f24c068ce04171e8bf..131527bdab6738baff679171c421ea7fa863e100:/lib/ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index e40ce6cc..75a9b71c 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -9,6 +9,14 @@
 
 		protected $aLangPrefOrder = array();
 
+		protected $bIncludePolygonAsPoints = false;
+		protected $bIncludePolygonAsText = false;
+		protected $bIncludePolygonAsGeoJSON = false;
+		protected $bIncludePolygonAsKML = false;
+		protected $bIncludePolygonAsSVG = false;
+		protected $fPolygonSimplificationThreshold = 0.0;
+
+
 		function ReverseGeocode(&$oDB)
 		{
 			$this->oDB =& $oDB;
@@ -58,6 +66,48 @@
 			$this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
 		}
 
+				function setIncludePolygonAsPoints($b = true)
+		{
+			$this->bIncludePolygonAsPoints = $b;
+		}
+
+		function getIncludePolygonAsPoints()
+		{
+			return $this->bIncludePolygonAsPoints;
+		}
+
+		function setIncludePolygonAsText($b = true)
+		{
+			$this->bIncludePolygonAsText = $b;
+		}
+
+		function getIncludePolygonAsText()
+		{
+			return $this->bIncludePolygonAsText;
+		}
+
+		function setIncludePolygonAsGeoJSON($b = true)
+		{
+			$this->bIncludePolygonAsGeoJSON = $b;
+		}
+
+		function setIncludePolygonAsKML($b = true)
+		{
+			$this->bIncludePolygonAsKML = $b;
+		}
+
+		function setIncludePolygonAsSVG($b = true)
+		{
+			$this->bIncludePolygonAsSVG = $b;
+		}
+
+		function setPolygonSimplificationThreshold($f)
+		{
+			$this->fPolygonSimplificationThreshold = $f;
+		}
+
+		// returns { place_id =>, type => '(osm|tiger)' }
+		// fails if no place was found
 		function lookup()
 		{
 			$sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
@@ -86,7 +136,8 @@
 				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,calculated_country_code 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)';
@@ -107,17 +158,15 @@
 			}
 
 			// 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 && $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 ';
-				if (CONST_Debug) { $sSQL .= ', housenumber, ST_distance('.$sPointSQL.', centroid) as distance, st_y(centroid) as lat, st_x(centroid) as lon'; }
+				$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.', centroid, '.$fSearchDiam.')';
-				$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', centroid) ASC limit 1';
-
+				$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';
 
-				// print all house numbers in the parent (street)
 				if (CONST_Debug)
 				{
 					$sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
@@ -142,6 +191,7 @@
 					$aPlace = $aPlaceTiger;
 					$iPlaceID = $aPlaceTiger['place_id'];
 					$iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
+					$iFraction = $aPlaceTiger['fraction'];
 				}
 			}
 
@@ -152,7 +202,11 @@
 				{
 					$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";
+				$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 = $this->oDB->getOne($sSQL);
 				if (PEAR::IsError($iPlaceID))
 				{
@@ -165,7 +219,9 @@
 			}
 
 			return array('place_id' => $iPlaceID,
-					     'type' => $bPlaceIsTiger ? 'tiger' : 'osm');
+						'type' => $bPlaceIsTiger ? 'tiger' : 'osm',
+						'fraction' => $bPlaceIsTiger ? $iFraction : -1);
 		}
+		
 	}
 ?>