X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c42273a4db2d7b4fe05a0be9210901d35e038887..b0067a0345c2ab7793614925d6150141ef5f18f0:/test/python/api/search/test_token_assignment.py?ds=inline diff --git a/test/python/api/search/test_token_assignment.py b/test/python/api/search/test_token_assignment.py index b470db0d..cde8495d 100644 --- a/test/python/api/search/test_token_assignment.py +++ b/test/python/api/search/test_token_assignment.py @@ -18,21 +18,18 @@ class MyToken(Token): def make_query(*args): - q = None - dummy = MyToken(3.0, 45, 1, 'foo', True) + q = QueryStruct([Phrase(args[0][1], '')]) + dummy = MyToken(penalty=3.0, token=45, count=1, addr_count=1, + lookup_word='foo', is_indexed=True) - for btype, ptype, tlist in args: - if q is None: - q = QueryStruct([Phrase(ptype, '')]) - else: - q.add_node(btype, ptype) + for btype, ptype, _ in args[1:]: + q.add_node(btype, ptype) + q.add_node(BreakType.END, PhraseType.NONE) - start = len(q.nodes) - 1 - for end, ttype in tlist: + for start, t in enumerate(args): + for end, ttype in t[2]: q.add_token(TokenRange(start, end), ttype, dummy) - q.add_node(BreakType.END, PhraseType.NONE) - return q @@ -80,11 +77,11 @@ def test_single_country_name(): def test_single_word_poi_search(): q = make_query((BreakType.START, PhraseType.NONE, - [(1, TokenType.CATEGORY), + [(1, TokenType.NEAR_ITEM), (1, TokenType.QUALIFIER)])) res = list(yield_token_assignments(q)) - assert res == [TokenAssignment(category=TokenRange(0, 1))] + assert res == [TokenAssignment(near_item=TokenRange(0, 1))] @pytest.mark.parametrize('btype', [BreakType.WORD, BreakType.PART, BreakType.TOKEN]) @@ -125,6 +122,8 @@ def test_housenumber_and_street(): check_assignments(yield_token_assignments(q), TokenAssignment(name=TokenRange(1, 2), + housenumber=TokenRange(0, 1)), + TokenAssignment(address=[TokenRange(1, 2)], housenumber=TokenRange(0, 1))) @@ -134,6 +133,8 @@ def test_housenumber_and_street_backwards(): check_assignments(yield_token_assignments(q), TokenAssignment(name=TokenRange(0, 1), + housenumber=TokenRange(1, 2)), + TokenAssignment(address=[TokenRange(0, 1)], housenumber=TokenRange(1, 2))) @@ -148,6 +149,10 @@ def test_housenumber_and_postcode(): name=TokenRange(0, 1), housenumber=TokenRange(1, 2), address=[TokenRange(2, 3)], + postcode=TokenRange(3, 4)), + TokenAssignment(penalty=pytest.approx(0.3), + housenumber=TokenRange(1, 2), + address=[TokenRange(0, 1), TokenRange(2, 3)], postcode=TokenRange(3, 4))) def test_postcode_and_housenumber(): @@ -161,6 +166,10 @@ def test_postcode_and_housenumber(): name=TokenRange(2, 3), housenumber=TokenRange(3, 4), address=[TokenRange(0, 1)], + postcode=TokenRange(1, 2)), + TokenAssignment(penalty=pytest.approx(0.3), + housenumber=TokenRange(3, 4), + address=[TokenRange(0, 1), TokenRange(2, 3)], postcode=TokenRange(1, 2))) @@ -174,7 +183,7 @@ def test_country_housenumber_postcode(): @pytest.mark.parametrize('ttype', [TokenType.POSTCODE, TokenType.COUNTRY, - TokenType.CATEGORY, TokenType.QUALIFIER]) + TokenType.NEAR_ITEM, TokenType.QUALIFIER]) def test_housenumber_with_only_special_terms(ttype): q = make_query((BreakType.START, PhraseType.NONE, [(1, TokenType.HOUSENUMBER)]), (BreakType.WORD, PhraseType.NONE, [(2, ttype)])) @@ -203,7 +212,11 @@ def test_housenumber_many_phrases(): name=TokenRange(4, 5), housenumber=TokenRange(3, 4),\ address=[TokenRange(0, 1), TokenRange(1, 2), - TokenRange(2, 3)])) + TokenRange(2, 3)]), + TokenAssignment(penalty=0.1, + housenumber=TokenRange(3, 4),\ + address=[TokenRange(0, 1), TokenRange(1, 2), + TokenRange(2, 3), TokenRange(4, 5)])) def test_country_at_beginning(): @@ -237,7 +250,7 @@ def test_postcode_with_designation(): (BreakType.PHRASE, PhraseType.NONE, [(2, TokenType.PARTIAL)])) check_assignments(yield_token_assignments(q), - TokenAssignment(name=TokenRange(1, 2), + TokenAssignment(penalty=0.1, name=TokenRange(1, 2), postcode=TokenRange(0, 1)), TokenAssignment(postcode=TokenRange(0, 1), address=[TokenRange(1, 2)])) @@ -250,31 +263,31 @@ def test_postcode_with_designation_backwards(): check_assignments(yield_token_assignments(q), TokenAssignment(name=TokenRange(0, 1), postcode=TokenRange(1, 2)), - TokenAssignment(postcode=TokenRange(1, 2), + TokenAssignment(penalty=0.1, postcode=TokenRange(1, 2), address=[TokenRange(0, 1)])) -def test_category_at_beginning(): - q = make_query((BreakType.START, PhraseType.NONE, [(1, TokenType.CATEGORY)]), +def test_near_item_at_beginning(): + q = make_query((BreakType.START, PhraseType.NONE, [(1, TokenType.NEAR_ITEM)]), (BreakType.WORD, PhraseType.NONE, [(2, TokenType.PARTIAL)])) check_assignments(yield_token_assignments(q), TokenAssignment(penalty=0.1, name=TokenRange(1, 2), - category=TokenRange(0, 1))) + near_item=TokenRange(0, 1))) -def test_category_at_end(): +def test_near_item_at_end(): q = make_query((BreakType.START, PhraseType.NONE, [(1, TokenType.PARTIAL)]), - (BreakType.WORD, PhraseType.NONE, [(2, TokenType.CATEGORY)])) + (BreakType.WORD, PhraseType.NONE, [(2, TokenType.NEAR_ITEM)])) check_assignments(yield_token_assignments(q), TokenAssignment(penalty=0.1, name=TokenRange(0, 1), - category=TokenRange(1, 2))) + near_item=TokenRange(1, 2))) -def test_category_in_middle(): +def test_near_item_in_middle(): q = make_query((BreakType.START, PhraseType.NONE, [(1, TokenType.PARTIAL)]), - (BreakType.WORD, PhraseType.NONE, [(2, TokenType.CATEGORY)]), + (BreakType.WORD, PhraseType.NONE, [(2, TokenType.NEAR_ITEM)]), (BreakType.WORD, PhraseType.NONE, [(3, TokenType.PARTIAL)])) check_assignments(yield_token_assignments(q)) @@ -325,3 +338,14 @@ def test_qualifier_after_housenumber(): (BreakType.WORD, PhraseType.NONE, [(3, TokenType.PARTIAL)])) check_assignments(yield_token_assignments(q)) + + +def test_qualifier_in_middle_of_phrase(): + q = make_query((BreakType.START, PhraseType.NONE, [(1, TokenType.PARTIAL)]), + (BreakType.PHRASE, PhraseType.NONE, [(2, TokenType.PARTIAL)]), + (BreakType.WORD, PhraseType.NONE, [(3, TokenType.QUALIFIER)]), + (BreakType.WORD, PhraseType.NONE, [(4, TokenType.PARTIAL)]), + (BreakType.PHRASE, PhraseType.NONE, [(5, TokenType.PARTIAL)])) + + check_assignments(yield_token_assignments(q)) +