Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ClassTypes.php

diff --git a/lib/ClassTypes.php b/lib/ClassTypes.php
index 5a69d1ded8e9db631108ab9e09b9072d678d4d6a..bb7b0486cb628c687c342faa9faea86a8032ad5c 100644 (file)
--- a/lib/ClassTypes.php
+++ b/lib/ClassTypes.php
@@ -18,6 +18,8 @@ function getLabelTag($aPlace, $sCountry = null)
         $sLabel = $aPlace['place_type'];
     } elseif ($aPlace['class'] == 'boundary' && $aPlace['type'] == 'administrative') {
         $sLabel = getBoundaryLabel($iRank/2, $sCountry);
+    } elseif ($aPlace['type'] == 'postal_code') {
+        $sLabel = 'postcode';
     } elseif ($iRank < 26) {
         $sLabel = $aPlace['type'];
     } elseif ($iRank < 28) {
@@ -84,8 +86,17 @@ function getBoundaryLabel($iAdminLevel, $sCountry, $sFallback = 'Administrative'
                                            8 => 'City',
                                            9 => 'City District',
                                            10 => 'Suburb',
-                                           11 => 'Neighbourhood'
-                                           )
+                                           11 => 'Neighbourhood',
+                                           12 => 'City Block'
+                                          ),
+                             'no' => array (
+                                      3 => 'State',
+                                      4 => 'County'
+                                     ),
+                             'se' => array (
+                                      3 => 'State',
+                                      4 => 'County'
+                                     )
             );
 
     if (isset($aBoundaryList[$sCountry])
@@ -241,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';
 }
 
 /**
@@ -264,6 +279,7 @@ function getImportance($aPlace)
 
     if ($aWithImportance === null) {
         $aWithImportance = array_flip(array(
+                                           'boundary:administrative',
                                            'place:country',
                                            'place:state',
                                            'place:province',