Localisation updates from https://translatewiki.net.

[rails.git] / lib / bounding_box.rb

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index d5d3d784965aae2da4f009050de70c1a64af0693..0cc4c5fd432e3ceae3d388aa5687d927e8773d33 100644 (file)
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -157,14 +157,14 @@ class BoundingBox
     private
 
     def from_bbox_array(bbox_array)
     private
 
     def from_bbox_array(bbox_array)

-      raise OSM::APIBadUserInput, "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat" unless bbox_array
+      raise OSM::APIBadUserInput, "The parameter bbox must be of the form min_lon,min_lat,max_lon,max_lat" unless bbox_array

 
       # Take an array of length 4, create a bounding box with min_lon, min_lat, max_lon and
       # max_lat within their respective boundaries.
 
       # 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
       BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
     end
   end