X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/26e30bf8e18f6c7a30cc056972d1399994309270..feb458f8dd4c897f3aa688943d75dbf58bc090f5:/lib/lib.php diff --git a/lib/lib.php b/lib/lib.php index d390a482..94bed6d8 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -1,51 +1,5 @@

Internal Server Error

"; - echo '

Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.

'; - echo "

Details: ".$sError,"

"; - echo '

Feel free to report the bug in the OSM bug database. Please include the error message above and the URL you used.

'; - if (CONST_Debug) - { - echo "

Debugging Information

"; - if ($sSQL) - { - echo "

SQL query

".$sSQL.""; - } - if ($vDumpVar) - { - echo "

Result

";
-				var_dump($vDumpVar);
-				echo "

"; - } - } - echo "\n\n"; - exit; - } - - - function userError($sError) - { - header('HTTP/1.0 400 Bad Request'); - header('Content-type: text/html; charset=utf-8'); - echo "

Bad Request

"; - echo '

Nominatim has encountered an error with your request.

'; - echo "

Details: ".$sError,"

"; - echo '

If you feel this error is incorrect feel free to report the bug in the OSM bug database. Please include the error message above and the URL you used.

'; - echo "\n\n"; - exit; - } - - function getParamBool($name, $default=false) - { - if (!isset($_GET[$name])) return $default; - - return (bool) $_GET[$name]; - } - function fail($sError, $sUserError = false) { if (!$sUserError) $sUserError = $sError; @@ -55,29 +9,10 @@ } - function getBlockingProcesses() - { - $sStats = file_get_contents('/proc/stat'); - if (preg_match('/procs_blocked ([0-9]+)/i', $sStats, $aMatches)) - { - return (int)$aMatches[1]; - } - return 0; - } - - - function getLoadAverage() - { - $sLoadAverage = file_get_contents('/proc/loadavg'); - $aLoadAverage = explode(' ',$sLoadAverage); - return (float)$aLoadAverage[0]; - } - - function getProcessorCount() { $sCPU = file_get_contents('/proc/cpuinfo'); - preg_match_all('#processor : [0-9]+#', $sCPU, $aMatches); + preg_match_all('#processor\s+: [0-9]+#', $sCPU, $aMatches); return sizeof($aMatches[0]); } @@ -110,16 +45,7 @@ { if ($a['importance'] != $b['importance']) return ($a['importance'] > $b['importance']?-1:1); - /* - if ($a['aPointPolygon']['numfeatures'] != $b['aPointPolygon']['numfeatures']) - return ($a['aPointPolygon']['numfeatures'] > $b['aPointPolygon']['numfeatures']?-1:1); - if ($a['aPointPolygon']['area'] != $b['aPointPolygon']['area']) - return ($a['aPointPolygon']['area'] > $b['aPointPolygon']['area']?-1:1); - // if ($a['levenshtein'] != $b['levenshtein']) - // return ($a['levenshtein'] < $b['levenshtein']?-1:1); - if ($a['rank_search'] != $b['rank_search']) - return ($a['rank_search'] < $b['rank_search']?-1:1); - */ + return ($a['foundorder'] < $b['foundorder']?-1:1); } @@ -229,7 +155,6 @@ { $aTokens[' '.$sWord] = ' '.$sWord; $aTokens[$sWord] = $sWord; - //if (!strpos($sWord,' ')) $aTokens[$sWord] = $sWord; } } return $aTokens; @@ -240,44 +165,11 @@ GB Postcode functions */ - function gbPostcodeAlphaDifference($s1, $s2) - { - $aValues = array( - 'A'=>0, - 'B'=>1, - 'D'=>2, - 'E'=>3, - 'F'=>4, - 'G'=>5, - 'H'=>6, - 'J'=>7, - 'L'=>8, - 'N'=>9, - 'O'=>10, - 'P'=>11, - 'Q'=>12, - 'R'=>13, - 'S'=>14, - 'T'=>15, - 'U'=>16, - 'W'=>17, - 'X'=>18, - 'Y'=>19, - 'Z'=>20); - return abs(($aValues[$s1[0]]*21+$aValues[$s1[1]]) - ($aValues[$s2[0]]*21+$aValues[$s2[1]])); - } - - function gbPostcodeCalculate($sPostcode, $sPostcodeSector, $sPostcodeEnd, &$oDB) { // Try an exact match on the gb_postcode table $sSQL = 'select \'AA\', ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from gb_postcode where postcode = \''.$sPostcode.'\''; - $aNearPostcodes = $oDB->getAll($sSQL); - if (PEAR::IsError($aNearPostcodes)) - { - var_dump($sSQL, $aNearPostcodes); - exit; - } + $aNearPostcodes = chksql($oDB->getAll($sSQL)); if (sizeof($aNearPostcodes)) { @@ -294,66 +186,6 @@ } - function usPostcodeCalculate($sPostcode, &$oDB) - { - $iZipcode = (int)$sPostcode; - - // Try an exact match on the us_zippostcode table - $sSQL = 'select zipcode, ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from us_zipcode where zipcode = '.$iZipcode; - $aNearPostcodes = $oDB->getAll($sSQL); - if (PEAR::IsError($aNearPostcodes)) - { - var_dump($sSQL, $aNearPostcodes); - exit; - } - - if (!sizeof($aNearPostcodes)) - { - $sSQL = 'select zipcode,ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from us_zipcode where zipcode between '.($iZipcode-100).' and '.($iZipcode+100).' order by abs(zipcode - '.$iZipcode.') asc limit 5'; - $aNearPostcodes = $oDB->getAll($sSQL); - if (PEAR::IsError($aNearPostcodes)) - { - var_dump($sSQL, $aNearPostcodes); - exit; - } - } - - if (!sizeof($aNearPostcodes)) - { - return false; - } - - $fTotalLat = 0; - $fTotalLon = 0; - $fTotalFac = 0; - foreach($aNearPostcodes as $aPostcode) - { - $iDiff = abs($aPostcode['zipcode'] - $iZipcode) + 1; - if ($iDiff == 0) - $fFac = 1; - else - $fFac = 1/($iDiff*$iDiff); - - $fTotalFac += $fFac; - $fTotalLat += $aPostcode['lat'] * $fFac; - $fTotalLon += $aPostcode['lon'] * $fFac; - } - if ($fTotalFac) - { - $fLat = $fTotalLat / $fTotalFac; - $fLon = $fTotalLon / $fTotalFac; - return array(array('lat' => $fLat, 'lon' => $fLon, 'radius' => 0.2)); - } - return false; - - /* - $fTotalFac is a surprisingly good indicator of accuracy - $iZoom = 18 + round(log($fTotalFac,32)); - $iZoom = max(13,min(18,$iZoom)); - */ - } - - function getClassTypes() { return array( @@ -673,10 +505,34 @@ 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) { - header("Access-Control-Allow-Origin: *"); if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400) $iOptions |= JSON_UNESCAPED_UNICODE; $jsonout = json_encode($xVal, $iOptions); @@ -780,18 +636,13 @@ } - function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $housenumber, $bRaw = false) + function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $housenumber = -1, $bRaw = false) { $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"; - $aAddressLines = $oDB->getAll($sSQL); - if (PEAR::IsError($aAddressLines)) - { - var_dump($aAddressLines); - exit; - } + $aAddressLines = chksql($oDB->getAll($sSQL)); if ($bRaw) return $aAddressLines; //echo "

";
 		//var_dump($aAddressLines);
@@ -829,105 +680,6 @@
 	}
 
 
-	function geocodeReverse($fLat, $fLon, $iZoom=18)
-	{
-		$oDB =& getDB();
-
-		$sPointSQL = "ST_SetSRID(ST_Point($fLon,$fLat),4326)";
-
-		// Zoom to rank, this could probably be calculated but a lookup gives fine control
-		$aZoomRank = array(
-				0 => 2, // Continent / Sea
-				1 => 2,
-				2 => 2,
-				3 => 4, // Country
-				4 => 4,
-				5 => 8, // State
-				6 => 10, // Region
-				7 => 10,
-				8 => 12, // County
-				9 => 12,
-				10 => 17, // City
-				11 => 17,
-				12 => 18, // Town / Village
-				13 => 18,
-				14 => 22, // Suburb
-				15 => 22,
-				16 => 26, // Street, TODO: major street?
-				17 => 26,
-				18 => 30, // or >, Building
-				19 => 30, // or >, Building
-				);
-		$iMaxRank = isset($aZoomRank[$iZoom])?$aZoomRank[$iZoom]:28;
-
-		// Find the nearest point
-		$fSearchDiam = 0.0001;
-		$iPlaceID = null;
-		$aArea = false;
-		$fMaxAreaDistance = 1;
-		while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
-		{
-			$fSearchDiam = $fSearchDiam * 2;
-
-			// If we have to expand the search area by a large amount then we need a larger feature
-			// then there is a limit to how small the feature should be
-			if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4;
-			if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8;
-			if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10;
-			if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12;
-			if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17;
-			if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18;
-			if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
-			if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
-
-			$sSQL = 'select place_id,parent_place_id 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)';
-			$sSQL .= ' and class not in (\'waterway\')';
-			$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
-			$sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))';
-			$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-			//var_dump($sSQL);
-			$aPlace = $oDB->getRow($sSQL);
-			if (PEAR::IsError($aPlace))
-			{
-				var_Dump($sSQL, $aPlace);
-				exit;
-			}
-			$iPlaceID = $aPlace['place_id'];
-		}
-
-		// The point we found might be too small - use the address to find what it is a child of
-		if ($iPlaceID)
-		{
-			$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc limit 1";
-			$iPlaceID = $oDB->getOne($sSQL);
-			if (PEAR::IsError($iPlaceID))
-			{
-				var_Dump($sSQL, $iPlaceID);
-				exit;
-			}
-
-			if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
-			{
-				$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc";
-				$iPlaceID = $oDB->getOne($sSQL);
-				if (PEAR::IsError($iPlaceID))
-				{
-					var_Dump($sSQL, $iPlaceID);
-					exit;
-				}
-			}
-			if (!$iPlaceID)
-			{
-				$iPlaceID = $aPlace['place_id'];
-			}
-		}
-
-		return $iPlaceID;
-	}
-
 	function addQuotes($s)
 	{
 		return "'".$s."'";
@@ -1024,27 +776,47 @@
 	}
 
 
-
-	function geometryText2Points($geometry_as_text,$fRadius)
+	function geometryText2Points($geometry_as_text, $fRadius)
 	{
 		$aPolyPoints = NULL;
-		if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$geometry_as_text,$aMatch))
+		if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch))
 		{
-			preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
+			preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
 		}
-		elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$geometry_as_text,$aMatch))
+		elseif (preg_match('#LINESTRING\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch))
 		{
-			preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
+			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))
+		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('',$aMatch[1]+($fRadius*sin($f)),$aMatch[2]+($fRadius*cos($f)));
+				$aPolyPoints[] = array('', $fLon+($fRadius*sin($f)), $fLat+($fRadius*cos($f)) );
 			}
-		}
-		return $aPolyPoints;
+			return $aPolyPoints;
 	}