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 7681839563fe6f4d4d10a0d8b381b473695482c2..00d6ba6385b2d1b7bd26813e82dde58afe6d6192 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 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 +97,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']) ?>


@@ -149,6 +153,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>


@@ -197,7 +202,7 @@
         }
     }
     
         }
     }
     

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

     {
         headline('Parent Of');
 
     {
         headline('Parent Of');
 


@@ -221,7 +226,7 @@
                 _one_row($aAddressLine);
             }
         }
                 _one_row($aAddressLine);
             }
         }

-        if (sizeof($aParentOfLines) >= 500) {
+        if (count($aParentOfLines) >= 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>';
         }
     }