X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/54129a6f1590a44ef90e7c7ea6d7600c508f3733..27e6a24718e7d778b6b69df78cf5558aa9917f56:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 35c8541a..0e1d7c1f 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -133,6 +133,12 @@
 			$this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
 		}
 
+		function getViewBoxString()
+		{
+			if (!$this->aViewBox) return null;
+			return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
+		}
+
 		function setRoute($aRoutePoints)
 		{
 			$this->aRoutePoints = $aRoutePoints;
@@ -210,8 +216,10 @@
 
 		}
 
-		function getDetails($aPlaceIDs, $iMinAddressRank = 0, $iMaxAddressRank = 30, $aAddressRankList = false, $sAllowedTypesSQLList = false, $bDeDupe = false)
+		function getDetails($aPlaceIDs)
 		{
+			if (sizeof($aPlaceIDs) == 0)  return array();
+
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
 
 			// Get the details for display (is this a redundant extra step?)
@@ -226,20 +234,20 @@
 			$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
 			$sSQL .= "(extratags->'place') as extra_place ";
 			$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
-			$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
-			if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
+			$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).")";
 			$sSQL .= ") ";
-			if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
+			if ($this->sAllowedTypesSQLList) $sSQL .= "and placex.class in $this->sAllowedTypesSQLList ";
 			$sSQL .= "and linked_place_id is null ";
 			$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
-			if (!$bDeDupe) $sSQL .= ",place_id";
+			if (!$this->bDeDupe) $sSQL .= ",place_id";
 			$sSQL .= ",langaddress ";
 			$sSQL .= ",placename ";
 			$sSQL .= ",ref ";
 			$sSQL .= ",extratags->'place' ";
 
-			if (30 >= $iMinAddressRank && 30 <= $iMaxAddressRank)
+			if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
 			{
 				$sSQL .= " union ";
 				$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
@@ -251,9 +259,9 @@
 				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
 				$sSQL .= "null as extra_place ";
 				$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
-				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+				$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
 				$sSQL .= "group by place_id";
-				if (!$bDeDupe) $sSQL .= ",place_id";
+				if (!$this->bDeDupe) $sSQL .= ",place_id";
 				$sSQL .= " union ";
 				$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
 				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
@@ -264,9 +272,9 @@
 				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
 				$sSQL .= "null as extra_place ";
 				$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
-				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+				$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
 				$sSQL .= "group by place_id";
-				if (!$bDeDupe) $sSQL .= ",place_id";
+				if (!$this->bDeDupe) $sSQL .= ",place_id";
 				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
 			}
 
@@ -291,7 +299,7 @@
 			$sCountryCodesSQL = false;
 			if ($this->aCountryCodes && sizeof($this->aCountryCodes))
 			{
-				$sCountryCodesSQL = join(',', $this->aCountryCodes);
+				$sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
 			}
 
 			// Hack to make it handle "new york, ny" (and variants) correctly
@@ -319,7 +327,7 @@
 
 				$sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$this->aViewBox[0].",".(float)$this->aViewBox[1]."),ST_Point(".(float)$this->aViewBox[2].",".(float)$this->aViewBox[3].")),4326)";
 				$sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aBigViewBox[0].",".(float)$aBigViewBox[1]."),ST_Point(".(float)$aBigViewBox[2].",".(float)$aBigViewBox[3].")),4326)";
-				$bBoundingBoxSearch = true;
+				$bBoundingBoxSearch = $this->bBoundedSearch;
 			}
 
 			// Route SQL
@@ -349,7 +357,7 @@
 					failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL);
 				}
 				$sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry";
-				$bBoundingBoxSearch = true;
+				$bBoundingBoxSearch = $this->bBoundedSearch;
 			}
 
 			// Do we have anything that looks like a lat/lon pair?
@@ -385,7 +393,7 @@
 			}
 
 			$aSearchResults = array();
-			if ($sQuery || $aStructuredQuery)
+			if ($sQuery || $this->aStructuredQuery)
 			{
 				// Start with a blank search
 				$aSearches = array(
@@ -457,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
@@ -971,11 +979,12 @@
 						if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
 						if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
 
-						// Must have a location term
+						// No location term?
 						if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon'])
 						{
 							if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'])
 							{
+								// Just looking for a country by code - look it up
 								if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank)
 								{
 									$sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
@@ -1308,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);
@@ -1334,7 +1343,10 @@
 			{
 				// Just interpret as a reverse geocode
 				$iPlaceID = geocodeReverse((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
-				$aSearchResults = $this->getDetails(array($iPlaceID));
+				if ($iPlaceID)
+					$aSearchResults = $this->getDetails(array($iPlaceID));
+				else
+					$aSearchResults = array();
 			}
 
 			// No results? Done
@@ -1382,6 +1394,7 @@
 							$aResult['lat'] = $aPointPolygon['centrelat'];
 							$aResult['lon'] = $aPointPolygon['centrelon'];
 						}
+
 						if ($this->bIncludePolygonAsPoints)
 						{
 							// Translate geometary string to point array
@@ -1478,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'];