X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/158628553f39cf4508a54021af71bc4836e893e8..b42939a3249e73027516eb6e79a9f1f8c642ff95:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index ed618aec..a9fe9611 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -12,6 +12,7 @@
 		protected $bIncludePolygonAsGeoJSON = false;
 		protected $bIncludePolygonAsKML = false;
 		protected $bIncludePolygonAsSVG = false;
+		protected $fPolygonSimplificationThreshold = 0.0;
 
 		protected $aExcludePlaceIDs = array();
 		protected $bDeDupe = true;
@@ -102,6 +103,11 @@
 			$this->bIncludePolygonAsSVG = $b;
 		}
 
+		function setPolygonSimplificationThreshold($f)
+		{
+			$this->fPolygonSimplificationThreshold = $f;
+		}
+
 		function setDeDupe($bDeDupe = true)
 		{
 			$this->bDeDupe = (bool)$bDeDupe;
@@ -580,18 +586,6 @@
 											else $aSearch['sOperator'] = 'near'; // near = in for the moment
 											if (strlen($aSearchTerm['operator']) == 0) $aSearch['iSearchRank'] += 1;
 
-											// Do we have a shortcut id?
-											if ($aSearch['sOperator'] == 'name')
-											{
-												$sSQL = "select get_tagpair('".$aSearch['sClass']."', '".$aSearch['sType']."')";
-												if ($iAmenityID = $this->oDB->getOne($sSQL))
-												{
-													$aValidTokens[$aSearch['sClass'].':'.$aSearch['sType']] = array('word_id' => $iAmenityID);
-													$aSearch['aName'][$iAmenityID] = $iAmenityID;
-													$aSearch['sClass'] = '';
-													$aSearch['sType'] = '';
-												}
-											}
 											if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
 										}
 									}
@@ -770,7 +764,6 @@
 			if (!$this->sQuery && !$this->aStructuredQuery) return false;
 
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
-
 			$sCountryCodesSQL = false;
 			if ($this->aCountryCodes && sizeof($this->aCountryCodes))
 			{
@@ -1606,6 +1599,21 @@
 
 			foreach($aSearchResults as $iResNum => $aResult)
 			{
+				// Default
+				$fDiameter = 0.0001;
+
+				if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
+						&& $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
+				{
+					$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'];
+				}
+				elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
+						&& $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
+				{
+					$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
+				}
+				$fRadius = $fDiameter / 2;
+
 				if (CONST_Search_AreaPolygons)
 				{
 					// Get the bounding box and outline polygon
@@ -1617,7 +1625,16 @@
 					if ($this->bIncludePolygonAsKML) $sSQL .= ",ST_AsKML(geometry) as askml";
 					if ($this->bIncludePolygonAsSVG) $sSQL .= ",ST_AsSVG(geometry) as assvg";
 					if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ",ST_AsText(geometry) as astext";
-					$sSQL .= " from placex where place_id = ".$aResult['place_id'];
+					$sFrom = " from placex where place_id = ".$aResult['place_id'];
+					if ($this->fPolygonSimplificationThreshold > 0)
+					{
+						$sSQL .= " from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,".$this->fPolygonSimplificationThreshold.") as geometry".$sFrom.") as plx";
+					}
+					else
+					{
+						$sSQL .= $sFrom;
+					}
+
 					$aPointPolygon = $this->oDB->getRow($sSQL);
 					if (PEAR::IsError($aPointPolygon))
 					{
@@ -1652,18 +1669,13 @@
                             */
 							elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
 							{
-								$fRadius = 0.01;
-								$iSteps = ($fRadius * 40000)^2;
+								$iSteps = max(8, min(100, ($fRadius * 40000)^2));
 								$fStepSize = (2*pi())/$iSteps;
 								$aPolyPoints = array();
 								for($f = 0; $f < 2*pi(); $f += $fStepSize)
 								{
 									$aPolyPoints[] = array('',$aMatch[1]+($fRadius*sin($f)),$aMatch[2]+($fRadius*cos($f)));
 								}
-								$aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
-								$aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
-								$aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
-								$aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
 							}
 						}
 
@@ -1676,6 +1688,17 @@
 								$aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
 							}
 						}
+
+						if (abs($aPointPolygon['minlat'] - $aPointPolygon['maxlat']) < 0.0000001)
+						{
+							$aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
+							$aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
+						}
+						if (abs($aPointPolygon['minlon'] - $aPointPolygon['maxlon']) < 0.0000001)
+						{
+							$aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
+							$aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
+						}
 						$aResult['aBoundingBox'] = array($aPointPolygon['minlat'],$aPointPolygon['maxlat'],$aPointPolygon['minlon'],$aPointPolygon['maxlon']);
 					}
 				}
@@ -1689,28 +1712,8 @@
 
 				if (!isset($aResult['aBoundingBox']))
 				{
-					// Default
-					$fDiameter = 0.0001;
-
-					if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
-							&& $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
-					{
-						$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defzoom'];
-					}
-					elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-							&& $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-					{
-						$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
-					}
-					$fRadius = $fDiameter / 2;
-
 					$iSteps = max(8,min(100,$fRadius * 3.14 * 100000));
 					$fStepSize = (2*pi())/$iSteps;
-					$aPolyPoints = array();
-					for($f = 0; $f < 2*pi(); $f += $fStepSize)
-					{
-						$aPolyPoints[] = array('',$aResult['lon']+($fRadius*sin($f)),$aResult['lat']+($fRadius*cos($f)));
-					}
 					$aPointPolygon['minlat'] = $aResult['lat'] - $fRadius;
 					$aPointPolygon['maxlat'] = $aResult['lat'] + $fRadius;
 					$aPointPolygon['minlon'] = $aResult['lon'] - $fRadius;
@@ -1719,6 +1722,11 @@
 					// Output data suitable for display (points and a bounding box)
 					if ($this->bIncludePolygonAsPoints)
 					{
+						$aPolyPoints = array();
+						for($f = 0; $f < 2*pi(); $f += $fStepSize)
+						{
+							$aPolyPoints[] = array('',$aResult['lon']+($fRadius*sin($f)),$aResult['lat']+($fRadius*cos($f)));
+						}
 						$aResult['aPolyPoints'] = array();
 						foreach($aPolyPoints as $aPoint)
 						{
@@ -1783,11 +1791,11 @@
 				if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
 					&& $aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
 				{
-					$aResult['foundorder'] = $aResult['foundorder'] + 0.000001 * $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
+					$aResult['foundorder'] += 0.0001 * $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
 				}
 				else
 				{
-					$aResult['foundorder'] = $aResult['foundorder'] + 0.001;
+					$aResult['foundorder'] += 0.01;
 				}
 				$aSearchResults[$iResNum] = $aResult;
 			}