Merge remote-tracking branch 'upstream/master'

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 598306235867e8afc7137241ef265f4353f321d9..1dd5a0e5ea3dd484d963d362959d2aafeae369c1 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -149,6 +149,10 @@ class Geocode
 
     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;