X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a3728b718882dc1cbdf4e4e3853d938656d077e4..665b90bf5a0189d992e8a17639dec4926848f160:/lib/template/details-html.php

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index c043e9b7..c15e74c8 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -57,10 +57,12 @@
         return $sHTML;
     }
 
-    function map_icon($sIcon)
+    function map_icon($aPlace)
     {
-        if ($sIcon){
-            echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
+        $sIcon = Nominatim\ClassTypes\getIconFile($aPlace);
+        if (isset($sIcon)) {
+            $sLabel = Nominatim\ClassTypes\getIcon($aPlace);
+            echo '<img id="mapicon" src="'.$sIcon.'" alt="'.$sLabel.'" />';
         }
     }
 
@@ -70,7 +72,13 @@
 
         echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\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'] . "</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";
@@ -106,7 +114,7 @@
                 </h1>
             </div>
             <div class="col-sm-2 text-right">
-                <?php map_icon($aPointDetails['icon']) ?>
+                <?php map_icon($aPointDetails) ?>
             </div>
         </div>
         <div class="row">