From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 11 Apr 2015 17:45:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~468
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/dd7912ff55b68944070b0bb5e3649baff2584878?hp=-c

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

dd7912ff55b68944070b0bb5e3649baff2584878
diff --combined lib/Geocode.php
index 8d1f8ccc,7bd4f552..ed618aec
--- 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;
@@@ -416,7 -416,6 +416,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,";
@@@ -431,7 -430,6 +431,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";
@@@ -873,10 -871,10 +873,10 @@@
  
  				preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
  				$aSpecialTerms = array();
- 				if (isset($aStructuredQuery['amenity']) && $aStructuredQuery['amenity'])
+ 				if (isset($this->aStructuredQuery['amenity']) && $this->aStructuredQuery['amenity'])
  				{
- 					$aSpecialTermsRaw[] = array('['.$aStructuredQuery['amenity'].']', $aStructuredQuery['amenity']);
- 					unset($aStructuredQuery['amenity']);
+ 					$aSpecialTermsRaw[] = array('['.$this->aStructuredQuery['amenity'].']', $this->aStructuredQuery['amenity']);
+ 					unset($this->aStructuredQuery['amenity']);
  				}
  				foreach($aSpecialTermsRaw as $aSpecialTerm)
  				{
@@@ -974,8 -972,8 +974,8 @@@
  					foreach($aDatabaseWords as $aToken)
  					{
  						// Very special case - require 2 letter country param to match the country code found
- 						if ($bStructuredPhrases && $aToken['country_code'] && !empty($aStructuredQuery['country'])
- 								&& strlen($aStructuredQuery['country']) == 2 && strtolower($aStructuredQuery['country']) != $aToken['country_code'])
+ 						if ($bStructuredPhrases && $aToken['country_code'] && !empty($this->aStructuredQuery['country'])
+ 								&& strlen($this->aStructuredQuery['country']) == 2 && strtolower($this->aStructuredQuery['country']) != $aToken['country_code'])
  						{
  							continue;
  						}
@@@ -1099,7 -1097,7 +1099,7 @@@
  
  				if (CONST_Debug) var_Dump($aGroupedSearches);
  
- 				if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0)
+ 				if (CONST_Search_TryDroppedAddressTerms && sizeof($this->aStructuredQuery) > 0)
  				{
  					$aCopyGroupedSearches = $aGroupedSearches;
  					foreach($aCopyGroupedSearches as $iGroup => $aSearches)
@@@ -1254,7 -1252,7 +1254,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
@@@ -1262,13 -1260,12 +1262,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'])."'";
@@@ -1378,7 -1375,6 +1378,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'])."'";
@@@ -1390,7 -1386,6 +1390,7 @@@
  									if (CONST_Debug) var_dump($sSQL);
  									$aPlaceIDs = $this->oDB->getCol($sSQL);
  								}
 +								*/
  
  								if (!sizeof($aPlaceIDs))
  								{
@@@ -1644,12 -1639,10 +1644,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;