safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

avoid fallback country lookup when places are excluded

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-06-20 12:22:08 +02:00
parent 2f4342810d
commit 4ad8818809
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nominatim/api/search/db_searches.py
View File

@@ -403,6 +403,12 @@ class CountrySearch(AbstractSearch):
details: SearchDetails) -> nres.SearchResults: details: SearchDetails) -> nres.SearchResults:
""" Look up the country in the fallback country tables. """ Look up the country in the fallback country tables.
""" """
# Avoid the fallback search when this is a more search. Country results
# usually are in the first batch of results and it is not possible
# to exclude these fallbacks.
if details.excluded:
return nres.SearchResults()
t = conn.t.country_name t = conn.t.country_name
tgrid = conn.t.country_grid tgrid = conn.t.country_grid

2
nominatim/api/types.py
View File

@@ -306,7 +306,7 @@ def format_excluded(ids: Any) -> List[int]:
(isinstance(i, str) and (not i or i.isdigit())) for i in plist): (isinstance(i, str) and (not i or i.isdigit())) for i in plist):
raise UsageError("Parameter 'excluded' only takes place IDs.") raise UsageError("Parameter 'excluded' only takes place IDs.")
return [int(id) for id in plist if id] return [int(id) for id in plist if id] or [0]
def format_categories(categories: List[Tuple[str, str]]) -> List[Tuple[str, str]]: def format_categories(categories: List[Tuple[str, str]]) -> List[Tuple[str, str]]: