From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 7 Oct 2017 09:53:33 +0000 (+0200)
Subject: remove code for dropping address terms
X-Git-Tag: v3.1.0~49
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/266153f2188e7ce70032af57daf6b30e7f2350b4

remove code for dropping address terms

This code has been inactive in quite a while and is a suboptimal
solution. We need to be much more selective in what gets dropped.
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index fbb1b4e0..652434cc 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1229,35 +1229,6 @@ class Geocode
                 ksort($aGroupedSearches);
             }
 
-            if (CONST_Search_TryDroppedAddressTerms && sizeof($this->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) {
diff --git a/settings/defaults.php b/settings/defaults.php
index 7c984a54..9df95e03 100644
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -101,7 +101,6 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
 @define('CONST_Search_BatchMode', false);
 
-@define('CONST_Search_TryDroppedAddressTerms', false);
 @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
 // If set to true, then reverse order of queries will be tried by default.
 // When set to false only selected languages alloow reverse search.