X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b0ed31b6d48da40f90d3fd0e0aa71394984a6c76..20f1939c4c61ef28b128593b2ae5f841af567042:/lib/template/search-html.php?ds=sidebyside

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 986b4e4d..7698ebd0 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -208,7 +208,7 @@ form{
 			map.panTo(lonLat, <?php echo $iZoom ?>);
 		}
 
-		function panToLatLonZoom(lat,lon, zoom) {
+		function panToLatLonZoom(lat, lon, zoom) {
 			var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
 			if (zoom != map.getZoom())
 				map.setCenter(lonLat, zoom);
@@ -220,6 +220,8 @@ form{
 		        var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
 		        var proj_map = map.getProjectionObject();
                         map.zoomToExtent(new OpenLayers.Bounds(minlon,minlat,maxlon,maxlat).transform(proj_EPSG4326, proj_map));
+			var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
+			map.panTo(lonLat, <?php echo $iZoom ?>);
 
                         var pointList = [];
                         var style = {
@@ -290,10 +292,11 @@ form{
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326"),
                 eventListeners: {
-									"moveend": mapEventMove,
+									"moveend": mapEventMove
 								}
             	} );
-			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
+			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default",
+                         { attribution : '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'}));
 
 			var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
 			layer_style.fillOpacity = 0.2;
@@ -317,7 +320,7 @@ form{
 	<div id="seachheaderfade1"></div><div id="seachheaderfade2"></div><div id="seachheaderfade3"></div><div id="seachheaderfade4"></div>
 
 	<div id="seachheader">
-		<form action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">
+		<form accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">
 			<table border="0" width="100%">
 				<tr>
 					<td valign="center" style="width:30px;"><img src="images/logo.gif"></td>
@@ -330,7 +333,7 @@ form{
 <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Documentation</a> | <a href="http://wiki.openstreetmap.org/wiki/Nominatim/FAQ" 
 target="_blank">FAQ</a></td>
 
-<?php } ?>					<td style="text-align:right;"><?php if ($sQuery) { if ($sReportDescription) {?><div style="text-align:center;"><b>Thank you for your problem report</b></div><?php } else { ?><input type="button" value="Report Problem With Results" onclick="$('report').style.visibility=($('report').style.visibility=='hidden'?'visible':'hidden')"><?php }} ?></td>
+<?php } ?>					<td style="text-align:right;"><?php if ($sQuery) { ?><input type="button" value="Report Problem With Results" onclick="$('report').style.visibility=($('report').style.visibility=='hidden'?'visible':'hidden')"><?php } ?></td>
 				</tr>
 			</table>
 		</form>
@@ -356,7 +359,7 @@ target="_blank">FAQ</a></td>
 			echo ', '.$aResult['aBoundingBox'][1];
 			echo ', '.$aResult['aBoundingBox'][2];
 			echo ', '.$aResult['aBoundingBox'][3];
-			echo ', '.javascript_renderData($aResult['aPolyPoints']);
+			if (isset($aResult['aPolyPoints'])) echo ', '.json_encode($aResult['aPolyPoints']);
 			echo ');\'>';
 		}
 		elseif (isset($aResult['zoom']))
@@ -368,11 +371,14 @@ target="_blank">FAQ</a></td>
 			echo '<div class="result" onClick="panToLatLon('.$aResult['lat'].', '.$aResult['lon'].');">';
 		}
 
-		echo ($aResult['icon']?'<img src="'.$aResult['icon'].'">':'');
+		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>';
-		echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
+		if (isset($aResult['label']))
+			echo ' <span class="type">('.$aResult['label'].')</span>';
+		else
+			echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
 		echo ' <span class="details">(<a href="details.php?place_id='.$aResult['place_id'].'">details</a>)</span>';
 		echo '</div>';
 	}
@@ -445,7 +451,11 @@ init();
 			echo ', '.$aResult['aBoundingBox'][1];
 			echo ', '.$aResult['aBoundingBox'][2];
 			echo ', '.$aResult['aBoundingBox'][3];
-			echo ', '.javascript_renderData($aResult['aPolyPoints']);
+			if (isset($aResult['aPolyPoints']))
+			{
+				echo ', ';
+				echo javascript_renderData($aResult['aPolyPoints']);
+			}
 			echo ');'."\n";
 		}
 		else