From 23eed4ff2fe4a987ff82d816fdedb9f2bbaa5d88 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 19 Aug 2023 15:57:33 +0200 Subject: [PATCH] fix tag name for housename addresses in layer selection Fixes #3156. --- nominatim/api/reverse.py | 2 +- nominatim/api/search/db_searches.py | 2 +- test/python/api/test_api_reverse.py | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nominatim/api/reverse.py b/nominatim/api/reverse.py index 4a5f9c03..63836b49 100644 --- a/nominatim/api/reverse.py +++ b/nominatim/api/reverse.py @@ -87,7 +87,7 @@ def _locate_interpolation(table: SaFromClause) -> SaLabel: def _is_address_point(table: SaFromClause) -> SaColumn: return sa.and_(table.c.rank_address == 30, sa.or_(table.c.housenumber != None, - table.c.name.has_key('housename'))) + table.c.name.has_key('addr:housename'))) def _get_closest(*rows: Optional[SaRow]) -> Optional[SaRow]: diff --git a/nominatim/api/search/db_searches.py b/nominatim/api/search/db_searches.py index 115f32fa..34a4037a 100644 --- a/nominatim/api/search/db_searches.py +++ b/nominatim/api/search/db_searches.py @@ -111,7 +111,7 @@ def _filter_by_layer(table: SaFromClause, layers: DataLayer) -> SaColumn: orexpr.append(table.c.rank_address.between(1, 29)) orexpr.append(sa.and_(table.c.rank_address == 30, sa.or_(table.c.housenumber != None, - table.c.address.has_key('housename')))) + table.c.address.has_key('addr:housename')))) elif layers & DataLayer.POI: orexpr.append(sa.and_(table.c.rank_address == 30, table.c.class_.not_in(('place', 'building')))) diff --git a/test/python/api/test_api_reverse.py b/test/python/api/test_api_reverse.py index 3296e98f..d9ab2cb8 100644 --- a/test/python/api/test_api_reverse.py +++ b/test/python/api/test_api_reverse.py @@ -60,7 +60,8 @@ def test_reverse_ignore_unindexed(apiobj): (0.7, napi.DataLayer.RAILWAY, 226), (0.7, napi.DataLayer.NATURAL, 227), (0.70003, napi.DataLayer.MANMADE | napi.DataLayer.RAILWAY, 225), - (0.70003, napi.DataLayer.MANMADE | napi.DataLayer.NATURAL, 225)]) + (0.70003, napi.DataLayer.MANMADE | napi.DataLayer.NATURAL, 225), + (5, napi.DataLayer.ADDRESS, 229)]) def test_reverse_rank_30_layers(apiobj, y, layer, place_id): apiobj.add_placex(place_id=223, class_='place', type='house', housenumber='1', @@ -83,6 +84,11 @@ def test_reverse_rank_30_layers(apiobj, y, layer, place_id): rank_address=0, rank_search=30, centroid=(1.3, 0.70005)) + apiobj.add_placex(place_id=229, class_='place', type='house', + name={'addr:housename': 'Old Cottage'}, + rank_address=30, + rank_search=30, + centroid=(1.3, 5)) assert apiobj.api.reverse((1.3, y), layers=layer).place_id == place_id -- 2.39.5