Merge pull request #1348 from mtmail/checkmodulepresence-to-raise-exception

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index a1334740e3fffeb9a0042b33255c15cf3d61683c..9ef595634f5c0a1e3d64014cd3c114ad05dbbc69 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -46,8 +46,7 @@
     function hash_to_subtable($aAssociatedList)
     {
         $sHTML = '';
     function hash_to_subtable($aAssociatedList)
     {
         $sHTML = '';

-        foreach($aAssociatedList as $sKey => $sValue)
-        {
+        foreach ($aAssociatedList as $sKey => $sValue) {

             $sHTML = $sHTML.' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>'."\n";
         }
         return $sHTML;
             $sHTML = $sHTML.' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>'."\n";
         }
         return $sHTML;


@@ -62,13 +61,14 @@
 
 
     function _one_row($aAddressLine){
 
 
     function _one_row($aAddressLine){

-        $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
+        $bNotUsed = !$aAddressLine['isaddress'];

 
         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 '<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['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";
         echo '  <td>' . format_distance($aAddressLine['distance'])."</td>\n";
         echo '  <td>' . detailsLink($aAddressLine,'details &gt;') . "</td>\n";
         echo "</tr>\n";


@@ -96,7 +96,10 @@
     <div class="container">
         <div class="row">
             <div class="col-sm-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']) ?>
             </div>
             <div class="col-sm-2 text-right">
                 <?php map_icon($aPointDetails['icon']) ?>


@@ -110,13 +113,13 @@
 
                     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('Importance'    , $aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)') );
                     }
                     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('Coverage'        , ($aPointDetails['isarea']?'Polygon':'Point') );

                     kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
                     kv('OSM'             , osmLink($aPointDetails) );
                     if ($aPointDetails['wikipedia'])
                     kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
                     kv('OSM'             , osmLink($aPointDetails) );
                     if ($aPointDetails['wikipedia'])


@@ -124,6 +127,8 @@
                         kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );
                     }
 
                         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']) );
 
                 ?>
                     kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
 
                 ?>


@@ -147,6 +152,7 @@
                       <td>Local name</td>
                       <td>Type</td>
                       <td>OSM</td>
                       <td>Local name</td>
                       <td>Type</td>
                       <td>OSM</td>

+                      <td>Address rank</td>

                       <td>Admin level</td>
                       <td>Distance</td>
                       <td></td>
                       <td>Admin level</td>
                       <td>Distance</td>
                       <td></td>


@@ -155,13 +161,10 @@
                 <tbody>
 
                 <?php
                 <tbody>
 
                 <?php

-
-                    foreach($aAddressLines as $aAddressLine)
-                    {   
+                    foreach ($aAddressLines as $aAddressLine) {

                         _one_row($aAddressLine);
                     }
                 ?>
                         _one_row($aAddressLine);
                     }
                 ?>

-    

 
 
 <?php
 
 
 <?php


@@ -169,39 +172,34 @@
     if ($aLinkedLines)
     {
         headline('Linked Places');
     if ($aLinkedLines)
     {
         headline('Linked Places');

-        foreach($aLinkedLines as $aAddressLine)
-        {   
+        foreach ($aLinkedLines as $aAddressLine) {

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

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

     {
         headline('Name Keywords');
     {
         headline('Name Keywords');

-        foreach($aPlaceSearchNameKeywords as $aRow)
-        {
-            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+        if ($aPlaceSearchNameKeywords) {
+            foreach ($aPlaceSearchNameKeywords as $aRow) {
+                _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+            }

         }
         }

-    }

 
 

-    if ($aPlaceSearchAddressKeywords)
-    {

         headline('Address Keywords');
         headline('Address Keywords');

-        foreach($aPlaceSearchAddressKeywords as $aRow)
-        {
-            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+        if ($aPlaceSearchAddressKeywords) {
+            foreach ($aPlaceSearchAddressKeywords as $aRow) {
+                _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+            }

         }
     }
         }
     }

-    
-    if (sizeof($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'];
 


@@ -209,17 +207,15 @@
                 $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 (sizeof($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>';
         }
     }


@@ -241,11 +237,11 @@
         echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
         $aPlace = array(
         echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
         $aPlace = array(

-                'outlinestring' => $aPointDetails['outlinestring'],
+                'asgeojson' => $aPointDetails['asgeojson'],

                 'lon' => $aPointDetails['lon'],
                 'lat' => $aPointDetails['lat'],
         );
                 'lon' => $aPointDetails['lon'],
                 'lat' => $aPointDetails['lat'],
         );

-        echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
+        echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';';

 
 
     ?>
 
 
     ?>