From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 6 May 2013 19:38:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~614
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b0521f5150093d7b1481bf2739e89a909ec18a56?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	website/search.php
---

b0521f5150093d7b1481bf2739e89a909ec18a56
diff --combined website/search.php
index 54cd556d,3b0d6ffb..afc4748a
--- 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))."]";
  
@@@ -305,7 -304,7 +305,7 @@@
  			$sNearPointSQL = false;
  			if (isset($_GET['nearlat']) && isset($_GET['nearlon']))
  			{
- 				$sNearPointSQL = "ST_SetSRID(ST_Point(".(float)$_GET['nearlon'].",".$_GET['nearlat']."),4326)";
+ 				$sNearPointSQL = "ST_SetSRID(ST_Point(".(float)$_GET['nearlon'].",".(float)$_GET['nearlat']."),4326)";
  				$aSearches[0]['fLat'] = (float)$_GET['nearlat'];
  				$aSearches[0]['fLon'] = (float)$_GET['nearlon'];
  				$aSearches[0]['fRadius'] = 0.1;
@@@ -1019,7 -1018,6 +1019,7 @@@
  							$aPlaceIDs = $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'])."'";
@@@ -1031,7 -1029,6 +1031,7 @@@
  								if (CONST_Debug) var_dump($sSQL);
  								$aPlaceIDs = $oDB->getCol($sSQL);
  							}
 +							*/
  
  							if (!sizeof($aPlaceIDs))
  							{
@@@ -1196,10 -1193,6 +1196,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)
  				{
@@@ -1212,7 -1205,7 +1212,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) ";
@@@ -1234,14 -1227,13 +1234,14 @@@
  				$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) ";
  				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
  				$sSQL .= "group by place_id";
  				if (!$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,";
@@@ -1249,7 -1241,7 +1249,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) ";
@@@ -1259,7 -1251,6 +1259,7 @@@
  				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
  				$sSQL .= "order by importance desc";
  				//$sSQL .= "order by rank_search,rank_address,porder asc";
 +				*/
  				if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
  				$aSearchResults = $oDB->getAll($sSQL);
  				//var_dump($sSQL,$aSearchResults);exit;
@@@ -1274,75 -1265,80 +1274,82 @@@
  		{
  			if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '')
  			{
- 				$iPlaceID = geocodeReverse($_GET['nearlat'], $_GET['nearlon']);
- 				$aResultPlaceIDs = array($iPlaceID);
+ 				$iPlaceID = geocodeReverse((float)$_GET['nearlat'], (float)$_GET['nearlon']);
  
- 				// TODO: this needs refactoring!
- 
- 				// Get the details for display (is this a redundant extra step?)
- 				$sPlaceIDs = join(',',$aResultPlaceIDs);
- 				$sOrderSQL = 'CASE ';
- 				foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
+ 				if ($iPlaceID)
  				{
- 					$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
- 				}
- 				$sOrderSQL .= ' ELSE 10000000 END';
- 				$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
- 				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
- 				$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
- 				$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 .= "(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 .= ") ";
- 				$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
- 				if (!$bDeDupe) $sSQL .= ",place_id";
- 				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
- 				$sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";
- 				$sSQL .= ",get_name_by_language(name, ARRAY['ref']) ";
- 				$sSQL .= ",extratags->'place' ";
- 				$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,";
- 				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
- 				$sSQL .= "null as placename,";
- 				$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 .= "null as extra_place ";
- 				$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
- 				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
- 				$sSQL .= "group by place_id";
- 				if (!$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,";
- 				$sSQL .= "null as placename,";
- 				$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 .= "null as extra_place ";
- 				$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
- 				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
- 				$sSQL .= "group by place_id";
- 				if (!$bDeDupe) $sSQL .= ",place_id";
- 				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
- 				$sSQL .= "order by importance desc";
- 				//$sSQL .= "order by rank_search,rank_address,porder asc";
- 				*/
- 				if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
- 				$aSearchResults = $oDB->getAll($sSQL);
- 				//var_dump($sSQL,$aSearchResults);exit;
+ 					$aResultPlaceIDs = array($iPlaceID);
+ 					// TODO: this needs refactoring!
  
- 				if (PEAR::IsError($aSearchResults))
+ 					// Get the details for display (is this a redundant extra step?)
+ 					$sPlaceIDs = join(',',$aResultPlaceIDs);
+ 					$sOrderSQL = 'CASE ';
+ 					foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
+ 					{
+ 						$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
+ 					}
+ 					$sOrderSQL .= ' ELSE 10000000 END';
+ 					$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
+ 					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+ 					$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+ 					$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 .= "(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 .= ") ";
+ 					$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
+ 					if (!$bDeDupe) $sSQL .= ",place_id";
+ 					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+ 					$sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";
+ 					$sSQL .= ",get_name_by_language(name, ARRAY['ref']) ";
+ 					$sSQL .= ",extratags->'place' ";
+ 					$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,";
+ 					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+ 					$sSQL .= "null as placename,";
+ 					$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 .= "null as extra_place ";
+ 					$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
+ 					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+ 					$sSQL .= "group by place_id";
+ 					if (!$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,";
+ 					$sSQL .= "null as placename,";
+ 					$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 .= "null as extra_place ";
+ 					$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
+ 					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+ 					$sSQL .= "group by place_id";
++                    */
+ 					if (!$bDeDupe) $sSQL .= ",place_id";
+ 					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+ 					$sSQL .= "order by importance desc";
+ 					//$sSQL .= "order by rank_search,rank_address,porder asc";
+ 					if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
+ 					$aSearchResults = $oDB->getAll($sSQL);
+ 					//var_dump($sSQL,$aSearchResults);exit;
+ 
+ 					if (PEAR::IsError($aSearchResults))
+ 					{
+ 						failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
+ 					}
+ 				}
+ 				else
  				{
- 					failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
+ 					$aSearchResults = array();
  				}
  			}
  		}
@@@ -1404,10 -1400,10 +1411,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;