X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/26e30bf8e18f6c7a30cc056972d1399994309270..a10f5371312d7d98797847381fb0846f6872afcd:/lib/ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index a296114f..30e74234 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)';
@@ -71,6 +121,7 @@
 			$fMaxAreaDistance = 1;
 			$bIsInUnitedStates = false;
 			$bPlaceIsTiger = false;
+			$bPlaceIsLine = false;
 			while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
 			{
 				$fSearchDiam = $fSearchDiam * 2;
@@ -86,7 +137,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)';
@@ -105,9 +157,109 @@
 				$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))
+			{
+				$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 for the interpolation line search
+					// 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;
+				}
+				$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 .= ' 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);
+					foreach($aAllHouses as $i)
+					{
+						echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\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'];
+				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 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);
+						}
+						$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);
+						}
+						$fDistanceInterpolation = $aDistanceInterpolation['distance'];
+						if ($fDistanceInterpolation < $fDistancePlacex)
+						{
+							// interpolation is closer to point than placex house
+							$bPlaceIsLine = true;
+							$aPlace = $aPlaceLine;
+							$iPlaceID = $iInterpolationLinePlaceID;
+							$iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
+							$fFraction = $aPlaceLine['fraction'];
+						}
+						// else: nothing to do, take placex house from above
+					}
+					else
+					{
+						$bPlaceIsLine = true;
+						$aPlace = $aPlaceLine;
+						$iPlaceID = $aPlaceLine['place_id'];
+						$iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
+						$fFraction = $aPlaceLine['fraction'];
+					}
+				}
+			}
+			
 			// 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, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';
@@ -116,9 +268,7 @@
 				$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)
+				if (CONST_Debug)
 				{
 					$sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
 					var_dump($sSQL);
@@ -128,32 +278,36 @@
 					{
 						echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
 					}
-				}*/
+				}
 
 				$aPlaceTiger = $this->oDB->getRow($sSQL);
-				if (PEAR::IsError($aPlace))
+				if (PEAR::IsError($aPlaceTiger))
 				{
 					failInternalError("Could not determine closest Tiger place.", $sSQL, $aPlaceTiger);
 				}
 				if ($aPlaceTiger)
 				{
-					if (CONST_Debug) var_dump('found Tiger place', $aPlaceTiger);
+					if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
 					$bPlaceIsTiger = true;
 					$aPlace = $aPlaceTiger;
 					$iPlaceID = $aPlaceTiger['place_id'];
 					$iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
-                    $iFraction = $aPlaceTiger['fraction'];
+					$fFraction = $aPlaceTiger['fraction'];
 				}
 			}
 
 			// The point we found might be too small - use the address to find what it is a child of
 			if ($iPlaceID && $iMaxRank < 28)
 			{
-				if ($aPlace['rank_search'] > 28 && $iParentPlaceID && !$bPlaceIsTiger)
+				if (($aPlace['rank_search'] > 28 || $bPlaceIsTiger || $bPlaceIsLine) && $iParentPlaceID)
 				{
 					$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))
 				{
@@ -164,10 +318,10 @@
 					$iPlaceID = $aPlace['place_id'];
 				}
 			}
-
 			return array('place_id' => $iPlaceID,
-					     'type' => $bPlaceIsTiger ? 'tiger' : 'osm',
-                         'fraction' => $bPlaceIsTiger ? $iFraction : -1 );
+						'type' => $bPlaceIsTiger ? 'tiger' : $bPlaceIsLine ? 'interpolation' : 'osm',
+						'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
 		}
+		
 	}
 ?>