Merge remote-tracking branch 'upstream/pull/3126'

[rails.git] / lib / bounding_box.rb

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index d1c39f1f4dbf73674f6f875d4489c86be17a0c1a..d5d3d784965aae2da4f009050de70c1a64af0693 100644 (file)
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -14,7 +14,7 @@ class BoundingBox
   end
 
   def self.from_s(s)
   end
 
   def self.from_s(s)

-    BoundingBox.new(*s.split(/,/)) if s.count(",") == 3
+    BoundingBox.new(*s.split(",")) if s.count(",") == 3

   end
 
   def self.from_bbox_params(params)
   end
 
   def self.from_bbox_params(params)


@@ -39,19 +39,19 @@ class BoundingBox
     if bbox.complete?
       if bbox.min_lon < min_lon
         @min_lon = [-SCALED_LON_LIMIT,
     if bbox.complete?
       if bbox.min_lon < min_lon
         @min_lon = [-SCALED_LON_LIMIT,

-                    bbox.min_lon + margin * (min_lon - max_lon)].max
+                    bbox.min_lon + (margin * (min_lon - max_lon))].max

       end
       if bbox.min_lat < min_lat
         @min_lat = [-SCALED_LAT_LIMIT,
       end
       if bbox.min_lat < min_lat
         @min_lat = [-SCALED_LAT_LIMIT,

-                    bbox.min_lat + margin * (min_lat - max_lat)].max
+                    bbox.min_lat + (margin * (min_lat - max_lat))].max

       end
       if bbox.max_lon > max_lon
         @max_lon = [+SCALED_LON_LIMIT,
       end
       if bbox.max_lon > max_lon
         @max_lon = [+SCALED_LON_LIMIT,

-                    bbox.max_lon + margin * (max_lon - min_lon)].min
+                    bbox.max_lon + (margin * (max_lon - min_lon))].min

       end
       if bbox.max_lat > max_lat
         @max_lat = [+SCALED_LAT_LIMIT,
       end
       if bbox.max_lat > max_lat
         @max_lat = [+SCALED_LAT_LIMIT,

-                    bbox.max_lat + margin * (max_lat - min_lat)].min
+                    bbox.max_lat + (margin * (max_lat - min_lat))].min

       end
     end
     self
       end
     end
     self


@@ -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 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
     end
     self
   end


@@ -72,7 +72,7 @@ class BoundingBox
   def check_size(max_area = Settings.max_request_area)
     # check the bbox isn't too large
     if area > max_area
   def check_size(max_area = Settings.max_request_area)
     # check the bbox isn't too large
     if area > max_area

-      raise OSM::APIBadBoundingBox, "The maximum bbox size is " + max_area.to_s +
+      raise OSM::APIBadBoundingBox, "The maximum bbox size is #{max_area}" \

                                     ", and your request was too large. Either request a smaller area, or use planet.osm"
     end
     self
                                     ", and your request was too large. Either request a smaller area, or use planet.osm"
     end
     self


@@ -89,7 +89,7 @@ class BoundingBox
   end
 
   def complete?
   end
 
   def complete?

-    !to_a.include?(nil)
+    to_a.exclude?(nil)

   end
 
   def centre_lon
   end
 
   def centre_lon


@@ -109,25 +109,25 @@ class BoundingBox
   end
 
   def slippy_width(zoom)
   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)
     min = min_lat * Math::PI / 180.0
     max = max_lat * Math::PI / 180.0
 
   end
 
   def slippy_height(zoom)
     min = min_lat * Math::PI / 180.0
     max = max_lat * Math::PI / 180.0
 

-    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)
+    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)

   end
 
   # there are two forms used for bounds with and without an underscore,
   # cater for both forms eg minlon and min_lon
   def add_bounds_to(hash, underscore = "")
   end
 
   # there are two forms used for bounds with and without an underscore,
   # cater for both forms eg minlon and min_lon
   def add_bounds_to(hash, underscore = "")

-    hash["min#{underscore}lat"] = format("%.7f", min_lat)
-    hash["min#{underscore}lon"] = format("%.7f", min_lon)
-    hash["max#{underscore}lat"] = format("%.7f", max_lat)
-    hash["max#{underscore}lon"] = format("%.7f", max_lon)
+    hash["min#{underscore}lat"] = format("%<lat>.7f", :lat => min_lat)
+    hash["min#{underscore}lon"] = format("%<lon>.7f", :lon => min_lon)
+    hash["max#{underscore}lat"] = format("%<lat>.7f", :lat => max_lat)
+    hash["max#{underscore}lon"] = format("%<lon>.7f", :lon => max_lon)

     hash
   end
 
     hash
   end