From: Brian Quinion <brian.quinion@mapquest.com>
Date: Mon, 9 Sep 2013 15:18:40 +0000 (+0100)
Subject: improve admin type labels
X-Git-Tag: v2.2.0~30
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/9fd75fd7ce3040c0f376a2fc5411de2b267af8b7?hp=--cc

improve admin type labels
---

9fd75fd7ce3040c0f376a2fc5411de2b267af8b7
diff --git a/lib/Geocode.php b/lib/Geocode.php
index d660e8b3..a784d53b 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1491,7 +1491,12 @@
 					$aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
 				}
 
-				if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
+				if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'])
+						&& $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'])
+				{
+					$aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'];
+				}
+				elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
 						&& $aClassType[$aResult['class'].':'.$aResult['type']]['label'])
 				{
 					$aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];