Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ClassTypes.php

diff --git a/lib/ClassTypes.php b/lib/ClassTypes.php
index 5a69d1ded8e9db631108ab9e09b9072d678d4d6a..f2c1ab84c56f270b59264c05180bb882c1415ae5 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);
         $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) {
     } elseif ($iRank < 26) {
         $sLabel = $aPlace['type'];
     } elseif ($iRank < 28) {


@@ -85,7 +87,15 @@ function getBoundaryLabel($iAdminLevel, $sCountry, $sFallback = 'Administrative'
                                            9 => 'City District',
                                            10 => 'Suburb',
                                            11 => 'Neighbourhood'
                                            9 => 'City District',
                                            10 => 'Suburb',
                                            11 => 'Neighbourhood'

-                                           )
+                                          ),
+                             'no' => array (
+                                      3 => 'State',
+                                      4 => 'County'
+                                     ),
+                             'se' => array (
+                                      3 => 'State',
+                                      4 => 'County'
+                                     )

             );
 
     if (isset($aBoundaryList[$sCountry])
             );
 
     if (isset($aBoundaryList[$sCountry])