X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6a337f13d03ce4bcb76cb9b2908b02e0f524c16f..89669d80b5c0c4c0068f8710191c44bc9da270a6:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 0e4bd0a0..e1acb2f6 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -15,7 +15,7 @@
 
 		protected $aExcludePlaceIDs = array();
 		protected $bDeDupe = true;
-		protected $bReverseInPlan = false;
+		protected $bReverseInPlan = true;
 
 		protected $iLimit = 20;
 		protected $iFinalLimit = 10;
@@ -465,7 +465,7 @@
 				// Commas are used to reduce the search space by indicating where phrases split
 				if ($this->aStructuredQuery)
 				{
-					$aPhrases = $aStructuredQuery;
+					$aPhrases = $this->aStructuredQuery;
 					$bStructuredPhrases = true;
 				}
 				else
@@ -1317,10 +1317,10 @@
 						$sSQL = "select place_id from placex where place_id in (".join(',',$aResultPlaceIDs).") ";
 						$sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
 						if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-						if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
+						if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$this->aAddressRankList).")";
 						$sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',$aResultPlaceIDs).") ";
 						$sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-						if ($aAddressRankList) $sSQL .= " OR 30 in (".join(',',$aAddressRankList).")";
+						if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
 						$sSQL .= ")";
 						if (CONST_Debug) var_dump($sSQL);
 						$aResultPlaceIDs = $this->oDB->getCol($sSQL);
@@ -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'];