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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 6845cbb2..ae36b411 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -78,18 +78,6 @@
 		return $sHTML;
 	}
 
-	// function hash_to_subtable($aAssociatedList)
-	// {
-	// 	$sHTML = '<table class="table">';
-	// 	foreach($aAssociatedList as $sKey => $sValue)
-	// 	{
-	// 		$sHTML = $sHTML . '<tr><td>'.$sKey.'</td><td class="name">'.$sValue.'</td></tr>'."\n";
-	// 	}
-	// 	$sHTML = $sHTML . '</table>';
-	// 	return $sHTML;
-	// }
-
-
 	function map_icon($sIcon)
 	{
 		if ($sIcon){
@@ -106,13 +94,24 @@
 		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>\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";
+	}
+
 ?>
 
 
@@ -174,7 +173,6 @@
 					  <td>Type</td>
 					  <td>OSM</td>
 					  <td>Admin level</td>
-					  <!-- <td>Search rank</td> -->
 					  <td>Distance</td>
 					  <td></td>
 					</tr>
@@ -209,7 +207,7 @@
 		headline('Name Keywords');
 		foreach($aPlaceSearchNameKeywords as $aRow)
 		{
-			echo '<div>'.$aRow['word_token']."</div>\n";
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
 		}
 	}
 
@@ -218,7 +216,7 @@
 		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']);
 		}
 	}
 	
@@ -251,9 +249,6 @@
 		}
 	}
 
-	// headline('Other Parts');
-	// headline('Linked To');
-
 	echo "</table>\n";
 ?>
 
@@ -264,21 +259,21 @@
 	<script type="text/javascript">
 	<?php
 
-    $aNominatimMapInit = [
-      'tile_url' => $sTileURL,
-      'tile_attribution' => $sTileAttribution
-    ];
-    echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
+		$aNominatimMapInit = array(
+		  'tile_url' => $sTileURL,
+		  'tile_attribution' => $sTileAttribution
+		);
+		echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
-    $aPlace = [
-			'outlinestring' => $aPointDetails['outlinestring'],
-			'lon' => $aPointDetails['lon'],
-			'lat' => $aPointDetails['lat'],
-    ];
-	  echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
+		$aPlace = array(
+				'outlinestring' => $aPointDetails['outlinestring'],
+				'lon' => $aPointDetails['lon'],
+				'lat' => $aPointDetails['lat'],
+		);
+		echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
 
-  ?>
+	?>
 	</script>