X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52611a5bfa69165179bd871b925b5f8b14942e2e..99ccffe4a9c0521d1202c4f0f1a37f8ef2dc0634:/lib/bounding_box.rb?ds=sidebyside

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index 38b994d26..9f6c3d9d5 100644
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -1,13 +1,11 @@
 class BoundingBox
   attr_reader :min_lon, :min_lat, :max_lon, :max_lat
 
-private
   LON_LIMIT = 180.0
   LAT_LIMIT = 90.0
-  SCALED_LON_LIMIT = LON_LIMIT *  GeoRecord::SCALE
-  SCALED_LAT_LIMIT = LAT_LIMIT *  GeoRecord::SCALE
+  SCALED_LON_LIMIT = LON_LIMIT * GeoRecord::SCALE
+  SCALED_LAT_LIMIT = LAT_LIMIT * GeoRecord::SCALE
 
-public
   def initialize(min_lon, min_lat, max_lon, max_lat)
     @min_lon = min_lon.to_f unless min_lon.nil?
     @min_lat = min_lat.to_f unless min_lat.nil?
@@ -16,29 +14,25 @@ public
   end
 
   def self.from_s(s)
-    if s.count(',') == 3
-      BoundingBox.new(*s.split(/,/))
-    else
-      nil
-    end
+    BoundingBox.new(*s.split(/,/)) if s.count(",") == 3
   end
 
   def self.from_bbox_params(params)
-    if params[:bbox] and params[:bbox].count(',') == 3
-      bbox_array = params[:bbox].split(',')
+    if params[:bbox] && params[:bbox].count(",") == 3
+      bbox_array = params[:bbox].split(",")
     end
     from_bbox_array(bbox_array)
   end
 
   def self.from_lon_lat_params(params)
-    if params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat]
+    if params[:minlon] && params[:minlat] && params[:maxlon] && params[:maxlat]
       bbox_array = [params[:minlon], params[:minlat], params[:maxlon], params[:maxlat]]
     end
     from_bbox_array(bbox_array)
   end
 
   def self.from_lrbt_params(params)
-    if params[:l] and params[:b] and params[:t] and params[:t]
+    if params[:l] && params[:b] && params[:t] && params[:t]
       bbox_array = [params[:l], params[:b], params[:r], params[:t]]
     end
     from_bbox_array(bbox_array)
@@ -65,11 +59,13 @@ public
     # check the bbox is sane
     if min_lon > max_lon
       raise OSM::APIBadBoundingBox.new(
-        "The minimum longitude must be less than the maximum longitude, but it wasn't")
+        "The minimum longitude must be less than the maximum longitude, but it wasn't"
+      )
     end
     if min_lat > max_lat
       raise OSM::APIBadBoundingBox.new(
-        "The minimum latitude must be less than the maximum latitude, but it wasn't")
+        "The minimum latitude must be less than the maximum latitude, but it wasn't"
+      )
     end
     if min_lon < -LON_LIMIT || min_lat < -LAT_LIMIT || max_lon > +LON_LIMIT || max_lat > +LAT_LIMIT
       raise OSM::APIBadBoundingBox.new("The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," +
@@ -98,7 +94,7 @@ public
   end
 
   def complete?
-    not to_a.include?(nil)
+    !to_a.include?(nil)
   end
 
   def centre_lon
@@ -118,7 +114,7 @@ public
   end
 
   def slippy_width(zoom)
-    width * 256.0 * 2.0 ** zoom / 360.0
+    width * 256.0 * 2.0**zoom / 360.0
   end
 
   def slippy_height(zoom)
@@ -127,7 +123,7 @@ public
 
     Math.log((Math.tan(max) + 1.0 / Math.cos(max)) /
              (Math.tan(min) + 1.0 / Math.cos(min))) *
-             (128.0 * 2.0 ** zoom / Math::PI)
+      (128.0 * 2.0**zoom / Math::PI)
   end
 
   # there are two forms used for bounds with and without an underscore,
@@ -162,19 +158,23 @@ public
     "#{min_lon},#{min_lat},#{max_lon},#{max_lat}"
   end
 
-  private
-  def self.from_bbox_array(bbox_array)
-    unless bbox_array
-      raise OSM::APIBadUserInput.new(
-        "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")
+  class << self
+    private
+
+    def from_bbox_array(bbox_array)
+      unless bbox_array
+        raise OSM::APIBadUserInput.new(
+          "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat"
+        )
+      end
+      # 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
+      BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
     end
-    # 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
-    BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
   end
 
   def update!(bbox)