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?ds=sidebyside;hp=--cc

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/Geocode.php
---

c141923971ba5473c8ae1e86de2fe702f6f8918e
diff --cc lib/Geocode.php
index 4d30db98,0e1d7c1f..89d8c4a6
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -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);