Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs

[rails.git] / lib / map_boundary.rb

diff --git a/lib/map_boundary.rb b/lib/map_boundary.rb
index 6ac7e9f3d3f46416151f39775ebdba036e71f76c..f2a0c0b520b515130479e7bca3d8289eb6c42cee 100644 (file)
--- a/lib/map_boundary.rb
+++ b/lib/map_boundary.rb
@@ -9,7 +9,7 @@ module MapBoundary
     return min_lon, min_lat, max_lon, max_lat
   end
 
     return min_lon, min_lat, max_lon, max_lat
   end
 

-  def check_boundaries(min_lon, min_lat, max_lon, max_lat)
+  def check_boundaries(min_lon, min_lat, max_lon, max_lat, limit_small_area = :true)

     # check the bbox is sane
     unless min_lon <= max_lon
       raise OSM::APIBadBoundingBox.new("The minimum longitude must be less than the maximum longitude, but it wasn't")
     # check the bbox is sane
     unless min_lon <= max_lon
       raise OSM::APIBadBoundingBox.new("The minimum longitude must be less than the maximum longitude, but it wasn't")


@@ -22,6 +22,8 @@ module MapBoundary
       raise OSM::APIBadBoundingBox.new("The latitudes must be between -90 and 90, and longitudes between -180 and 180")
     end
 
       raise OSM::APIBadBoundingBox.new("The latitudes must be between -90 and 90, and longitudes between -180 and 180")
     end
 

+       return unless limit_small_area == :true
+

     # check the bbox isn't too large
     requested_area = (max_lat-min_lat)*(max_lon-min_lon)
     if requested_area > APP_CONFIG['max_request_area']
     # check the bbox isn't too large
     requested_area = (max_lat-min_lat)*(max_lon-min_lon)
     if requested_area > APP_CONFIG['max_request_area']