X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b14bc75dc4a0ca44485599d8ab4cf1c5781098e2..5464dec0570c2451d8607bc739c6f2b6f298bb75:/lib/ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 4eeb5cc4..b523d0aa 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -2,42 +2,13 @@
 	class ReverseGeocode
 	{
 		protected $oDB;
-
-		protected $fLat;
-		protected $fLon;
 		protected $iMaxRank = 28;
 
-		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;
 		}
 
-		function setLanguagePreference($aLangPref)
-		{
-			$this->aLangPrefOrder = $aLangPref;
-		}
-
-		function setLatLon($fLat, $fLon)
-		{
-			$this->fLat = (float)$fLat;
-			$this->fLon = (float)$fLon;
-		}
-
-		function setRank($iRank)
-		{
-			$this->iMaxRank = $iRank;
-		}
-
 		function setZoom($iZoom)
 		{
 			// Zoom to rank, this could probably be calculated but a lookup gives fine control
@@ -66,53 +37,12 @@
 			$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()
+		function lookup($fLat, $fLon, $bDoInterpolation = true)
 		{
-			$sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
+			$sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
 			$iMaxRank = $this->iMaxRank;
-			$iMaxRank_orig = $this->iMaxRank;
 
 			// Find the nearest point
 			$fSearchDiam = 0.0004;
@@ -155,7 +85,7 @@
 				$bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
 			}
 			// if a street or house was found, look in interpolation lines table
-			if ($iMaxRank_orig >= 28 && $aPlace && $aPlace['rank_search'] >= 26)
+			if ($bDoInterpolation && $this->iMaxRank >= 28 && $aPlace && $aPlace['rank_search'] >= 26)
 			{
 				// 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';
@@ -203,6 +133,7 @@
 							$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
 					}
@@ -213,12 +144,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 (CONST_Use_US_Tiger_Data && $bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 ))
+			if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $this->iMaxRank >= 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';
@@ -249,6 +181,7 @@
 					$iPlaceID = $aPlaceTiger['place_id'];
 					$iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
 					$fFraction = $aPlaceTiger['fraction'];
+					$iMaxRank = 30;
 				}
 			}
 
@@ -272,7 +205,7 @@
 				}
 			}
 			return array('place_id' => $iPlaceID,
-						'type' => $bPlaceIsTiger ? 'tiger' : $bPlaceIsLine ? 'interpolation' : 'osm',
+						'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'),
 						'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
 		}