fix tag name for housename addresses in layer selection

Fixes #3156.
This commit is contained in:
Sarah Hoffmann
2023-08-19 15:57:33 +02:00
parent 4559886d83
commit 23eed4ff2f
3 changed files with 9 additions and 3 deletions

View File

@@ -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]:

View File

@@ -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'))))