X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/40e920bd52619f549ff829296865f87f89f2fd2a..3b3896da08b0733c3934ac3913ae4b48efa939ff:/lib/map_boundary.rb diff --git a/lib/map_boundary.rb b/lib/map_boundary.rb index 6ac7e9f3d..7d20d2920 100644 --- 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 - 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") @@ -22,10 +22,12 @@ module MapBoundary 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'] - raise OSM::APIBadBoundingBox.new("The maximum bbox size is " + APP_CONFIG['max_request_area'].to_s + + if requested_area > MAX_REQUEST_AREA + raise OSM::APIBadBoundingBox.new("The maximum bbox size is " + MAX_REQUEST_AREA.to_s + ", and your request was too large. Either request a smaller area, or use planet.osm") end end