From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 20 Jul 2018 21:30:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~318
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a9ef3021320949e46b098b20d467adc82b96bfb9?hp=-c

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

a9ef3021320949e46b098b20d467adc82b96bfb9
diff --combined lib/Geocode.php
index 59830623,f0e03de5..1dd5a0e5
--- 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;
@@@ -149,6 -149,10 +149,10 @@@
  
      private function viewboxImportanceFactor($fX, $fY)
      {
+         if (!$this->aViewBox) {
+             return 1;
+         }
+ 
          $fWidth = ($this->aViewBox[2] - $this->aViewBox[0])/2;
          $fHeight = ($this->aViewBox[3] - $this->aViewBox[1])/2;