Vagrant: use 2GB by default, dont overwrite local.php which would be unexpected

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a9fa44fe0578976c9f77b45e491ae7dd5b073fa3..38f7614233ea3313c3e67a84aa550fa09afc6f25 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -148,15 +148,9 @@
                        $this->bBoundedSearch = (bool)$bBoundedSearch;
                }
 
-               function setViewBox($sLeft, $sBottom, $sRight, $sTop)
+               function setViewBox($fLeft, $fBottom, $fRight, $fTop)
                {
-                       $fLeft = (float)$sLeft;
-                       $fRight = (float)$sRight;
-                       $fTop = (float)$sTop;
-                       $fBottom = (float)$sBottom;
-                       if ($fRight > $fLeft && $fBottom > $fTop
-                           && ($fRight - $fLeft) < 2 && ($fBottom - $fTop) < 2)
-                               $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
+                       $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
                }
 
                function getViewBoxString()
@@ -1705,7 +1699,7 @@
                                                        $aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
                                                        $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
                                                }
-                                               $aResult['aBoundingBox'] = array($aPointPolygon['minlat'],$aPointPolygon['maxlat'],$aPointPolygon['minlon'],$aPointPolygon['maxlon']);
+                                               $aResult['aBoundingBox'] = array((string)$aPointPolygon['minlat'],(string)$aPointPolygon['maxlat'],(string)$aPointPolygon['minlon'],(string)$aPointPolygon['maxlon']);
                                        }
                                }