echo "<html><body><h1>Internal Server Error</h1>";
echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
echo "<p><b>Details:</b> ".$sError,"</p>";
- echo '<p>Feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above an the URL you used.</p>';
+ echo '<p>Feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above and the URL you used.</p>';
if (CONST_Debug)
{
echo "<hr><h2>Debugging Information</h2><br>";
}
+ function userError($sError)
+ {
+ header('HTTP/1.0 400 Bad Request');
+ header('Content-type: text/html; charset=utf-8');
+ echo "<html><body><h1>Bad Request</h1>";
+ echo '<p>Nominatim has encountered an error with your request.</p>';
+ echo "<p><b>Details:</b> ".$sError,"</p>";
+ echo '<p>If you feel this error is incorrect feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above and the URL you used.</p>';
+ echo "\n</body></html>\n";
+ exit;
+
+ }
+
function fail($sError, $sUserError = false)
{
if (!$sUserError) $sUserError = $sError;
return sizeof($aMatches[0]);
}
+ function getTotalMemoryMB()
+ {
+ $sCPU = file_get_contents('/proc/meminfo');
+ preg_match('#MemTotal: +([0-9]+) kB#', $sCPU, $aMatches);
+ return (int)($aMatches[1]/1024);
+ }
+
+ function getCacheMemoryMB()
+ {
+ $sCPU = file_get_contents('/proc/meminfo');
+ preg_match('#Cached: +([0-9]+) kB#', $sCPU, $aMatches);
+ return (int)($aMatches[1]/1024);
+ }
+
function bySearchRank($a, $b)
{
if ($a['iSearchRank'] == $b['iSearchRank']) return 0;
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'])
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));
*/
'place:airport' => array('label'=>'Airport','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,),
'railway:station' => array('label'=>'Station','frequency'=>3431,'icon'=>'transport_train_station2', 'defdiameter' => 0.01,),
- 'amenity:place_of_worship' => array('label'=>'Place Of Worship','frequency'=>9049,'icon'=>'place_of_worship3',),
+ 'amenity:place_of_worship' => array('label'=>'Place Of Worship','frequency'=>9049,'icon'=>'place_of_worship_unknown3',),
'amenity:pub' => array('label'=>'Pub','frequency'=>18969,'icon'=>'food_pub',),
'amenity:bar' => array('label'=>'Bar','frequency'=>164,'icon'=>'food_bar',),
'amenity:university' => array('label'=>'University','frequency'=>607,'icon'=>'education_university',),
'tourism:motel' => array('label'=>'Motel','frequency'=>43,'icon'=>'',),
'amenity:cinema' => array('label'=>'Cinema','frequency'=>277,'icon'=>'tourist_cinema',),
'tourism:information' => array('label'=>'Information','frequency'=>224,'icon'=>'amenity_information',),
- 'tourism:artwork' => array('label'=>'Artwork','frequency'=>171,'icon'=>'art_gallery2',),
+ 'tourism:artwork' => array('label'=>'Artwork','frequency'=>171,'icon'=>'tourist_art_gallery2',),
'historic:archaeological_site' => array('label'=>'Archaeological Site','frequency'=>407,'icon'=>'tourist_archaeological2',),
'amenity:doctors' => array('label'=>'Doctors','frequency'=>581,'icon'=>'health_doctors',),
'leisure:sports_centre' => array('label'=>'Sports Centre','frequency'=>767,'icon'=>'sport_leisure_centre',),
}
- function javascript_isarray($xVal)
- {
- if (!is_array($xVal)) return false;
- for($i = 0; $i < sizeof($xVal); $i++)
- {
- if (!array_key_exists($i, $xVal)) return false;
- }
- return true;
- }
- function javascript_renderData($xVal, $bForceHash = false)
- {
- if (is_array($xVal))
- {
- $aVals = array();
- if (javascript_isarray($xVal) && !$bForceHash)
- {
- foreach($xVal as $sKey => $xData)
- {
- $aVals[] = javascript_renderData($xData);
- }
- return '['.join(',',$aVals).']';
- }
- else
- {
- foreach($xVal as $sKey => $xData)
- {
- $aVals[] = '"'.addslashes($sKey).'"'.':'.javascript_renderData($xData);
- }
- return '{'.join(',',$aVals).'}';
- }
- }
- else
- {
- if (is_bool($xVal)) return $xVal?'true':'false';
-// if (is_numeric($xVal)) return $xVal;
- return '"'.str_replace('>','\\>',str_replace(array("\n","\r"),'\\n',str_replace(array("\n\r","\r\n"),'\\n',str_replace('"','\\"',$xVal)))).'"';
- }
- }
+ function javascript_renderData($xVal)
+ {
+ header("Access-Control-Allow-Origin: *");
+
+ $jsonout = json_encode($xVal);
+
+ if( ! isset($_GET['json_callback'])) {
+ header("Content-Type: application/json; charset=UTF-8");
+ echo $jsonout;
+ } else {
+ if (preg_match('/^[$_\p{L}][$_\p{L}\p{Nd}.[\]]*$/u',$_GET['json_callback'])) {
+ header("Content-Type: application/javascript; charset=UTF-8");
+ echo $_GET['json_callback'].'('.$jsonout.')';
+ } else {
+ header('HTTP/1.0 400 Bad Request');
+ }
+ }
+ }
function _debugDumpGroupedSearches($aData, $aTokens)
{
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;
+ }
+
projects / nominatim.git / blobdiff