X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/033b9590bdf562a21a45b85e9cfaefee0db754e1..42a06c6bab36c357210fddfced2223ae2c0b191d:/lib/Geocode.php?ds=sidebyside

diff --git a/lib/Geocode.php b/lib/Geocode.php
index aa65cb69..bdc8226e 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1,5 +1,6 @@
 <?php
 	require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+	require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 
 	class Geocode
 	{
@@ -20,7 +21,7 @@
 
 		protected $aExcludePlaceIDs = array();
 		protected $bDeDupe = true;
-		protected $bReverseInPlan = false;
+		protected $bReverseInPlan = true;
 
 		protected $iLimit = 20;
 		protected $iFinalLimit = 10;
@@ -62,11 +63,6 @@
 			$this->aLangPrefOrder = $aLangPref;
 		}
 
-		function setIncludeAddressDetails($bAddressDetails = true)
-		{
-			$this->bIncludeAddressDetails = (bool)$bAddressDetails;
-		}
-
 		function getIncludeAddressDetails()
 		{
 			return $this->bIncludeAddressDetails;
@@ -87,21 +83,11 @@
 			$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;
@@ -122,11 +108,6 @@
 			$this->fPolygonSimplificationThreshold = $f;
 		}
 
-		function setDeDupe($bDeDupe = true)
-		{
-			$this->bDeDupe = (bool)$bDeDupe;
-		}
-
 		function setLimit($iLimit = 10)
 		{
 			if ($iLimit > 50) $iLimit = 50;
@@ -136,32 +117,11 @@
 			$this->iLimit = $this->iFinalLimit + min($this->iFinalLimit, 10);
 		}
 
-		function setOffset($iOffset = 0)
-		{
-			$this->iOffset = $iOffset;
-		}
-
-		function setFallback($bFallback = true)
-		{
-			$this->bFallback = (bool)$bFallback;
-		}
-
-		function setExcludedPlaceIDs($a)
-		{
-			// TODO: force to int
-			$this->aExcludePlaceIDs = $a;
-		}
-
 		function getExcludedPlaceIDs()
 		{
 			return $this->aExcludePlaceIDs;
 		}
 
-		function setBounded($bBoundedSearch = true)
-		{
-			$this->bBoundedSearch = (bool)$bBoundedSearch;
-		}
-
 		function setViewBox($fLeft, $fBottom, $fRight, $fTop)
 		{
 			$this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
@@ -173,11 +133,6 @@
 			return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
 		}
 
-		function setRoute($aRoutePoints)
-		{
-			$this->aRoutePoints = $aRoutePoints;
-		}
-
 		function setFeatureType($sFeatureType)
 		{
 			switch($sFeatureType)
@@ -199,8 +154,8 @@
 
 		function setRankRange($iMin, $iMax)
 		{
-			$this->iMinAddressRank = (int)$iMin;
-			$this->iMaxAddressRank = (int)$iMax;
+			$this->iMinAddressRank = $iMin;
+			$this->iMaxAddressRank = $iMax;
 		}
 
 		function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
@@ -208,11 +163,6 @@
 			$this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg);
 		}
 
-		function setCountryCodesList($aCountryCodes)
-		{
-			$this->aCountryCodes = $aCountryCodes;
-		}
-
 		function setQuery($sQueryString)
 		{
 			$this->sQuery = $sQueryString;
@@ -514,7 +464,7 @@
 
 			$sSQL .= " order by importance desc";
 			if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
-			$aSearchResults = chksql($this->oDB->getAll($sSQL);
+			$aSearchResults = chksql($this->oDB->getAll($sSQL),
 			                         "Could not get details for place.");
 
 			return $aSearchResults;
@@ -879,7 +829,7 @@
 				$sViewboxCentreSQL .= ")'::geometry,4326)";
 
 				$sSQL = "select st_buffer(".$sViewboxCentreSQL.",".(float)($_GET['routewidth']/69).")";
-				$this->sViewboxSmallSQL = chksql($this->oDB->getOne($sSQL);
+				$this->sViewboxSmallSQL = chksql($this->oDB->getOne($sSQL),
 				                                 "Could not get small viewbox.");
 				$this->sViewboxSmallSQL = "'".$this->sViewboxSmallSQL."'::geometry";
 
@@ -1307,6 +1257,12 @@
 								}
 							}
 						}
+						// If a coordinate is given, the search must either
+						// be for a name or a special search. Ignore everythin else.
+						else if ($aSearch['fLon'] && !sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['sClass'])
+						{
+							$aPlaceIDs = array();
+						}
 						else
 						{
 							$aPlaceIDs = array();
@@ -1330,7 +1286,7 @@
 							// TODO: filter out the pointless search terms (2 letter name tokens and less)
 							// they might be right - but they are just too darned expensive to run
 							if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]";
-							if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
+							//if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
 							if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress'])
 							{
 								// For infrequent name terms disable index usage for address
@@ -1338,12 +1294,13 @@
 										sizeof($aSearch['aName']) == 1 &&
 										$aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold)
 								{
-									$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
+									//$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
+									$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddress'],",")."]";
 								}
 								else
 								{
 									$aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]";
-									if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
+									//if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
 								}
 							}
 							if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
@@ -1414,9 +1371,8 @@
 									$sSQL .= " limit ".$this->iLimit;
 
 								if (CONST_Debug) { var_dump($sSQL); }
-								$aViewBoxPlaceIDs = chksql($this->oDB->getAll($sSQL));
+								$aViewBoxPlaceIDs = chksql($this->oDB->getAll($sSQL),
 								                           "Could not get places for search terms.");
-								}
 								//var_dump($aViewBoxPlaceIDs);
 								// Did we have an viewbox matches?
 								$aPlaceIDs = array();
@@ -1638,11 +1594,6 @@
 
 						}
 
-						if (PEAR::IsError($aPlaceIDs))
-						{
-							failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
-						}
-
 						if (CONST_Debug) { echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs); }
 
 						foreach($aPlaceIDs as $iPlaceID)
@@ -1696,9 +1647,17 @@
 			else
 			{
 				// Just interpret as a reverse geocode
-				$iPlaceID = geocodeReverse((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
-				if ($iPlaceID)
-					$aSearchResults = $this->getDetails(array($iPlaceID));
+				$oReverse = new ReverseGeocode($this->oDB);
+				$oReverse->setZoom(18);
+
+				$aLookup = $oReverse->lookup((float)$this->aNearPoint[0],
+				                             (float)$this->aNearPoint[1],
+				                             false);
+
+				if (CONST_Debug) var_dump("Reverse search", $aLookup);
+
+				if ($aLookup['place_id'])
+					$aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
 				else
 					$aSearchResults = array();
 			}
@@ -1726,19 +1685,19 @@
 
 			if (CONST_Debug) { echo '<i>Recheck words:<\i>'; var_dump($aRecheckWords); }
 
+			$oPlaceLookup = new PlaceLookup($this->oDB);
+			$oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
+			$oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
+			$oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
+			$oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
+			$oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
+			$oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
+
 			foreach($aSearchResults as $iResNum => $aResult)
 			{
 				// Default
 				$fDiameter = getResultDiameter($aResult);
 
-				$oPlaceLookup = new PlaceLookup($this->oDB);
-				$oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
-				$oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
-				$oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
-				$oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
-				$oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
-				$oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
-
 				$aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
 				if ($aOutlineResult)
 				{