From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 22 Jul 2012 07:02:55 +0000 (+0200)
Subject: Merge branch 'patch-1' of https://github.com/Firefishy/Nominatim
X-Git-Tag: v2.0.0~42
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d396505786ce3be105249c740e0d3365beb4ef10?hp=-c

Merge branch 'patch-1' of https://github.com/Firefishy/Nominatim
---

d396505786ce3be105249c740e0d3365beb4ef10
diff --combined lib/template/search-html.php
index 89e4800b,70ca70e0..9269672d
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@@ -358,7 -358,7 +358,7 @@@ target="_blank">FAQ</a></td
  			echo ', '.$aResult['aBoundingBox'][1];
  			echo ', '.$aResult['aBoundingBox'][2];
  			echo ', '.$aResult['aBoundingBox'][3];
 -			if (isset($aResult['aPolyPoints'])) echo ', '.javascript_renderData($aResult['aPolyPoints']);
 +			if (isset($aResult['aPolyPoints'])) echo ', '.json_encode($aResult['aPolyPoints']);
  			echo ');\'>';
  		}
  		elseif (isset($aResult['zoom']))
@@@ -372,7 -372,7 +372,7 @@@
  
  		echo (isset($aResult['icon'])?'<img src="'.$aResult['icon'].'">':'');
  		echo ' <span class="name">'.$aResult['name'].'</span>';
- 		echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],3).'</span>';
+ 		echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lon'],3).'</span>';
  		echo ' <span class="place_id">'.$aResult['place_id'].'</span>';
  		if (isset($aResult['label']))
  			echo ' <span class="type">('.$aResult['label'].')</span>';