X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..da6cf371ac27109de75703d3a00f46dd610d8a49:/lib/bounding_box.rb diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb index 282a6a840..e2dfcd3ff 100644 --- 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