X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2338d04e9f0cd8f0ca294a1f6664d641d1522b25..46cef36184dc530518068a6a84ba6becd96e09bd:/lib/lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 50cf3dc4..7b1cbb8f 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -101,7 +101,7 @@
 	function bySearchRank($a, $b)
 	{
 		if ($a['iSearchRank'] == $b['iSearchRank'])
-            return strlen($a['sOperator']) + strlen($a['sHouseNumber']) - strlen($b['sOperator']) - strlen($b['sHouseNumber']);
+			return strlen($a['sOperator']) + strlen($a['sHouseNumber']) - strlen($b['sOperator']) - strlen($b['sHouseNumber']);
 		return ($a['iSearchRank'] < $b['iSearchRank']?-1:1);
 	}
 
@@ -673,6 +673,31 @@
 		return $aOrders;
 	}
 
+	function getResultDiameter($aResult)
+	{
+		$aClassType = getClassTypes();
+
+		$fDiameter = 0.0001;
+
+		if (isset($aResult['class'])
+			  && isset($aResult['type'])
+			  && isset($aResult['admin_level'])
+			  && 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($aResult['class'])
+			  && isset($aResult['type'])
+			  && isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
+				&& $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
+		{
+			$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
+		}
+
+		return $fDiameter;
+	}
+
 
 	function javascript_renderData($xVal, $iOptions = 0)
 	{
@@ -780,9 +805,9 @@
 	}
 
 
-	function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $bRaw = false)
+	function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $housenumber, $bRaw = false)
 	{
-		$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata($iPlaceID)";
+		$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata($iPlaceID, $housenumber)";
 		if (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'";
 		$sSQL .= " order by rank_address desc,isaddress desc";
 
@@ -1022,3 +1047,49 @@
 
 		return array('lat' => $fQueryLat, 'lon' => $fQueryLon, 'query' => $sQuery);
 	}
+
+
+	function geometryText2Points($geometry_as_text, $fRadius)
+	{
+		$aPolyPoints = NULL;
+		if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch))
+		{
+			preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
+		}
+		elseif (preg_match('#LINESTRING\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch))
+		{
+			preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
+		}
+		elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch))
+		{
+			preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
+		}
+		elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#', $geometry_as_text, $aMatch))
+		{
+			$aPolyPoints = createPointsAroundCenter($aMatch[1], $aMatch[2], $fRadius);
+		}
+
+		if (isset($aPolyPoints))
+		{
+			$aResultPoints = array();
+			foreach($aPolyPoints as $aPoint)
+			{
+				$aResultPoints[] = array($aPoint[1], $aPoint[2]);
+			}
+			return $aResultPoints;
+		}
+
+		return;
+	}
+
+	function createPointsAroundCenter($fLon, $fLat, $fRadius)
+	{
+			$iSteps = max(8, min(100, ($fRadius * 40000)^2));
+			$fStepSize = (2*pi())/$iSteps;
+			$aPolyPoints = array();
+			for($f = 0; $f < 2*pi(); $f += $fStepSize)
+			{
+				$aPolyPoints[] = array('', $fLon+($fRadius*sin($f)), $fLat+($fRadius*cos($f)) );
+			}
+			return $aPolyPoints;
+	}