Merge pull request #1110 from lonvia/remove-address-check-for-long-lines

[nominatim.git] / lib / template / details-html.php

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 46b6a50cb2d2c916281c3a95f5244afdb8938b43..4d5ccb87c60c23c1b35e1f22b27e869e14219ac8 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -68,7 +68,8 @@
         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['admin_level']) ? $aAddressLine['admin_level'] : '') . "</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";
@@ -96,7 +97,10 @@
     <div class="container">
         <div class="row">
             <div class="col-sm-10">
-                <h1><?php echo $aPointDetails['localname'] ?></h1>
+                <h1>
+                    <?php echo $aPointDetails['localname'] ?>
+                    <small><?php echo detailsPermaLink($aPointDetails, 'link to this page') ?></small>
+                </h1>
             </div>
             <div class="col-sm-2 text-right">
                 <?php map_icon($aPointDetails['icon']) ?>
@@ -110,7 +114,7 @@
 
                     kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
                     kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
-                    kv('Last Updated'    , $aPointDetails['indexed_date'] );
+                    kv('Last Updated'    , (new DateTime('@'.$aPointDetails['indexed_epoch']))->format(DateTime::RFC822) );
                     kv('Admin Level'     , $aPointDetails['admin_level'] );
                     kv('Rank'            , $aPointDetails['rank_search_label'] );
                     if ($aPointDetails['calculated_importance']) {
@@ -124,6 +128,8 @@
                         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']) );
 
                 ?>
@@ -147,6 +153,7 @@
                       <td>Local name</td>
                       <td>Type</td>
                       <td>OSM</td>
+                      <td>Address rank</td>
                       <td>Admin level</td>
                       <td>Distance</td>
                       <td></td>
@@ -177,17 +184,14 @@
 
 
 
-    if ($aPlaceSearchNameKeywords)
+    if ($bIncludeKeywords)
     {
         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)
         {
@@ -195,12 +199,12 @@
         }
     }
     
-    if (sizeof($aParentOfLines))
+    if (!empty($aHierarchyLines))
     {
         headline('Parent Of');
 
         $aGroupedAddressLines = array();
-        foreach($aParentOfLines as $aAddressLine)
+        foreach($aHierarchyLines as $aAddressLine)
         {
             if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
             else $sType = $aAddressLine['type'];
@@ -209,17 +213,17 @@
                 $aGroupedAddressLines[$sType] = array();
             $aGroupedAddressLines[$sType][] = $aAddressLine;
         }
-        foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
+        foreach($aGroupedAddressLines as $sGroupHeading => $aHierarchyLines)
         {
             $sGroupHeading = ucwords($sGroupHeading);
             headline3($sGroupHeading);
 
-            foreach($aParentOfLines as $aAddressLine)
+            foreach($aHierarchyLines as $aAddressLine)
             {
                 _one_row($aAddressLine);
             }
         }
-        if (sizeof($aParentOfLines) >= 500) {
+        if (count($aHierarchyLines) >= 500) {
             echo '<p>There are more child objects which are not shown.</p>';
         }
     }