X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7df80bbc6fe0a3769603fade7c124e2641dd0efb..942ed125d4c7f93a741166cfeacf8d6115623e8d:/lib/template/search-html.php

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index be98fa4a..f7013793 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -9,8 +9,8 @@
 	<link href="nominatim.xml" rel="search" title="Nominatim Search" type="application/opensearchdescription+xml" />
 
 	<script src="js/OpenLayers.js"></script>
-	<script src="js/OpenStreetMap.js"></script>
-	<script src="prototype-1.6.0.3.js"></script>
+	<script src="js/tiles.js"></script>
+	<script src="js/prototype-1.6.0.3.js"></script>
 
 	<style>
 * {-moz-box-sizing: border-box;}
@@ -293,7 +293,7 @@ form{
 									"moveend": mapEventMove,
 								}
             	} );
-			map.addLayer(new OpenLayers.Layer.OSM.Mapnik("Mapnik"));
+			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
 
 			var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
 			layer_style.fillOpacity = 0.2;
@@ -372,7 +372,10 @@ target="_blank">FAQ</a></td>
 		echo ' <span class="name">'.$aResult['name'].'</span>';
 		echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],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>';
 	}