X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4da0ed3204f7e04b182d4e94b3b6f3820c1685ef..0dafda7327014d7591df397cb9c54df8f172e677:/website/search.php

diff --git a/website/search.php b/website/search.php
index 9941907d..b205e57e 100755
--- a/website/search.php
+++ b/website/search.php
@@ -1,4 +1,6 @@
 <?php
+	@define('CONST_ConnectionBucket_PageType', 'Search');
+
 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 
@@ -21,9 +23,10 @@
 	$iOffset = isset($_GET['offset'])?(int)$_GET['offset']:0;
 	$iMaxRank = 20;
 	if ($iFinalLimit > 50) $iFinalLimit = 50;
-    $iLimit = $iFinalLimit + min($iFinalLimit, 10);
+	$iLimit = $iFinalLimit + min($iFinalLimit, 10);
 	$iMinAddressRank = 0;
 	$iMaxAddressRank = 30;
+	$sAllowedTypesSQLList = false;
 
 	// Format for output
 	if (isset($_GET['format']) && ($_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' ||  $_GET['format'] == 'jsonv2'))
@@ -152,12 +155,14 @@
 				array('postalcode', 16, 25),
 				);
 	$aStructuredQuery = array();
+	$sAllowedTypesSQLList = '';
 	foreach($aStructuredOptions as $aStructuredOption)
 	{
 		loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2]);
 	}
 	if (sizeof($aStructuredQuery) > 0) {
 		$sQuery = join(', ', $aStructuredQuery);
+		$sAllowedTypesSQLList = '(\'place\',\'boundary\')';
 	}
 
 	if ($sQuery)
@@ -728,6 +733,42 @@
 					}
 				}
 
+				if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0)
+				{
+					$aCopyGroupedSearches = $aGroupedSearches;
+					foreach($aCopyGroupedSearches as $iGroup => $aSearches)
+					{
+						foreach($aSearches as $iSearch => $aSearch)
+						{
+							$aReductionsList = array($aSearch['aAddress']);
+							$iSearchRank = $aSearch['iSearchRank'];
+							while(sizeof($aReductionsList) > 0)
+							{
+								$iSearchRank += 5;
+								if ($iSearchRank > iMaxRank) break 3;
+								$aNewReductionsList = array();
+								foreach($aReductionsList as $aReductionsWordList)
+								{
+									for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++)
+									{
+										$aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1));
+										$aReverseSearch = $aSearch;
+										$aSearch['aAddress'] = $aReductionsWordListResult;
+										$aSearch['iSearchRank'] = $iSearchRank;
+										$aGroupedSearches[$iSearchRank][] = $aReverseSearch;
+										if (sizeof($aReductionsWordListResult) > 0)
+										{
+											$aNewReductionsList[] = $aReductionsWordListResult;
+										}
+									}
+								}
+								$aReductionsList = $aNewReductionsList;
+							}
+						}
+					}
+					ksort($aGroupedSearches);
+				}
+
 				// Filter out duplicate searches
 				$aSearchHash = array();
 				foreach($aGroupedSearches as $iGroup => $aSearches)
@@ -1095,6 +1136,7 @@
 					$sSQL .= "coalesce(importance,0.9-(rank_search::float/30)) as importance ";
 					$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
 					$sSQL .= "and placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
+					if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
 					$sSQL .= "and linked_place_id is null ";
 					$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,country_code,importance";
 					if (!$bDeDupe) $sSQL .= ",place_id";