Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ClassTypes.php

diff --git a/lib/ClassTypes.php b/lib/ClassTypes.php
index 4077d211bc94a211420838ac892cc7bcc4b6e21a..c8d37e5287d3097d429906ab832def1b96bbaf8f 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) {


@@ -84,7 +86,8 @@ function getBoundaryLabel($iAdminLevel, $sCountry, $sFallback = 'Administrative'
                                            8 => 'City',
                                            9 => 'City District',
                                            10 => 'Suburb',
                                            8 => 'City',
                                            9 => 'City District',
                                            10 => 'Suburb',

-                                           11 => 'Neighbourhood'
+                                           11 => 'Neighbourhood',
+                                           12 => 'City Block'

                                           ),
                              'no' => array (
                                       3 => 'State',
                                           ),
                              'no' => array (
                                       3 => 'State',