hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop searches with excluded country codes earlier

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-10-07 12:23:46 +02:00
parent 266153f218
commit c563c2bfec
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Geocode.php
View File

@@ -922,7 +922,7 @@ class Geocode
//if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens); //if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
} }
// Revisit searches, giving penalty to unlikely combinations // Revisit searches, drop bad searches and give penalty to unlikely combinations.
$aGroupedSearches = array(); $aGroupedSearches = array();
foreach ($aSearches as $aSearch) { foreach ($aSearches as $aSearch) {
if (!$aSearch['aName']) { if (!$aSearch['aName']) {
@@ -930,6 +930,11 @@ class Geocode
continue; continue;
} }
} }
if ($this->aCountryCodes && $aSearch['sCountryCode']
&& !in_array($aSearch['sCountryCode'], $this->aCountryCodes)) {
continue;
}
$aSearch['iSearchRank'] += $iGlobalRank; $aSearch['iSearchRank'] += $iGlobalRank;
$aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch; $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
} }
@@ -1256,10 +1261,6 @@ class Geocode
if (CONST_Debug) echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; if (CONST_Debug) echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>";
if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens); if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
if ($sCountryCodesSQL && $aSearch['sCountryCode'] && !in_array($aSearch['sCountryCode'], $this->aCountryCodes)) {
continue;
}
// No location term? // No location term?
if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress'])) { if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress'])) {
if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'] && !$aSearch['oNear']) { if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'] && !$aSearch['oNear']) {