From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 19 Apr 2013 22:20:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~618
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/be61d055469ac955205b64351b1533647bd4ddca?hp=-c

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

be61d055469ac955205b64351b1533647bd4ddca
diff --combined website/search.php
index 14fac3ef,387a79de..8325ac66
--- a/website/search.php
+++ b/website/search.php
@@@ -78,7 -78,6 +78,7 @@@
  	if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
  	if (isset($aLangPrefOrder['name:ru'])) $bReverseInPlan = true;
  	if (isset($aLangPrefOrder['name:ja'])) $bReverseInPlan = true;
 +	if (isset($aLangPrefOrder['name:pl'])) $bReverseInPlan = true;
  
  	$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
  
@@@ -391,7 -390,7 +391,7 @@@
  				{
  					$aPhrases[$iPhrase] = $aPhrase;
  					$aPhrases[$iPhrase]['words'] = explode(' ',$aPhrases[$iPhrase]['string']);
- 					$aPhrases[$iPhrase]['wordsets'] = getWordSets($aPhrases[$iPhrase]['words']);
+ 					$aPhrases[$iPhrase]['wordsets'] = getWordSets($aPhrases[$iPhrase]['words'], 0);
  					$aTokens = array_merge($aTokens, getTokensFromSets($aPhrases[$iPhrase]['wordsets']));
  				}
  				else
@@@ -1194,10 -1193,6 +1194,10 @@@
  				//var_Dump($aResultPlaceIDs);exit;
  				// Get the details for display (is this a redundant extra step?)
  				$sPlaceIDs = join(',',$aResultPlaceIDs);
 +				$sImportanceSQL = '';
 +				if ($sViewboxSmallSQL) $sImportanceSQL .= " case when ST_Contains($sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
 +				if ($sViewboxLargeSQL) $sImportanceSQL .= " case when ST_Contains($sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
 +
  				$sOrderSQL = 'CASE ';
  				foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
  				{
@@@ -1210,7 -1205,7 +1210,7 @@@
  				$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
  				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
  				//$sSQL .= $sOrderSQL." as porder, ";
 -				$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
 +				$sSQL .= $sImportanceSQL."coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
  				$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) ";
@@@ -1232,7 -1227,7 +1232,7 @@@
  				$sSQL .= "null as ref,";
  				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
  				//$sSQL .= $sOrderSQL." as porder, ";
 -				$sSQL .= "-0.15 as importance, ";
 +				$sSQL .= $sImportanceSQL."0.015 as importance, ";
  				$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) ";
@@@ -1246,7 -1241,7 +1246,7 @@@
  				$sSQL .= "null as ref,";
  				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
  				//$sSQL .= $sOrderSQL." as porder, ";
 -				$sSQL .= "-0.10 as importance, ";
 +				$sSQL .= $sImportanceSQL."0.01 as importance, ";
  				$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) ";
@@@ -1398,10 -1393,10 +1398,10 @@@
  					{
  						preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
  					}
 -					elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
 +					/*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;