From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 11 Mar 2021 19:22:54 +0000 (+0100)
Subject: do not mix partial and full name terms
X-Git-Tag: v3.7.0~19^2~4
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/d5e8c5e975b270a0839af1b54ef5308857d92225?ds=sidebyside

do not mix partial and full name terms

If NameNonSearch already contains a partial term, then a
full term must not be added to the Name list anymore.
---

diff --git a/lib-php/SearchDescription.php b/lib-php/SearchDescription.php
index 436398cd..8e8e5acb 100644
--- a/lib-php/SearchDescription.php
+++ b/lib-php/SearchDescription.php
@@ -289,7 +289,7 @@ class SearchDescription
                     $oSearch->aAddress[$iWordID] = $iWordID;
                     $aNewSearches[] = $oSearch;
                 }
-            } else {
+            } else if (empty($this->aNameNonSearch)) {
                 $oSearch = clone $this;
                 $oSearch->iSearchRank++;
                 $oSearch->aName = array($iWordID => $iWordID);