X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2e14c7b337b9540ab03a4ed3c3cb21b16f1be6cd..2db6f931b6ce1d331433f7e4f02ac332381a7b29:/lib/Geocode.php?ds=sidebyside

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 979f1ed8..ff262398 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -45,6 +45,11 @@
 			$this->oDB =& $oDB;
 		}
 
+		function setReverseInPlan($bReverse)
+		{
+			$this->bReverseInPlan = $bReverse;
+		}
+
 		function setLanguagePreference($aLangPref)
 		{
 			$this->aLangPrefOrder = $aLangPref;
@@ -192,6 +197,20 @@
 			return $this->sQuery;
 		}
 
+		function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
+		{
+			$sValue = trim($sValue);
+			if (!$sValue) return false;
+			$this->aStructuredQuery[$sKey] = $sValue;
+			if ($this->iMinAddressRank == 0 && $this->iMaxAddressRank == 30)
+			{
+				$this->iMinAddressRank = $iNewMinAddressRank;
+				$this->iMaxAddressRank = $iNewMaxAddressRank;
+			}
+			if ($aItemListValues) $this->aAddressRankList = array_merge($this->aAddressRankList, $aItemListValues);
+			return true;
+		}
+
 		function setStructuredQuery($sAmentiy = false, $sStreet = false, $sCity = false, $sCounty = false, $sState = false, $sCountry = false, $sPostalCode = false)
 		{
 			$this->sQuery = false;
@@ -199,13 +218,13 @@
 			$this->aStructuredQuery = array();
 			$this->sAllowedTypesSQLList = '';
 
-			loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sAmentiy, 'amenity', 26, 30, false);
-			loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sStreet, 'street', 26, 30, false);
-			loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sCity, 'city', 14, 24, false);
-			loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sCounty, 'county', 9, 13, false);
-			loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sState, 'state', 8, 8, false);
-			loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sCountry, 'country', 4, 4, false);
-			loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sPostalCode, 'postalcode' , 5, 11, array(5, 11));
+			$this->loadStructuredAddressElement($sAmentiy, 'amenity', 26, 30, false);
+			$this->loadStructuredAddressElement($sStreet, 'street', 26, 30, false);
+			$this->loadStructuredAddressElement($sCity, 'city', 14, 24, false);
+			$this->loadStructuredAddressElement($sCounty, 'county', 9, 13, false);
+			$this->loadStructuredAddressElement($sState, 'state', 8, 8, false);
+			$this->loadStructuredAddressElement($sPostalCode, 'postalcode' , 5, 11, array(5, 11));
+			$this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 
 			if (sizeof($this->aStructuredQuery) > 0) 
 			{
@@ -242,7 +261,7 @@
 			$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
 			$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 .= ") ";
 			if ($this->sAllowedTypesSQLList) $sSQL .= "and placex.class in $this->sAllowedTypesSQLList ";
 			$sSQL .= "and linked_place_id is null ";
@@ -311,7 +330,8 @@
 			}
 
 			// Hack to make it handle "new york, ny" (and variants) correctly
-			$sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $this->sQuery);
+			//$sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $this->sQuery);
+			$sQuery = $this->sQuery;
 
 			// Conflicts between US state abreviations and various words for 'the' in different languages
 			if (isset($this->aLangPrefOrder['name:en']))
@@ -625,8 +645,11 @@
 						if ($bStructuredPhrases) $sPhraseType = $aPhraseTypes[$iPhrase];
 						else $sPhraseType = '';
 
-						foreach($aPhrases[$iPhrase]['wordsets'] as $aWordset)
+						foreach($aPhrases[$iPhrase]['wordsets'] as $iWordSet => $aWordset)
 						{
+							// Too many permutations - too expensive
+							if ($iWordSet > 120) break;
+
 							$aWordsetSearches = $aSearches;
 
 							// Add all words from this wordset
@@ -1413,10 +1436,12 @@
 							{
 								preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
 							}
+                            /*
 							elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
 							{
 								preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
 							}
+                            */
 							elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
 							{
 								$fRadius = 0.01;