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

simplify handling of SQL lookup code for search_name

Browse Source 
Use function classes which can be instantiated directly.
This commit is contained in:
Sarah Hoffmann
2023-12-06 10:37:06 +01:00
parent 8791c6cb69
commit b06f5fddcb
7 changed files with 139 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/python/api/search/test_search_near.py
View File

@@ -14,6 +14,7 @@ from nominatim.api.types import SearchDetails
from nominatim.api.search.db_searches import NearSearch, PlaceSearch
from nominatim.api.search.db_search_fields import WeightedStrings, WeightedCategories,\
FieldLookup, FieldRanking, RankedTokens
from nominatim.api.search.db_search_lookups import LookupAll
def run_search(apiobj, global_penalty, cat, cat_penalty=None, ccodes=[],
@@ -25,7 +26,7 @@ def run_search(apiobj, global_penalty, cat, cat_penalty=None, ccodes=[],
countries = WeightedStrings(ccodes, [0.0] * len(ccodes))
housenumbers = WeightedStrings([], [])
qualifiers = WeightedStrings([], [])
lookups = [FieldLookup('name_vector', [56], 'lookup_all')]
lookups = [FieldLookup('name_vector', [56], LookupAll)]
rankings = []
if ccodes is not None: