X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1cb55c6e318cb86cd1d44463eff4b951496134c0..fa90ece530c124df72ad1fa4645892b62b107be6:/lib/lib.php diff --git a/lib/lib.php b/lib/lib.php index cc8a90e0..91fe21b2 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -25,6 +25,19 @@ } + function userError($sError) + { + header('HTTP/1.0 400 Bad Request'); + header('Content-type: text/html; charset=utf-8'); + 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 fail($sError, $sUserError = false) { if (!$sUserError) $sUserError = $sError; @@ -47,7 +60,7 @@ { $sLoadAverage = file_get_contents('/proc/loadavg'); $aLoadAverage = explode(' ',$sLoadAverage); - return (int)$aLoadAverage[0]; + return (float)$aLoadAverage[0]; } function getProcessorCount() @@ -94,7 +107,7 @@ return ($a['foundorder'] < $b['foundorder']?-1:1); } - function getPrefferedLangauges() + function getPreferredLanguages() { // If we have been provided the value in $_GET it overrides browser value if (isset($_GET['accept-language']) && $_GET['accept-language']) @@ -273,7 +286,7 @@ return false; /* - $fTotalFac is a suprisingly good indicator of accuracy + $fTotalFac is a surprisingly good indicator of accuracy $iZoom = 18 + round(log($fTotalFac,32)); $iZoom = max(13,min(18,$iZoom)); */ @@ -597,7 +610,7 @@ { header("Access-Control-Allow-Origin: *"); - $jsonout = json_encode($xVal, JSON_UNESCAPED_UNICODE); + $jsonout = json_encode($xVal); if( ! isset($_GET['json_callback'])) { header("Content-Type: application/json; charset=UTF-8"); @@ -890,3 +903,139 @@ return $iPlaceID; } + + function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank) + { + if (!isset($_GET[$sKey])) return false; + $sValue = trim($_GET[$sKey]); + if (!$sValue) return false; + $aStructuredQuery[$sKey] = $sValue; + if ($iMinAddressRank == 0 && $iMaxAddressRank == 30) { + $iMinAddressRank = $iNewMinAddressRank; + $iMaxAddressRank = $iNewMaxAddressRank; + } + return true; + } + + function getBucketMemcache() + { + static $m; + + if (!CONST_ConnectionBucket_MemcacheServerAddress) return null; + if (!isset($m)) + { + $m = new Memcached(); + $m->addServer(CONST_ConnectionBucket_MemcacheServerAddress, CONST_ConnectionBucket_MemcacheServerPort); + } + return $m; + } + + function doBucket($asKey, $iRequestCost, $iLeakPerSecond, $iThreshold) + { + $m = getBucketMemcache(); + if (!$m) return 0; + + $iMaxVal = 0; + $t = time(); + + foreach($asKey as $sKey) + { + $aCurrentBlock = $m->get($sKey); + if (!$aCurrentBlock) + { + $aCurrentBlock = array($iRequestCost, $t); + } + else + { + // add RequestCost + // remove leak * the time since the last request + $aCurrentBlock[0] += $iRequestCost - ($t - $aCurrentBlock[1])*$iLeakPerSecond; + $aCurrentBlock[1] = $t; + } + + if ($aCurrentBlock[0] <= 0) + { + $m->delete($sKey); + } + else + { + // If we have hit the threshold stop and record this to the block list + if ($aCurrentBlock[0] >= $iThreshold) + { + $aCurrentBlock[0] = $iThreshold; + + // Make up to 10 attempts to record this to memcache (with locking to prevent conflicts) + $i = 10; + for($i = 0; $i < 10; $i++) + { + $aBlockedList = $m->get('blockedList', null, $hCasToken); + if (!$aBlockedList) + { + $aBlockedList = array(); + $m->add('blockedList', $aBlockedList); + $aBlockedList = $m->get('blockedList', null, $hCasToken); + } + if (!isset($aBlockedList[$sKey])) + { + $aBlockedList[$sKey] = array(1, $t); + } + else + { + $aBlockedList[$sKey][0]++; + $aBlockedList[$sKey][1] = $t; + } + $x = $m->cas($hCasToken, 'blockedList', $aBlockedList); + if ($x) break; + } + } + // Only keep in memcache until the time it would have expired (to avoid clutering memcache) + $m->set($sKey, $aCurrentBlock, $t + 1 + $aCurrentBlock[0]/$iLeakPerSecond); + } + + // Bucket result in the largest bucket we find + $iMaxVal = max($iMaxVal, $aCurrentBlock[0]); + } + + return $iMaxVal; + } + + function byLastBlockTime($a, $b) + { + if ($a['lastBlockTimestamp'] == $b['lastBlockTimestamp']) + { + return 0; + } + return ($a['lastBlockTimestamp'] > $b['lastBlockTimestamp']) ? -1 : 1; + } + + function getBucketBlocks() + { + $m = getBucketMemcache(); + if (!$m) return null; + $t = time(); + $aBlockedList = $m->get('blockedList', null, $hCasToken); + if (!$aBlockedList) $aBlockedList = array(); + foreach($aBlockedList as $sKey => $aDetails) + { + $aCurrentBlock = $m->get($sKey); + if (!$aCurrentBlock) $aCurrentBlock = array(0, $t); + $iCurrentBucketSize = max(0, $aCurrentBlock[0] - ($t - $aCurrentBlock[1])*CONST_ConnectionBucket_LeakRate); + $aBlockedList[$sKey] = array( + 'totalBlocks' => $aDetails[0], + 'lastBlockTimestamp' => $aDetails[1], + 'currentBucketSize' => $iCurrentBucketSize, + 'lastRequestBlocked' => $aCurrentBlock[0] >= CONST_ConnectionBucket_BlockLimit, + 'currentlyBlocked' => $iCurrentBucketSize + (CONST_ConnectionBucket_Cost_Reverse) >= CONST_ConnectionBucket_BlockLimit, + ); + } + uasort($aBlockedList, 'byLastBlockTime'); + return $aBlockedList; + } + + function clearBucketBlocks() + { + $m = getBucketMemcache(); + if (!$m) return false; + $m->delete('blockedList'); + return true; + }