Merge pull request #3346 from lonvia/reduce-artificial-importance

[nominatim.git] / nominatim / api / search / token_assignment.py

diff --git a/nominatim/api/search/token_assignment.py b/nominatim/api/search/token_assignment.py
index d94d69039f0f602ab8c0aeda9e5c971a881353fd..7a53a20efe35bd80c3f43cc68aeab5e27894983b 100644 (file)
--- a/nominatim/api/search/token_assignment.py
+++ b/nominatim/api/search/token_assignment.py
@@ -132,6 +132,11 @@ class _TokenSequence:
 
         # Name tokens are always acceptable and don't change direction
         if ttype == qmod.TokenType.PARTIAL:
 
         # Name tokens are always acceptable and don't change direction
         if ttype == qmod.TokenType.PARTIAL:

+            # qualifiers cannot appear in the middle of the qeury. They need
+            # to be near the next phrase.
+            if self.direction == -1 \
+               and any(t.ttype == qmod.TokenType.QUALIFIER for t in self.seq[:-1]):
+                return None

             return self.direction
 
         # Other tokens may only appear once
             return self.direction
 
         # Other tokens may only appear once


@@ -385,7 +390,7 @@ class _TokenSequence:
                 yield from self._get_assignments_address_backward(base, query)
 
             # variant for special housenumber searches
                 yield from self._get_assignments_address_backward(base, query)
 
             # variant for special housenumber searches

-            if base.housenumber:
+            if base.housenumber and not base.qualifier:

                 yield dataclasses.replace(base, penalty=self.penalty)
 
 
                 yield dataclasses.replace(base, penalty=self.penalty)