Merge remote-tracking branch 'openstreetmap/pull/954'

[rails.git] / lib / bounding_box.rb

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index c01808f546a87eb221d53a1a06ea485fa0a78212..5d8ada1c4973be0b8873cdbc6a05c28b9c52fa7b 100644 (file)
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -58,15 +58,15 @@ class BoundingBox
   def check_boundaries
     # check the bbox is sane
     if min_lon > max_lon
-      fail OSM::APIBadBoundingBox.new(
+      raise OSM::APIBadBoundingBox.new(
         "The minimum longitude must be less than the maximum longitude, but it wasn't")
     end
     if min_lat > max_lat
-      fail OSM::APIBadBoundingBox.new(
+      raise OSM::APIBadBoundingBox.new(
         "The minimum latitude must be less than the maximum latitude, but it wasn't")
     end
     if min_lon < -LON_LIMIT || min_lat < -LAT_LIMIT || max_lon > +LON_LIMIT || max_lat > +LAT_LIMIT
-      fail OSM::APIBadBoundingBox.new("The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," +
+      raise OSM::APIBadBoundingBox.new("The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," +
                                        " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}")
     end
     self
@@ -75,7 +75,7 @@ class BoundingBox
   def check_size(max_area = MAX_REQUEST_AREA)
     # check the bbox isn't too large
     if area > max_area
-      fail OSM::APIBadBoundingBox.new("The maximum bbox size is " + max_area.to_s +
+      raise OSM::APIBadBoundingBox.new("The maximum bbox size is " + max_area.to_s +
         ", and your request was too large. Either request a smaller area, or use planet.osm")
     end
     self
@@ -161,7 +161,7 @@ class BoundingBox
 
     def from_bbox_array(bbox_array)
       unless bbox_array
-        fail OSM::APIBadUserInput.new(
+        raise OSM::APIBadUserInput.new(
           "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")
       end
       # Take an array of length 4, create a bounding box with min_lon, min_lat, max_lon and