From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 6 Oct 2017 19:07:33 +0000 (+0200)
Subject: penalize search order where a country comes first
X-Git-Tag: v3.1.0~53
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/41d2cd318d76ac1a48ad78281a36b857ffe97112

penalize search order where a country comes first
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index adae9f77..bced2a36 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -709,6 +709,8 @@ class Geocode
 
              Score how good the search is so they can be ordered
          */
+        $iGlobalRank = 0;
+
         foreach ($aPhrases as $iPhrase => $aPhrase) {
             $aNewPhraseSearches = array();
             if ($bStructuredPhrases) $sPhraseType = $aPhraseTypes[$iPhrase];
@@ -745,6 +747,11 @@ class Geocode
                                             $aSearch['iSearchRank'] += 5;
                                         }
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
+                                        // If it is at the beginning, we can be almost sure that this is the wrong order
+                                        // Increase score for all searches.
+                                        if ($iToken == 0 && $iPhrase == 0) {
+                                            $iGlobalRank++;
+                                        }
                                     }
                                 } elseif (($sPhraseType == '' || $sPhraseType == 'postalcode') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'postcode') {
                                     // We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both
@@ -922,6 +929,7 @@ class Geocode
                     continue;
                 }
             }
+            $aSearch['iSearchRank'] += $iGlobalRank;
             $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
         }
         ksort($aGroupedSearches);