Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a9fe96114ad1093a68a8d84976d04ed809dea2da..c1fae0bbec399305b1efcbccc02b41e3e9f43163 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -148,9 +148,15 @@
                        $this->bBoundedSearch = (bool)$bBoundedSearch;
                }
 
-               function setViewBox($fLeft, $fBottom, $fRight, $fTop)
+               function setViewBox($sLeft, $sBottom, $sRight, $sTop)
                {
-                       $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
+                       $fLeft = (float)$sLeft;
+                       $fRight = (float)$sRight;
+                       $fTop = (float)$sTop;
+                       $fBottom = (float)$sBottom;
+                       if ($fRight > $fLeft && $fBottom < $fTop
+                           && ($fRight - $fLeft) < 2 && ($fTop - $fBottom) < 2)
+                               $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
                }
 
                function getViewBoxString()
@@ -1699,7 +1705,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']);
                                        }
                                }