Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 00d6ba6385b2d1b7bd26813e82dde58afe6d6192..4d5ccb87c60c23c1b35e1f22b27e869e14219ac8 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -114,7 +114,7 @@
 
                     kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
                     kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
 
                     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']) {
                     kv('Admin Level'     , $aPointDetails['admin_level'] );
                     kv('Rank'            , $aPointDetails['rank_search_label'] );
                     if ($aPointDetails['calculated_importance']) {


@@ -184,17 +184,14 @@
 
 
 
 
 
 

-    if ($aPlaceSearchNameKeywords)
+    if ($bIncludeKeywords)

     {
         headline('Name Keywords');
         foreach($aPlaceSearchNameKeywords as $aRow)
         {
             _one_keyword_row($aRow['word_token'], $aRow['word_id']);
         }
     {
         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)
         {
         headline('Address Keywords');
         foreach($aPlaceSearchAddressKeywords as $aRow)
         {


@@ -202,12 +199,12 @@
         }
     }
     
         }
     }
     

-    if (!empty($aParentOfLines))
+    if (!empty($aHierarchyLines))

     {
         headline('Parent Of');
 
         $aGroupedAddressLines = array();
     {
         headline('Parent Of');
 
         $aGroupedAddressLines = array();

-        foreach($aParentOfLines as $aAddressLine)
+        foreach($aHierarchyLines as $aAddressLine)

         {
             if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
             else $sType = $aAddressLine['type'];
         {
             if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
             else $sType = $aAddressLine['type'];


@@ -216,17 +213,17 @@
                 $aGroupedAddressLines[$sType] = array();
             $aGroupedAddressLines[$sType][] = $aAddressLine;
         }
                 $aGroupedAddressLines[$sType] = array();
             $aGroupedAddressLines[$sType][] = $aAddressLine;
         }

-        foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
+        foreach($aGroupedAddressLines as $sGroupHeading => $aHierarchyLines)

         {
             $sGroupHeading = ucwords($sGroupHeading);
             headline3($sGroupHeading);
 
         {
             $sGroupHeading = ucwords($sGroupHeading);
             headline3($sGroupHeading);
 

-            foreach($aParentOfLines as $aAddressLine)
+            foreach($aHierarchyLines as $aAddressLine)

             {
                 _one_row($aAddressLine);
             }
         }
             {
                 _one_row($aAddressLine);
             }
         }

-        if (count($aParentOfLines) >= 500) {
+        if (count($aHierarchyLines) >= 500) {

             echo '<p>There are more child objects which are not shown.</p>';
         }
     }
             echo '<p>There are more child objects which are not shown.</p>';
         }
     }