From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 13 Mar 2014 19:48:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~546
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/33f7bba69858405517c68a4aaf609ce69e00e277

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/Geocode.php
---

33f7bba69858405517c68a4aaf609ce69e00e277
diff --cc lib/Geocode.php
index c345bf36,c6febe73..016fc101
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -1274,12 -1263,19 +1274,20 @@@
  								$aTerms[] = "country_code in ($sCountryCodesSQL)";
  							}
  
 -							if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL";
 +							if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
  							if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
  
- 							$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+ 							if ($aSearch['sHouseNumber'])
+ 							{
+ 								$sImportanceSQL = '- abs(26 - address_rank) + 3';
+ 							}
+ 							else
+ 							{
+ 								$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+ 							}
 -							if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
 -							if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
 +							if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
 +							if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
++
  							$aOrder[] = "$sImportanceSQL DESC";
  							if (sizeof($aSearch['aFullNameAddress']))
  							{