X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c7eea2e41914b0757d6deb3cd595ae6b7458db38..50f17666fa0200c5b1131b784347867f61f0f8aa:/lib/template/details-html.php

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index da36167c..3e9e39d7 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -2,6 +2,7 @@
 	header("content-type: text/html; charset=UTF-8");
 ?>
 <?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+	<link href="css/common.css" rel="stylesheet" type="text/css" />
 	<link href="css/details.css" rel="stylesheet" type="text/css" />
 </head>
 
@@ -11,13 +12,19 @@
 
 	function headline($sTitle)
 	{
-		echo "<h2>".$sTitle."</h2>\n";
+		echo "<tr class='all-columns'><td colspan='6'><h2>".$sTitle."</h2></td></tr>\n";
+	}
+
+	function headline3($sTitle)
+	{
+		echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";
 	}
 
 	function osm_link($aFeature)
 	{
 		$sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
-		if ($sOSMType) {
+		if ($sOSMType)
+		{
 			return '<a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
 		}
 		return '';
@@ -28,7 +35,7 @@
 		if ($aFeature['wikipedia'])
 		{
 			list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aFeature['wikipedia']);
-			return '<a href="http://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'">'.$aFeature['wikipedia'].'</a>';
+			return '<a href="https://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'" target="_blank">'.$aFeature['wikipedia'].'</a>';
 		}
 		return '';
 	}
@@ -40,7 +47,19 @@
 
 	function format_distance($fDistance)
 	{
-		return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance,1)).' km</abbr>';
+		// $fDistance is in meters
+		if ($fDistance < 1)
+		{
+			return '0';
+		}
+		elseif ($fDistance < 1000)
+		{
+			return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance,0)).' m</abbr>';
+		}
+		else
+		{
+			return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance/1000,1)).' km</abbr>';
+		}
 	}
 
 	function kv($sKey,$sValue)
@@ -82,23 +101,37 @@
 	function _one_row($aAddressLine){
 		$bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
 
-		echo '<tr class="' . ($bNotUsed?'notused':'') . '">';
-		echo '  <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</td>';
-		echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . '</td>';
-		echo '  <td>' . osm_link($aAddressLine) . '</td>';
-		echo '  <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . '</td>';
-		// echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') .'</td>';
+		echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
+		echo '  <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
+		echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
+		echo '  <td>' . osm_link($aAddressLine) . "</td>\n";
+		echo '  <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "</td>\n";
+		// echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') ."</td>\n";
 		// echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
-		echo '  <td>' . format_distance($aAddressLine['distance']).'</td>';;
-		echo '  <td>' . nominatim_link($aAddressLine,'details &gt;') . '</td>';;
+		echo '  <td>' . format_distance($aAddressLine['distance'])."</td>\n";
+		echo '  <td>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n";
 		echo "</tr>\n";
 	}
 
+	function _one_keyword_row($keyword_token,$word_id){
+		echo "<tr>\n";
+		echo '<td>';
+		// mark partial tokens (those starting with a space) with a star for readability
+		echo ($keyword_token[0]==' '?'*':'');
+		echo $keyword_token;
+		if (isset($word_id))
+		{
+			echo '</td><td>word id: '.$word_id;
+		}
+		echo "</td></tr>\n";
+	}
+
 ?>
 
 
 
 <body id="details-page">
+	<?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
 	<div class="container">
 		<div class="row">
 			<div class="col-sm-10">
@@ -169,8 +202,6 @@
 					}
 				?>
 	
-				</tbody>
-			</table>
 
 
 <?php
@@ -178,12 +209,10 @@
 	if ($aLinkedLines)
 	{
 		headline('Linked Places');
-		echo '<table id="linked" class="table table-striped table-responsive">';
 		foreach($aLinkedLines as $aAddressLine)
 		{	
 			_one_row($aAddressLine);
 		}
-		echo '</table>';
 	}
 
 
@@ -193,7 +222,7 @@
 		headline('Name Keywords');
 		foreach($aPlaceSearchNameKeywords as $aRow)
 		{
-			echo '<div>'.$aRow['word_token']."</div>\n";
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
 		}
 	}
 
@@ -202,10 +231,10 @@
 		headline('Address Keywords');
 		foreach($aPlaceSearchAddressKeywords as $aRow)
 		{
-			echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n";
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
 		}
 	}
-
+	
 	if (sizeof($aParentOfLines))
 	{
 		headline('Parent Of');
@@ -223,14 +252,12 @@
 		foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
 		{
 			$sGroupHeading = ucwords($sGroupHeading);
-			echo "<h3>$sGroupHeading</h3>\n";
+			headline3($sGroupHeading);
 
-			echo '<table id="linked" class="table table-striped table-responsive">';
 			foreach($aParentOfLines as $aAddressLine)
 			{
 				_one_row($aAddressLine);
 			}
-			echo '</table>';
 		}
 		if (sizeof($aParentOfLines) >= 500) {
 			echo '<p>There are more child objects which are not shown.</p>';
@@ -239,31 +266,36 @@
 
 	// headline('Other Parts');
 	// headline('Linked To');
+
+	echo "</table>\n";
 ?>
 
 			</div>
 		</div>
 	</div>
 
-	<footer>
-		<p class="copyright">
-			&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors
-		</p>
-	</footer>
+	<script type="text/javascript">
+	<?php
 
+		$aNominatimMapInit = [
+		  'tile_url' => $sTileURL,
+		  'tile_attribution' => $sTileAttribution
+		];
+		echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
-	<script type="text/javascript">
+		$aPlace = [
+				'outlinestring' => $aPointDetails['outlinestring'],
+				'lon' => $aPointDetails['lon'],
+				'lat' => $aPointDetails['lat'],
+		];
+		echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
-		var nominatim_result = {
-			outlinestring: '<?php echo $aPointDetails['outlinestring'];?>',
-			lon: <?php echo $aPointDetails['lon'];?>,
-			lat: <?php echo $aPointDetails['lat'];?>,
-		};
 
+	?>
 	</script>
 
 
 
 	<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
-  </body>
+</body>
 </html>