actions: update apt repo before installing software

[nominatim.git] / lib / ClassTypes.php

diff --git a/lib/ClassTypes.php b/lib/ClassTypes.php
index f2c1ab84c56f270b59264c05180bb882c1415ae5..bb7b0486cb628c687c342faa9faea86a8032ad5c 100644 (file)
--- a/lib/ClassTypes.php
+++ b/lib/ClassTypes.php
@@ -86,7 +86,8 @@ function getBoundaryLabel($iAdminLevel, $sCountry, $sFallback = 'Administrative'
                                            8 => 'City',
                                            9 => 'City District',
                                            10 => 'Suburb',
-                                           11 => 'Neighbourhood'
+                                           11 => 'Neighbourhood',
+                                           12 => 'City Block'
                                           ),
                              'no' => array (
                                       3 => 'State',
@@ -251,13 +252,17 @@ function getIcon($aPlace)
  */
 function getIconFile($aPlace)
 {
+    if (CONST_MapIcon_URL === false) {
+        return null;
+    }
+
     $sIcon = getIcon($aPlace);
 
     if (!isset($sIcon)) {
         return null;
     }
 
-    return CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.p.20.png';
+    return CONST_MapIcon_URL.'/'.$sIcon.'.p.20.png';
 }
 
 /**
@@ -274,6 +279,7 @@ function getImportance($aPlace)
 
     if ($aWithImportance === null) {
         $aWithImportance = array_flip(array(
+                                           'boundary:administrative',
                                            'place:country',
                                            'place:state',
                                            'place:province',