X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/75ec3326e1f10e72b9ce8e2a11a9c4d5db2c881d..9c0ca064b833ad39eac8ffc2447331d732d1a7d0:/lib/template/details-html.php

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 0d5f6dc6..3f416fca 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -19,7 +19,7 @@ body {
   font-weight: bold;
 }
 .notused{
-  color:#aaa;
+  color:#ddd;
 }
 .noname{
   color:#800;
@@ -31,9 +31,8 @@ body {
   float: right;
 }
     </style>
-	<script src="OpenLayers.js"></script>
-	<script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
-	<script src="prototype-1.6.0.3.js"></script>
+	<script src="js/OpenLayers.js"></script>
+	<script src="js/tiles.js"></script>
 	<script type="text/javascript">
         
 		var map;
@@ -52,9 +51,10 @@ body {
                 numZoomLevels: 19,
                 units: 'm',
                 projection: new OpenLayers.Projection("EPSG:900913"),
-                displayProjection: new OpenLayers.Projection("EPSG:4326"),
+                displayProjection: new OpenLayers.Projection("EPSG:4326")
             	} );
-			map.addLayer(new OpenLayers.Layer.OSM.Mapnik("Mapnik"));
+			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;
@@ -69,15 +69,18 @@ body {
 				fillColor: "#F0F7FF",
 				strokeWidth: 2,
 				strokeOpacity: 0.75,
-				fillOpacity: 0.75,
+				fillOpacity: 0.75
 			};
 			var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
 			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);;
@@ -95,7 +98,7 @@ foreach($aPolyPoints as $aPolyPoint)
 	echo '<h1>';
 	if ($aPointDetails['icon'])
 	{
-		echo '<img style="float:right;margin-right:40px;" src="'.'http://katie.openstreetmap.org/~twain/images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'">';
+		echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'">';
 	}
 	echo $aPointDetails['localname'].'</h1>';
 	echo '<div class="locationdetails">';
@@ -108,9 +111,21 @@ foreach($aPolyPoints as $aPolyPoint)
 	echo ' <div>Type: <span class="type">'.$aPointDetails['class'].':'.$aPointDetails['type'].'</span></div>';
 	echo ' <div>Admin Level: <span class="adminlevel">'.$aPointDetails['admin_level'].'</span></div>';
 	echo ' <div>Rank: <span class="rankaddress">'.$aPointDetails['rank_search_label'].'</span></div>';
+	if ($aPointDetails['importance']) echo ' <div>Importance: <span class="rankaddress">'.$aPointDetails['importance'].'</span></div>';
 	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)
+	{
+		echo ' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>';
+	}
+	echo ' </div>';
 	echo '</div>';
 
 	echo '<h2>Address</h2>';
@@ -121,7 +136,7 @@ foreach($aPolyPoints as $aPolyPoint)
 	{	
 		$sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
 
-		echo '<div class="line'.($iPrevRank<=$aAddressLine['rank_address'] || $sPrevLocalName == $aAddressLine['localname']?' notused':'').'">';
+		echo '<div class="line'.($aAddressLine['isaddress']=='f'?' notused':'').'">';
 		if (!($iPrevRank<=$aAddressLine['rank_address'] || $sPrevLocalName == $aAddressLine['localname']))
 		{
 			$iPrevRank = $aAddressLine['rank_address'];
@@ -133,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 ')';
@@ -141,6 +156,48 @@ 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>';
+		foreach($aPlaceSearchNameKeywords as $aRow)
+		{
+			echo '<div>'.$aRow['word_token'].'</div>';
+		}
+	}
+
+	if ($aPlaceSearchAddressKeywords)
+	{
+		echo '<h2>Address Keywords</h2>';
+		foreach($aPlaceSearchAddressKeywords as $aRow)
+		{
+			echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'.'</div>';
+		}
+	}
+
 	if (sizeof($aParentOfLines))
 	{
 		echo '<h2>Parent Of (named features only):</h2>';