X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/07628dc05daf0345fab3307601f05186ba863456..63f53beb972ef51cc0c0c6ecc3c134e7d4cb6284:/lib/template/details-html.php?ds=sidebyside

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 463eb4aa..dedf52f3 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -1,288 +1,262 @@
 <?php
-	header("content-type: text/html; charset=UTF-8");
+    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" />
+    <link href="css/common.css" rel="stylesheet" type="text/css" />
+    <link href="css/details.css" rel="stylesheet" type="text/css" />
 </head>
 
 
-
 <?php
 
-	function headline($sTitle)
-	{
-		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)
-		{
-			return '<a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
-		}
-		return '';
-	}
-
-	function wikipedia_link($aFeature)
-	{
-		if ($aFeature['wikipedia'])
-		{
-			list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aFeature['wikipedia']);
-			return '<a href="https://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'" target="_blank">'.$aFeature['wikipedia'].'</a>';
-		}
-		return '';
-	}
-
-	function nominatim_link($aFeature, $sTitle)
-	{
-		return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.$sTitle.'</a>';
-	}
-
-	function format_distance($fDistance)
-	{
-		// $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)
-	{
-		echo ' <tr><td>' . $sKey . '</td><td>'.$sValue.'</td></tr>'. "\n";
-	}
-
-
-	function hash_to_subtable($aAssociatedList)
-	{
-		$sHTML = '';
-		foreach($aAssociatedList as $sKey => $sValue)
-		{
-			$sHTML = $sHTML.' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>'."\n";
-		}
-		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){
-			echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
-		}
-	}
-
-
-	function _one_row($aAddressLine){
-		$bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
-
-		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>\n";
-		echo '  <td>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n";
-		echo "</tr>\n";
-	}
+    function headline($sTitle)
+    {
+        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 format_distance($fDistance)
+    {
+        // $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)
+    {
+        echo ' <tr><td>' . $sKey . '</td><td>'.$sValue.'</td></tr>'. "\n";
+    }
+
+
+    function hash_to_subtable($aAssociatedList)
+    {
+        $sHTML = '';
+        foreach($aAssociatedList as $sKey => $sValue)
+        {
+            $sHTML = $sHTML.' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>'."\n";
+        }
+        return $sHTML;
+    }
+
+    function map_icon($sIcon)
+    {
+        if ($sIcon){
+            echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
+        }
+    }
+
+
+    function _one_row($aAddressLine){
+        $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
+
+        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>' . osmLink($aAddressLine) . "</td>\n";
+        echo '  <td>' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . "</td>\n";
+        echo '  <td>' . ($aAddressLine['admin_level'] < 15 ? $aAddressLine['admin_level'] : '') . "</td>\n";
+        echo '  <td>' . format_distance($aAddressLine['distance'])."</td>\n";
+        echo '  <td>' . detailsLink($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">
-				<h1><?php echo $aPointDetails['localname'] ?></h1>
-			</div>
-			<div class="col-sm-2 text-right">
-				<?php map_icon($aPointDetails['icon']) ?>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-md-6">
-				<table id="locationdetails" class="table table-striped">
-
-				<?php
-
-					kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
-					kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
-					kv('Last Updated'    , $aPointDetails['indexed_date'] );
-					kv('Admin Level'     , $aPointDetails['admin_level'] );
-					kv('Rank'            , $aPointDetails['rank_search_label'] );
-					if ($aPointDetails['calculated_importance']) {
-						kv('Importance'    , $aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)') );
-					}
-					kv('Coverage'        , ($aPointDetails['isarea']=='t'?'Polygon':'Point') );
-					kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
-					kv('OSM'             , osm_link($aPointDetails) );
-					if ($aPointDetails['wikipedia'])
-					{
-						kv('Wikipedia Calculated' , wikipedia_link($aPointDetails) );
-					}
-
-					kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
-
-				?>
-
-				</table>
-			</div>
-
-			<div class="col-md-6">
-				<div id="map"></div>
-			</div>
-
-		</div>
-		<div class="row">
-			<div class="col-md-12">
-
-			<h2>Address</h2>
-
-			<table id="address" class="table table-striped table-responsive">
-				<thead>
-					<tr>
-					  <td>Local name</td>
-					  <td>Type</td>
-					  <td>OSM</td>
-					  <td>Admin level</td>
-					  <!-- <td>Search rank</td> -->
-					  <td>Distance</td>
-					  <td></td>
-					</tr>
-				</thead>
-				<tbody>
-
-				<?php
-
-					foreach($aAddressLines as $aAddressLine)
-					{	
-						_one_row($aAddressLine);
-					}
-				?>
-	
+    <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-10">
+                <h1><?php echo $aPointDetails['localname'] ?></h1>
+            </div>
+            <div class="col-sm-2 text-right">
+                <?php map_icon($aPointDetails['icon']) ?>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-6">
+                <table id="locationdetails" class="table table-striped">
+
+                <?php
+
+                    kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
+                    kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
+                    kv('Last Updated'    , $aPointDetails['indexed_date'] );
+                    kv('Admin Level'     , $aPointDetails['admin_level'] );
+                    kv('Rank'            , $aPointDetails['rank_search_label'] );
+                    if ($aPointDetails['calculated_importance']) {
+                        kv('Importance'    , $aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)') );
+                    }
+                    kv('Coverage'        , ($aPointDetails['isarea']=='t'?'Polygon':'Point') );
+                    kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
+                    kv('OSM'             , osmLink($aPointDetails) );
+                    if ($aPointDetails['wikipedia'])
+                    {
+                        kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );
+                    }
+
+                    kv('Computed Postcode', $aPointDetails['postcode']);
+                    kv('Address Tags'    , hash_to_subtable($aPointDetails['aAddressTags']) );
+                    kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
+
+                ?>
+
+                </table>
+            </div>
+
+            <div class="col-md-6">
+                <div id="map"></div>
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+
+            <h2>Address</h2>
+
+            <table id="address" class="table table-striped table-responsive">
+                <thead>
+                    <tr>
+                      <td>Local name</td>
+                      <td>Type</td>
+                      <td>OSM</td>
+                      <td>Address rank</td>
+                      <td>Admin level</td>
+                      <td>Distance</td>
+                      <td></td>
+                    </tr>
+                </thead>
+                <tbody>
+
+                <?php
+
+                    foreach($aAddressLines as $aAddressLine)
+                    {   
+                        _one_row($aAddressLine);
+                    }
+                ?>
+    
 
 
 <?php
 
-	if ($aLinkedLines)
-	{
-		headline('Linked Places');
-		foreach($aLinkedLines as $aAddressLine)
-		{	
-			_one_row($aAddressLine);
-		}
-	}
-
-
-
-	if ($aPlaceSearchNameKeywords)
-	{
-		headline('Name Keywords');
-		foreach($aPlaceSearchNameKeywords as $aRow)
-		{
-			echo '<div>'.$aRow['word_token']."</div>\n";
-		}
-	}
-
-	if ($aPlaceSearchAddressKeywords)
-	{
-		headline('Address Keywords');
-		foreach($aPlaceSearchAddressKeywords as $aRow)
-		{
-			echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n";
-		}
-	}
-	
-	if (sizeof($aParentOfLines))
-	{
-		headline('Parent Of');
-
-		$aGroupedAddressLines = array();
-		foreach($aParentOfLines as $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);
-			headline3($sGroupHeading);
-
-			foreach($aParentOfLines as $aAddressLine)
-			{
-				_one_row($aAddressLine);
-			}
-		}
-		if (sizeof($aParentOfLines) >= 500) {
-			echo '<p>There are more child objects which are not shown.</p>';
-		}
-	}
-
-	// headline('Other Parts');
-	// headline('Linked To');
-
-	echo "</table>\n";
+    if ($aLinkedLines)
+    {
+        headline('Linked Places');
+        foreach($aLinkedLines as $aAddressLine)
+        {   
+            _one_row($aAddressLine);
+        }
+    }
+
+
+
+    if ($aPlaceSearchNameKeywords)
+    {
+        headline('Name Keywords');
+        foreach($aPlaceSearchNameKeywords as $aRow)
+        {
+            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+        }
+    }
+
+    if ($aPlaceSearchAddressKeywords)
+    {
+        headline('Address Keywords');
+        foreach($aPlaceSearchAddressKeywords as $aRow)
+        {
+            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+        }
+    }
+    
+    if (sizeof($aParentOfLines))
+    {
+        headline('Parent Of');
+
+        $aGroupedAddressLines = array();
+        foreach($aParentOfLines as $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);
+            headline3($sGroupHeading);
+
+            foreach($aParentOfLines as $aAddressLine)
+            {
+                _one_row($aAddressLine);
+            }
+        }
+        if (sizeof($aParentOfLines) >= 500) {
+            echo '<p>There are more child objects which are not shown.</p>';
+        }
+    }
+
+    echo "</table>\n";
 ?>
 
-			</div>
-		</div>
-	</div>
+            </div>
+        </div>
+    </div>
 
-	<script type="text/javascript">
-	<?php
+    <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(
+                'asgeojson' => $aPointDetails['asgeojson'],
+                'lon' => $aPointDetails['lon'],
+                'lat' => $aPointDetails['lat'],
+        );
+        echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
 
-	?>
-	</script>
+    ?>
+    </script>
 
 
 
-	<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+    <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
 </body>
 </html>