Adds toilets

[rails.git] / lib / bounding_box.rb

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index 282a6a840288f36305dabb98c74d9b0aa8b398f7..e2dfcd3ff4b3d40c77fbffa3a5654e689a25a188 100644 (file)
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -1,12 +1,10 @@
 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
 
@@ -18,16 +16,12 @@ class BoundingBox
   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] && 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