X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/54cb9a33b1f62b91ce7b3dd9e4773c46cc04c2b8..edb1eec46d0fd222f9b30e0e3d62e906c1c9059e:/test/python/api/search/test_search_near.py?ds=sidebyside diff --git a/test/python/api/search/test_search_near.py b/test/python/api/search/test_search_near.py index 2a0acb74..5b60dd51 100644 --- a/test/python/api/search/test_search_near.py +++ b/test/python/api/search/test_search_near.py @@ -14,9 +14,10 @@ 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=[], +def run_search(apiobj, frontend, global_penalty, cat, cat_penalty=None, ccodes=[], details=SearchDetails()): class PlaceSearchData: @@ -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: @@ -38,21 +39,23 @@ def run_search(apiobj, global_penalty, cat, cat_penalty=None, ccodes=[], near_search = NearSearch(0.1, WeightedCategories(cat, cat_penalty), place_search) + api = frontend(apiobj, options=['search']) + async def run(): - async with apiobj.api._async_api.begin() as conn: + async with api._async_api.begin() as conn: return await near_search.lookup(conn, details) - results = apiobj.async_to_sync(run()) + results = api._loop.run_until_complete(run()) results.sort(key=lambda r: r.accuracy) return results -def test_no_results_inner_query(apiobj): - assert not run_search(apiobj, 0.4, [('this', 'that')]) +def test_no_results_inner_query(apiobj, frontend): + assert not run_search(apiobj, frontend, 0.4, [('this', 'that')]) -def test_no_appropriate_results_inner_query(apiobj): +def test_no_appropriate_results_inner_query(apiobj, frontend): apiobj.add_placex(place_id=100, country_code='us', centroid=(5.6, 4.3), geometry='POLYGON((0.0 0.0, 10.0 0.0, 10.0 2.0, 0.0 2.0, 0.0 0.0))') @@ -61,7 +64,7 @@ def test_no_appropriate_results_inner_query(apiobj): apiobj.add_placex(place_id=22, class_='amenity', type='bank', centroid=(5.6001, 4.2994)) - assert not run_search(apiobj, 0.4, [('amenity', 'bank')]) + assert not run_search(apiobj, frontend, 0.4, [('amenity', 'bank')]) class TestNearSearch: @@ -78,18 +81,18 @@ class TestNearSearch: centroid=(-10.3, 56.9)) - def test_near_in_placex(self, apiobj): + def test_near_in_placex(self, apiobj, frontend): apiobj.add_placex(place_id=22, class_='amenity', type='bank', centroid=(5.6001, 4.2994)) apiobj.add_placex(place_id=23, class_='amenity', type='bench', centroid=(5.6001, 4.2994)) - results = run_search(apiobj, 0.1, [('amenity', 'bank')]) + results = run_search(apiobj, frontend, 0.1, [('amenity', 'bank')]) assert [r.place_id for r in results] == [22] - def test_multiple_types_near_in_placex(self, apiobj): + def test_multiple_types_near_in_placex(self, apiobj, frontend): apiobj.add_placex(place_id=22, class_='amenity', type='bank', importance=0.002, centroid=(5.6001, 4.2994)) @@ -97,13 +100,13 @@ class TestNearSearch: importance=0.001, centroid=(5.6001, 4.2994)) - results = run_search(apiobj, 0.1, [('amenity', 'bank'), - ('amenity', 'bench')]) + results = run_search(apiobj, frontend, 0.1, [('amenity', 'bank'), + ('amenity', 'bench')]) assert [r.place_id for r in results] == [22, 23] - def test_near_in_classtype(self, apiobj): + def test_near_in_classtype(self, apiobj, frontend): apiobj.add_placex(place_id=22, class_='amenity', type='bank', centroid=(5.6, 4.34)) apiobj.add_placex(place_id=23, class_='amenity', type='bench', @@ -111,13 +114,13 @@ class TestNearSearch: apiobj.add_class_type_table('amenity', 'bank') apiobj.add_class_type_table('amenity', 'bench') - results = run_search(apiobj, 0.1, [('amenity', 'bank')]) + results = run_search(apiobj, frontend, 0.1, [('amenity', 'bank')]) assert [r.place_id for r in results] == [22] @pytest.mark.parametrize('cc,rid', [('us', 22), ('mx', 23)]) - def test_restrict_by_country(self, apiobj, cc, rid): + def test_restrict_by_country(self, apiobj, frontend, cc, rid): apiobj.add_placex(place_id=22, class_='amenity', type='bank', centroid=(5.6001, 4.2994), country_code='us') @@ -131,13 +134,13 @@ class TestNearSearch: centroid=(-10.3001, 56.9), country_code='us') - results = run_search(apiobj, 0.1, [('amenity', 'bank')], ccodes=[cc, 'fr']) + results = run_search(apiobj, frontend, 0.1, [('amenity', 'bank')], ccodes=[cc, 'fr']) assert [r.place_id for r in results] == [rid] @pytest.mark.parametrize('excluded,rid', [(22, 122), (122, 22)]) - def test_exclude_place_by_id(self, apiobj, excluded, rid): + def test_exclude_place_by_id(self, apiobj, frontend, excluded, rid): apiobj.add_placex(place_id=22, class_='amenity', type='bank', centroid=(5.6001, 4.2994), country_code='us') @@ -146,7 +149,7 @@ class TestNearSearch: country_code='us') - results = run_search(apiobj, 0.1, [('amenity', 'bank')], + results = run_search(apiobj, frontend, 0.1, [('amenity', 'bank')], details=SearchDetails(excluded=[excluded])) assert [r.place_id for r in results] == [rid] @@ -154,12 +157,12 @@ class TestNearSearch: @pytest.mark.parametrize('layer,rids', [(napi.DataLayer.POI, [22]), (napi.DataLayer.MANMADE, [])]) - def test_with_layer(self, apiobj, layer, rids): + def test_with_layer(self, apiobj, frontend, layer, rids): apiobj.add_placex(place_id=22, class_='amenity', type='bank', centroid=(5.6001, 4.2994), country_code='us') - results = run_search(apiobj, 0.1, [('amenity', 'bank')], + results = run_search(apiobj, frontend, 0.1, [('amenity', 'bank')], details=SearchDetails(layers=layer)) assert [r.place_id for r in results] == rids