fix top-bottom mixup in bounding box

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a9fa44fe0578976c9f77b45e491ae7dd5b073fa3..a932949d20934f39e14be9592cd3343eeef057aa 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -154,8 +154,8 @@
                        $fRight = (float)$sRight;
                        $fTop = (float)$sTop;
                        $fBottom = (float)$sBottom;
                        $fRight = (float)$sRight;
                        $fTop = (float)$sTop;
                        $fBottom = (float)$sBottom;

-                       if ($fRight > $fLeft && $fBottom > $fTop
-                           && ($fRight - $fLeft) < 2 && ($fBottom - $fTop) < 2)
+                       if ($fRight > $fLeft && $fBottom < $fTop
+                           && ($fRight - $fLeft) < 2 && ($fTop - $fBottom) < 2)

                                $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
                }
 
                                $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
                }
 

diff --git a/tests/features/api/regression.feature b/tests/features/api/regression.feature
index 8a436fc3d41dac571fc4626557e737170e6b0d57..bbff268a566f9476c6442545007164c21cb1b384 100644 (file)
--- a/tests/features/api/regression.feature
+++ b/tests/features/api/regression.feature
@@ -187,7 +187,7 @@ Feature: API regression tests
      Scenario: trac #5238
         Given the request parameters
          | bounded | viewbox
      Scenario: trac #5238
         Given the request parameters
          | bounded | viewbox

-         | 1       | 0,0,-1,-1
+         | 1       | 0,0,1,-1

         When sending json search query "sy"
         Then exactly 0 results are returned
 
         When sending json search query "sy"
         Then exactly 0 results are returned
 

diff --git a/tests/features/api/search_params.feature b/tests/features/api/search_params.feature
index b9d06791572eadd16e4720f63c19b7b5d812b3b0..92ca8c398b7d812cba013a6514ed3fa222135d9f 100644 (file)
--- a/tests/features/api/search_params.feature
+++ b/tests/features/api/search_params.feature
@@ -83,7 +83,7 @@ Feature: Search queries
     Scenario: bounded search remains within viewbox, even with no results
         Given the request parameters
          | bounded | viewbox
     Scenario: bounded search remains within viewbox, even with no results
         Given the request parameters
          | bounded | viewbox

-         | 1       | 43.54285,-5.662003,43.5403125,-5.6563282
+         | 1       | 43.5403125,-5.6563282,43.54285,-5.662003

          When sending json search query "restaurant"
         Then less than 1 result is returned
 
          When sending json search query "restaurant"
         Then less than 1 result is returned