From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 26 Jan 2015 22:47:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~486
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6300d3619a6c429204c589a29a4abea88e15d47e?hp=-c

Merge remote-tracking branch 'upstream/master'
---

6300d3619a6c429204c589a29a4abea88e15d47e
diff --combined lib/Geocode.php
index 85aa31f0,6632cefb..9b35ebd8
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -15,7 -15,7 +15,7 @@@
  
  		protected $aExcludePlaceIDs = array();
  		protected $bDeDupe = true;
 -		protected $bReverseInPlan = false;
 +		protected $bReverseInPlan = true;
  
  		protected $iLimit = 20;
  		protected $iFinalLimit = 10;
@@@ -413,7 -413,6 +413,7 @@@
  				$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
  				$sSQL .= "group by 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, min(parent_place_id) as parent_place_id,'us' as country_code,";
  				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
@@@ -428,7 -427,6 +428,7 @@@
  				$sSQL .= "group by place_id";
  				if (!$this->bDeDupe) $sSQL .= ",place_id";
  				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
 +				*/
  			}
  
  			$sSQL .= " order by importance desc";
@@@ -443,7 -441,7 +443,7 @@@
  			return $aSearchResults;
  		}
  
- 		function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
+ 		function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
  		{
  			/*
  			   Calculate all searches using aValidTokens i.e.
@@@ -613,7 -611,10 +613,10 @@@
  									}
  								}
  							}
- 							if (isset($aValidTokens[$sToken]))
+ 							// Look for partial matches.
+ 							// Note that there is no point in adding country terms here
+ 							// because country are omitted in the address.
+ 							if (isset($aValidTokens[$sToken]) && $sPhraseType != 'country')
  							{
  								// Allow searching for a word - but at extra cost
  								foreach($aValidTokens[$sToken] as $aSearchTerm)
@@@ -1041,7 -1042,7 +1044,7 @@@
  					// Start the search process
  					$aResultPlaceIDs = array();
  
- 					$aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
+ 					$aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
  
  					if ($this->bReverseInPlan)
  					{
@@@ -1055,7 -1056,7 +1058,7 @@@
  							$aFinalPhrase = end($aPhrases);
  							$aFinalPhrase['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
  						}
- 						$aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
+ 						$aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
  
  						foreach($aGroupedSearches as $aSearches)
  						{
@@@ -1240,7 -1241,7 +1243,7 @@@
  							// TODO: filter out the pointless search terms (2 letter name tokens and less)
  							// they might be right - but they are just too darned expensive to run
  							if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]";
 -							if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
 +							//if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
  							if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress'])
  							{
  								// For infrequent name terms disable index usage for address
@@@ -1248,13 -1249,12 +1251,13 @@@
  										sizeof($aSearch['aName']) == 1 &&
  										$aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold)
  								{
 -									$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
 +									//$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
 +									$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddress'],",")."]";
  								}
  								else
  								{
  									$aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]";
 -									if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
 +									//if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
  								}
  							}
  							if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
@@@ -1364,7 -1364,6 +1367,7 @@@
  								$aPlaceIDs = $this->oDB->getCol($sSQL);
  
  								// If not try the aux fallback table
 +								/*
  								if (!sizeof($aPlaceIDs))
  								{
  									$sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
@@@ -1376,7 -1375,6 +1379,7 @@@
  									if (CONST_Debug) var_dump($sSQL);
  									$aPlaceIDs = $this->oDB->getCol($sSQL);
  								}
 +								*/
  
  								if (!sizeof($aPlaceIDs))
  								{
@@@ -1628,12 -1626,10 +1631,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;
@@@ -1785,7 -1781,6 +1788,6 @@@
  			$bFirst = true;
  			foreach($aToFilter as $iResNum => $aResult)
  			{
- 				if ($aResult['type'] == 'adminitrative') $aResult['type'] = 'administrative';
  				$this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
  				if ($bFirst)
  				{