From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 9 Feb 2020 11:20:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~256
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/49449b15badc204d57e1f99661ac05b7dbecdd09?hp=-c

Merge remote-tracking branch 'upstream/master'
---

49449b15badc204d57e1f99661ac05b7dbecdd09
diff --combined lib/Geocode.php
index 12410acc,f45b2caa..c1d0c46f
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -18,7 -18,7 +18,7 @@@ class Geocod
      protected $aLangPrefOrder = array();
  
      protected $aExcludePlaceIDs = array();
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -907,12 -907,6 +907,6 @@@
                  $aResult = array_merge($aResult, $aOutlineResult);
              }
  
-             if ($aResult['extra_place'] == 'city') {
-                 $aResult['class'] = 'place';
-                 $aResult['type'] = 'city';
-                 $aResult['rank_search'] = 16;
-             }
- 
              // Is there an icon set for this type of result?
              $aClassInfo = ClassTypes\getInfo($aResult);