From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 10 Sep 2013 18:16:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~583
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c141923971ba5473c8ae1e86de2fe702f6f8918e?hp=-c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/Geocode.php
---

c141923971ba5473c8ae1e86de2fe702f6f8918e
diff --combined lib/Geocode.php
index 4d30db98,0e1d7c1f..89d8c4a6
--- 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;
@@@ -216,7 -216,7 +216,7 @@@
  
  		}
  
- 		function getDetails($aPlaceIDs, $iMinAddressRank = 0, $iMaxAddressRank = 30, $aAddressRankList = false, $sAllowedTypesSQLList = false, $bDeDupe = false)
+ 		function getDetails($aPlaceIDs)
  		{
  			if (sizeof($aPlaceIDs) == 0)  return array();
  
@@@ -234,20 -234,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,";
@@@ -259,10 -259,9 +259,10 @@@
  				$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";
++				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,";
@@@ -273,14 -272,13 +273,14 @@@
  				$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) ";
 +				*/
  			}
  
 -			$sSQL .= "order by importance desc";
 +			$sSQL .= " order by importance desc";
  			if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
  			$aSearchResults = $this->oDB->getAll($sSQL);
  
@@@ -726,7 -724,6 +726,7 @@@
  													$aSearch['sType'] = $aSearchTerm['type'];
  													if (sizeof($aSearch['aName'])) $aSearch['sOperator'] = 'name';
  													else $aSearch['sOperator'] = 'near'; // near = in for the moment
 +													if (strlen($aSearchTerm['operator']) == 0) $aSearch['iSearchRank'] += 1;
  
  													// Do we have a shortcut id?
  													if ($aSearch['sOperator'] == 'name')
@@@ -1151,7 -1148,6 +1151,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'])."'";
@@@ -1163,7 -1159,6 +1163,7 @@@
  									if (CONST_Debug) var_dump($sSQL);
  									$aPlaceIDs = $this->oDB->getCol($sSQL);
  								}
 +								*/
  
  								if (!sizeof($aPlaceIDs))
  								{