X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/561ee71129c7d40380d384ce93c1f062651de32b..e42e95c3decfea7770c8d5b2df2fbd5bb3de17ef:/lib/bounding_box.rb?ds=sidebyside

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index d6b5f45c8..9eba0a831 100644
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -63,8 +63,8 @@ class BoundingBox
     raise OSM::APIBadBoundingBox, "The minimum latitude must be less than the maximum latitude, but it wasn't" if min_lat > max_lat
 
     if min_lon < -LON_LIMIT || min_lat < -LAT_LIMIT || max_lon > +LON_LIMIT || max_lat > +LAT_LIMIT
-      raise OSM::APIBadBoundingBox, "The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," \
-                                    " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}"
+      raise OSM::APIBadBoundingBox, "The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}, " \
+                                    "and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}"
     end
     self
   end
@@ -161,10 +161,10 @@ class BoundingBox
 
       # Take an array of length 4, create a bounding box with min_lon, min_lat, max_lon and
       # max_lat within their respective boundaries.
-      min_lon = [[bbox_array[0].to_f, -LON_LIMIT].max, +LON_LIMIT].min
-      min_lat = [[bbox_array[1].to_f, -LAT_LIMIT].max, +LAT_LIMIT].min
-      max_lon = [[bbox_array[2].to_f, +LON_LIMIT].min, -LON_LIMIT].max
-      max_lat = [[bbox_array[3].to_f, +LAT_LIMIT].min, -LAT_LIMIT].max
+      min_lon = bbox_array[0].to_f.clamp(-LON_LIMIT, +LON_LIMIT)
+      min_lat = bbox_array[1].to_f.clamp(-LAT_LIMIT, +LAT_LIMIT)
+      max_lon = bbox_array[2].to_f.clamp(-LON_LIMIT, +LON_LIMIT)
+      max_lat = bbox_array[3].to_f.clamp(-LAT_LIMIT, +LAT_LIMIT)
       BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
     end
   end