X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d3c883f1b5e1db91997ec5c4fe4a631e7135dc3f..580ace2e8a3aebacc12b3533059c9031192fd244:/lib/template/details-html.php

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 721af44d..3f416fca 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -33,7 +33,6 @@ body {
     </style>
 	<script src="js/OpenLayers.js"></script>
 	<script src="js/tiles.js"></script>
-	<script src="prototype-1.6.0.3.js"></script>
 	<script type="text/javascript">
         
 		var map;
@@ -54,7 +53,8 @@ body {
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326")
             	} );
-			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;
@@ -75,9 +75,12 @@ body {
 			var proj_map = map.getProjectionObject();
 			var latlon;
 <?php
-foreach($aPolyPoints as $aPolyPoint)
+if (isset($aPolyPoints))
 {
-	echo "                        pointList.push(new OpenLayers.Geometry.Point(".$aPolyPoint[1].",".$aPolyPoint[2]."));\n";
+	foreach($aPolyPoints as $aPolyPoint)
+	{
+		echo "                        pointList.push(new OpenLayers.Geometry.Point(".$aPolyPoint[1].",".$aPolyPoint[2]."));\n";
+	}
 }
 ?>
 			var linearRing = new OpenLayers.Geometry.LinearRing(pointList).transform(proj_EPSG4326, proj_map);;
@@ -112,6 +115,11 @@ foreach($aPolyPoints as $aPolyPoint)
 	echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</span></div>';
 	$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
 	if ($sOSMType) echo ' <div>OSM: <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPointDetails['osm_id'].'">'.$aPointDetails['osm_id'].'</a></span></div>';
+	if ($aPointDetails['wikipedia'])
+	{
+		list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aPointDetails['wikipedia']);
+		echo ' <div>Wikipedia Calculated: <span class="wikipedia"><a href="http://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'">'.$aPointDetails['wikipedia'].'</a></span></div>';
+	}
 	echo ' <div>Extra Tags: ';
 	foreach($aPointDetails['aExtraTags'] as $sKey => $sValue)
 	{
@@ -140,7 +148,7 @@ foreach($aPolyPoints as $aPolyPoint)
 		if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
 		echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
 		echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
-		echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
+//		echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
 		echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
 		echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
 		echo ')';
@@ -148,6 +156,30 @@ foreach($aPolyPoints as $aPolyPoint)
 	}
 	echo '</div>';
 
+	if ($aLinkedLines)
+	{
+		echo '<h2>Linked Places</h2>';
+		echo '<div class=\"linked\">';
+		foreach($aLinkedLines as $aAddressLine)
+		{	
+			$sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
+
+			echo '<div class="line">';
+			echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
+			echo ' (';
+			echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
+			if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
+			echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
+			echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
+//			echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
+			echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
+			echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
+			echo ')';
+			echo '</div>';
+		}
+		echo '</div>';
+	}
+
 	if ($aPlaceSearchNameKeywords)
 	{
 		echo '<h2>Name Keywords</h2>';