X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/dff4bd3e64b37a3cd9a92d0c02dde55081a5088a..140d603d01ab6a0e00da07b8d0b3a36dd311bafc:/website/search.php

diff --git a/website/search.php b/website/search.php
index d88d4f5d..b8a7dcde 100755
--- a/website/search.php
+++ b/website/search.php
@@ -391,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
@@ -942,7 +942,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 22 and 27";
 						if ($aSearch['fLon'] && $aSearch['fLat'])
 						{
 							$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
@@ -1019,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'])."'";
@@ -1030,6 +1031,7 @@
 								if (CONST_Debug) var_dump($sSQL);
 								$aPlaceIDs = $oDB->getCol($sSQL);
 							}
+							*/
 
 							if (!sizeof($aPlaceIDs))
 							{
@@ -1194,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)
 				{
@@ -1206,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) ";
@@ -1228,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,";
@@ -1242,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) ";
@@ -1252,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;
@@ -1310,6 +1318,7 @@
 				$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,";
@@ -1326,6 +1335,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;