X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/12c1deeb8a313873af7c33c878f48a819305b483..419d0248143881c8bfa8d0b01f3120fabfc7e869:/website/search.php?ds=inline

diff --git a/website/search.php b/website/search.php
index 6b09bb9e..95d0cadd 100755
--- a/website/search.php
+++ b/website/search.php
@@ -17,7 +17,6 @@
 	$aSearchResults = array();
 	$aExcludePlaceIDs = array();
 	$sCountryCodesSQL = false;
-	$sSuggestion = $sSuggestionURL = false;
 	$bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true;
 	$bReverseInPlan = false;
 	$iFinalLimit = isset($_GET['limit'])?(int)$_GET['limit']:10;
@@ -305,7 +304,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;
@@ -391,7 +390,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
@@ -446,35 +445,6 @@
 				}
 				if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
 
-				$aSuggestion = array();
-				$bSuggestion = false;
-				if (CONST_Suggestions_Enabled)
-				{
-					foreach($aPhrases as $iPhrase => $aPhrase)
-					{
-						if (!isset($aValidTokens[' '.$aPhrase['wordsets'][0][0]]))
-						{
-							$sQuotedPhrase = getDBQuoted(' '.$aPhrase['wordsets'][0][0]);
-							$aSuggestionWords = getWordSuggestions($oDB, $aPhrase['wordsets'][0][0]);
-							$aRow = $aSuggestionWords[0];
-							if ($aRow && $aRow['word'])
-							{
-								$aSuggestion[] = $aRow['word'];
-								$bSuggestion = true;
-							}
-							else
-							{
-								$aSuggestion[] = $aPhrase['string'];
-							}
-						}
-						else
-						{
-							$aSuggestion[] = $aPhrase['string'];
-						}
-					}
-				}
-				if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);
-
 				// Try and calculate GB postcodes we might be missing
 				foreach($aTokens as $sToken)
 				{
@@ -942,7 +912,7 @@
 							}
 						}
 						if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
-						if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank in (26,27)";
+						if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank between 16 and 27";
 						if ($aSearch['fLon'] && $aSearch['fLat'])
 						{
 							$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
@@ -1019,6 +989,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'])."'";
@@ -1030,6 +1001,7 @@
 								if (CONST_Debug) var_dump($sSQL);
 								$aPlaceIDs = $oDB->getCol($sSQL);
 							}
+							*/
 
 							if (!sizeof($aPlaceIDs))
 							{
@@ -1194,6 +1166,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)
 				{
@@ -1206,7 +1182,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) ";
@@ -1228,13 +1204,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,";
@@ -1242,7 +1219,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) ";
@@ -1252,6 +1229,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;
@@ -1266,73 +1244,82 @@
 		{
 			if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '')
 			{
-				$iPlaceID = geocodeReverse($_GET['nearlat'], $_GET['nearlon']);
-				$aResultPlaceIDs = array($iPlaceID);
-
-				// TODO: this needs refactoring!
+				$iPlaceID = geocodeReverse((float)$_GET['nearlat'], (float)$_GET['nearlon']);
 
-				// 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();
 				}
 			}
 		}
@@ -1394,10 +1381,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;
@@ -1581,10 +1568,6 @@
 	if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';
 	if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']);
 	if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
-	if ($sSuggestion)
-	{
-		$sSuggestionURL = $sMoreURL.'&q='.urlencode($sSuggestion);
-	}
 	$sMoreURL .= '&q='.urlencode($sQuery);
 
 	if (CONST_Debug) exit;