X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fbc5ba13f8a28f8e5fc83675823efbaeea6dcb70..0f2173f81b4121594c6f6497b34aafae92b04703:/lib/lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 9de5ccc9..48fba5ac 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -178,7 +178,7 @@
 	{
 		$aResult = array(array(join(' ',$aWords)));
 		$sFirstToken = '';
-		if ($iDepth < 8) {
+		if ($iDepth < 7) {
 			while(sizeof($aWords) > 1)
 			{
 				$sWord = array_shift($aWords);
@@ -378,7 +378,7 @@
  'landuse:farm' => array('label'=>'Farm','frequency'=>1201,'icon'=>'', 'defdiameter' => 0.02,),
  'place:farm' => array('label'=>'Farm','frequency'=>1162,'icon'=>'', 'defdiameter' => 0.02,),
 
- 'highway:motorway_junction' => array('label'=>'Motorway Junction','frequency'=>1126,'icon'=>'','simplelabel'=>'Road',),
+ 'highway:motorway_junction' => array('label'=>'Motorway Junction','frequency'=>1126,'icon'=>'','simplelabel'=>'Junction',),
  'highway:motorway' => array('label'=>'Motorway','frequency'=>4627,'icon'=>'','simplelabel'=>'Road',),
  'highway:trunk' => array('label'=>'Trunk','frequency'=>23084,'icon'=>'','simplelabel'=>'Road',),
  'highway:primary' => array('label'=>'Primary','frequency'=>32138,'icon'=>'','simplelabel'=>'Road',),
@@ -671,7 +671,10 @@
 	function javascript_renderData($xVal)
 	{
 		header("Access-Control-Allow-Origin: *");
-		$jsonout = json_encode($xVal);
+		$iOptions = 0;
+		if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400)
+			$iOptions = JSON_UNESCAPED_UNICODE;
+		$jsonout = json_encode($xVal, $iOptions);
 
 		if( ! isset($_GET['json_callback']))
 		{