Use factory_bot to build new model objects

[rails.git] / lib / bounding_box.rb

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index 6582a30c0157ed1af60b844853df84743a33e72d..1350d69babdd84c6e6691eb56a8217fb58378bc4 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)


@@ -64,15 +64,15 @@ class BoundingBox
 
     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}," \
 
     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}"
+                                    " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}"

     end
     self
   end
 
     end
     self
   end
 

-  def check_size(max_area = MAX_REQUEST_AREA)
+  def check_size(max_area = Settings.max_request_area)

     # check the bbox isn't too large
     if area > max_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


@@ -124,10 +124,10 @@ class BoundingBox
   # 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 = "")
   # 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