From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 1 May 2014 07:26:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~537
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/70f0d6ba8bc0e8c4115155b27a36e8a9a037d727?ds=inline;hp=-c

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

70f0d6ba8bc0e8c4115155b27a36e8a9a037d727
diff --combined lib/Geocode.php
index 1588dff5,7b20838d..32b50580
--- 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";
@@@ -892,6 -890,9 +892,9 @@@
  												if ($aSearch['sHouseNumber'] === '')
  												{
  													$aSearch['sHouseNumber'] = $sToken;
+ 													// sanity check: if the housenumber is not mainly made
+ 													// up of numbers, add a penalty
+ 													if (preg_match_all("/[^0-9]/", $sToken, $aMatches) > 2) $aSearch['iSearchRank']++;
  													if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
  													/*
  													// Fall back to not searching for this item (better than nothing)
@@@ -1239,7 -1240,7 +1242,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
@@@ -1247,13 -1248,12 +1250,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'])."'";
@@@ -1349,7 -1349,6 +1352,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'])."'";
@@@ -1361,7 -1360,6 +1364,7 @@@
  									if (CONST_Debug) var_dump($sSQL);
  									$aPlaceIDs = $this->oDB->getCol($sSQL);
  								}
 +								*/
  
  								if (!sizeof($aPlaceIDs))
  								{
@@@ -1613,12 -1611,10 +1616,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;