X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e02c9b6e69eac1493316dbc69c7e94720c1217a8..dbb1f5c0e20ea2d915da4638b74d6579801c4586:/lib/template/details-html.php?ds=sidebyside

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index e7328b3a..1da69301 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -9,7 +9,7 @@
 	<script src="js/OpenLayers.js" type="text/javascript"></script>
 	<script src="js/tiles.js" type="text/javascript"></script>
 	<script type="text/javascript">
-        
+
 		var map;
 
     function init() {
@@ -18,7 +18,6 @@
 										new OpenLayers.Control.Permalink(),
 										new OpenLayers.Control.Navigation(),
 										new OpenLayers.Control.PanZoomBar(),
-										new OpenLayers.Control.MouseDefaults(),
 										new OpenLayers.Control.MousePosition(),
 										new OpenLayers.Control.Attribution()],
                 maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
@@ -46,18 +45,31 @@
 			});
 
 			var feature = freader.read('<?php echo $aPointDetails['outlinestring'];?>');
+			var featureCentre = freader.read('POINT(<?php echo $aPointDetails['lon'];?> <?php echo $aPointDetails['lat'];?>)');
 			if (feature) {
 				map.zoomToExtent(feature.geometry.getBounds());
-
 				feature.style = {
 					strokeColor: "#75ADFF",
 					fillColor: "#F0F7FF",
 					strokeWidth: <?php echo ($aPointDetails['isarea']=='t'?'2':'5');?>,
 					strokeOpacity: 0.75,
 					fillOpacity: 0.75,
-					pointRadius: 100
+					pointRadius: 50
+				};
+
+<?php if ($aPointDetails['isarea']=='t') {?>
+				featureCentre.style = {
+					strokeColor: "#008800",
+					fillColor: "#338833",
+					strokeWidth: <?php echo ($aPointDetails['isarea']=='t'?'2':'5');?>,
+					strokeOpacity: 0.75,
+					fillOpacity: 0.75,
+					pointRadius: 8
 				};
+				vectorLayer.addFeatures([feature,featureCentre]);
+<?php } else { ?>
 				vectorLayer.addFeatures([feature]);
+<?php } ?>
 			}
 		}
 	</script>
@@ -68,9 +80,9 @@
 	echo '<h1>';
 	if ($aPointDetails['icon'])
 	{
-		echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'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'.'" alt="'.$aPointDetails['icon'].'" />';
 	}
-	echo $aPointDetails['localname'].'</h1>';
+	echo $aPointDetails['localname']."</h1>\n";
 	echo '<div class="locationdetails">';
 	echo ' <div>Name: ';
 	foreach($aPointDetails['aNames'] as $sKey => $sValue)
@@ -79,10 +91,12 @@
 	}
 	echo ' </div>';
 	echo ' <div>Type: <span class="type">'.$aPointDetails['class'].':'.$aPointDetails['type'].'</span></div>';
+	echo ' <div>Last Updated: <span class="type">'.$aPointDetails['indexed_date'].'</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>';
+	if ($aPointDetails['calculated_importance']) echo ' <div>Importance: <span class="rankaddress">'.$aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)').'</span></div>';
 	echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</span></div>';
+	echo ' <div>Centre Point: <span class="area">'.$aPointDetails['lat'].','.$aPointDetails['lon'].'</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">'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPointDetails['osm_id'].'">'.$aPointDetails['osm_id'].'</a></span></div>';
 	if ($aPointDetails['wikipedia'])
@@ -96,9 +110,9 @@
 		echo ' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>';
 	}
 	echo ' </div>';
-	echo '</div>';
+	echo "</div>\n";
 
-	echo '<h2>Address</h2>';
+	echo "<h2>Address</h2>\n";
 	echo '<div class="address">';
 	$iPrevRank = 1000000;
 	$sPrevLocalName = '';
@@ -122,14 +136,14 @@
 		echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
 		echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
 		echo ')';
-		echo '</div>';
+		echo "</div>\n";
 	}
-	echo '</div>';
+	echo "</div>\n";
 
 	if ($aLinkedLines)
 	{
-		echo '<h2>Linked Places</h2>';
-		echo '<div class=\"linked\">';
+		echo "<h2>Linked Places</h2>\n";
+		echo '<div class="linked">';
 		foreach($aLinkedLines as $aAddressLine)
 		{	
 			$sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
@@ -138,16 +152,16 @@
 			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>';
+			if ($sOSMType) echo ', <span class="osm">'.$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>';
+			if (isset($aAddressLine['rank_search_label'])) 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>\n";
 		}
-		echo '</div>';
+		echo "</div>\n";
 	}
 
 	if ($aPlaceSearchNameKeywords)
@@ -155,7 +169,7 @@
 		echo '<h2>Name Keywords</h2>';
 		foreach($aPlaceSearchNameKeywords as $aRow)
 		{
-			echo '<div>'.$aRow['word_token'].'</div>';
+			echo '<div>'.$aRow['word_token']."</div>\n";
 		}
 	}
 
@@ -164,24 +178,28 @@
 		echo '<h2>Address Keywords</h2>';
 		foreach($aPlaceSearchAddressKeywords as $aRow)
 		{
-			echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'.'</div>';
+			echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n";
 		}
 	}
 
 	if (sizeof($aParentOfLines))
 	{
-		echo '<h2>Parent Of:</h2>';
+		echo "<h2>Parent Of:</h2>\n<div>\n";
 
 		$aGroupedAddressLines = array();
 		foreach($aParentOfLines as $aAddressLine)
 		{
-			if (!isset($aGroupedAddressLines[$aAddressLine['type']])) $aGroupedAddressLines[$aAddressLine['type']] = array();
-			$aGroupedAddressLines[$aAddressLine['type']][] = $aAddressLine;
+			if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
+			else $sType = $aAddressLine['type'];
+
+			if (!isset($aGroupedAddressLines[$sType]))
+				$aGroupedAddressLines[$sType] = array();
+			$aGroupedAddressLines[$sType][] = $aAddressLine;
 		}
 		foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
 		{
 			$sGroupHeading = ucwords($sGroupHeading);
-			echo "<h3>$sGroupHeading</h3>";
+			echo "<h3>$sGroupHeading</h3>\n";
 		foreach($aParentOfLines as $aAddressLine)
 		{
 			$aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
@@ -190,15 +208,12 @@
 			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>';
-//			echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
-//			echo ', <span class="rankaddress">'.$aAddressLine['rank_address'].'</span>';
 			echo '<span class="area">'.($aAddressLine['isarea']=='t'?'Polygon':'Point').'</span>';
 			echo ', <span class="distance">~'.(round($aAddressLine['distance']*69,1)).'&nbsp;miles</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>';
+			if ($sOSMType) echo ', <span class="osm">'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
 			echo ', <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
 			echo ')';
-			echo '</div>';
+			echo "</div>\n";
 		}
 		}
 		if (sizeof($aParentOfLines) >= 500) {