X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2d3972249c18fc5cd193a8b2f2efe9b46badb217..6ede9e3ec74e89dc61b48c52b439a6581dfde80e:/lib/bounding_box.rb diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb index 630518649..1350d69ba 100644 --- a/lib/bounding_box.rb +++ b/lib/bounding_box.rb @@ -14,7 +14,7 @@ class BoundingBox 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) @@ -64,7 +64,7 @@ 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}," \ - " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}" + " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}" 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 - 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 @@ -89,7 +89,7 @@ class BoundingBox end def complete? - !to_a.include?(nil) + to_a.exclude?(nil) end def centre_lon