address ranks must not invert admin_level hierarchy

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 9b76efc12f90977a4b91927a75be8e35bb950dc2..43ec12668ec26a26e0748b24cdce344f1230866c 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -20,20 +20,25 @@
     }
 
 
     }
 
 

-    function format_distance($fDistance)
+    function format_distance($fDistance, $bInMeters = false)

     {
     {

-        // $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>';
+        if ($bInMeters) {
+            // $fDistance is in meters
+            if ($fDistance < 1) {
+                return '0';
+            }
+            elseif ($fDistance < 1000) {
+                return '<abbr class="distance" title="'.$fDistance.' meters">~'.(round($fDistance,0)).' m</abbr>';
+            }
+            else {
+                return '<abbr class="distance" title="'.$fDistance.' meters">~'.(round($fDistance/1000,1)).' km</abbr>';
+            }
+        } else {
+            if ($fDistance == 0) {
+                return '0';
+            } else {
+                return '<abbr class="distance" title="spheric distance '.$fDistance.'">'.(round($fDistance,4)).'</abbr>';
+            }

         }
     }
 
         }
     }
 


@@ -60,17 +65,23 @@
     }
 
 
     }
 
 

-    function _one_row($aAddressLine){
+    function _one_row($aAddressLine, $bDistanceInMeters = false){

         $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
 
         echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
         $bNotUsed = isset($aAddressLine['isaddress']) && !$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 class="name">'.(trim($aAddressLine['localname'])!==null?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
+        echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'];
+        if ($aAddressLine['type'] == 'administrative'
+            && isset($aAddressLine['place_type']))
+        {
+            echo '('.$aAddressLine['place_type'].')';
+        }
+        echo "</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>' . 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 '  <td>' . format_distance($aAddressLine['distance'], $bDistanceInMeters)."</td>\n";
+        echo '  <td>' . detailsPermaLink($aAddressLine,'details &gt;') . "</td>\n";

         echo "</tr>\n";
     }
 
         echo "</tr>\n";
     }
 


@@ -98,7 +109,6 @@
             <div class="col-sm-10">
                 <h1>
                     <?php echo $aPointDetails['localname'] ?>
             <div class="col-sm-10">
                 <h1>
                     <?php echo $aPointDetails['localname'] ?>

-                    <small><?php echo detailsPermaLink($aPointDetails, 'link to this page') ?></small>

                 </h1>
             </div>
             <div class="col-sm-2 text-right">
                 </h1>
             </div>
             <div class="col-sm-2 text-right">


@@ -122,6 +132,8 @@
                     kv('Coverage'        , ($aPointDetails['isarea']?'Polygon':'Point') );
                     kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
                     kv('OSM'             , osmLink($aPointDetails) );
                     kv('Coverage'        , ($aPointDetails['isarea']?'Polygon':'Point') );
                     kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
                     kv('OSM'             , osmLink($aPointDetails) );

+                    kv('Place Id (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)'
+                                         , $aPointDetails['place_id'] );

                     if ($aPointDetails['wikipedia'])
                     {
                         kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );
                     if ($aPointDetails['wikipedia'])
                     {
                         kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );


@@ -173,7 +185,7 @@
     {
         headline('Linked Places');
         foreach ($aLinkedLines as $aAddressLine) {
     {
         headline('Linked Places');
         foreach ($aLinkedLines as $aAddressLine) {

-            _one_row($aAddressLine);
+            _one_row($aAddressLine, true);

         }
     }
 
         }
     }
 


@@ -212,7 +224,7 @@
             headline3($sGroupHeading);
 
             foreach ($aHierarchyLines as $aAddressLine) {
             headline3($sGroupHeading);
 
             foreach ($aHierarchyLines as $aAddressLine) {

-                _one_row($aAddressLine);
+                _one_row($aAddressLine, true);

             }
         }
         if (count($aHierarchyLines) >= 500) {
             }
         }
         if (count($aHierarchyLines) >= 500) {