hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

disallow address searches that start with a postcode

Browse Source 
These are postcode searches and nothing else.
This commit is contained in:
Sarah Hoffmann
2023-07-17 11:45:35 +02:00
parent 412bd2ec20
commit d48ea4f22c
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
nominatim/api/search/token_assignment.py
View File

@@ -257,6 +257,26 @@ class _TokenSequence:
return True return True
def _get_assignments_postcode(self, base: TokenAssignment,
query_len: int) -> Iterator[TokenAssignment]:
""" Yield possible assignments of Postcode searches with an
address component.
"""
assert base.postcode is not None
if (base.postcode.start == 0 and self.direction != -1)\
or (base.postcode.end == query_len and self.direction != 1):
log().comment('postcode search')
# <address>,<postcode> should give preference to address search
if base.postcode.start == 0:
penalty = self.penalty
self.direction = -1 # name searches are only possbile backwards
else:
penalty = self.penalty + 0.1
self.direction = 1 # name searches are only possbile forewards
yield dataclasses.replace(base, penalty=penalty)
def get_assignments(self, query: qmod.QueryStruct) -> Iterator[TokenAssignment]: def get_assignments(self, query: qmod.QueryStruct) -> Iterator[TokenAssignment]:
""" Yield possible assignments for the current sequence. """ Yield possible assignments for the current sequence.
@@ -271,15 +291,7 @@ class _TokenSequence:
# Postcode search (postcode-only search is covered in next case) # Postcode search (postcode-only search is covered in next case)
if base.postcode is not None and base.address: if base.postcode is not None and base.address:
if (base.postcode.start == 0 and self.direction != -1)\ yield from self._get_assignments_postcode(base, query.num_token_slots())
or (base.postcode.end == query.num_token_slots() and self.direction != 1):
log().comment('postcode search')
# <address>,<postcode> should give preference to address search
if base.postcode.start == 0:
penalty = self.penalty
else:
penalty = self.penalty + 0.1
yield dataclasses.replace(base, penalty=penalty)
# Postcode or country-only search # Postcode or country-only search
if not base.address: if not base.address: