Improve formatting of note descriptions in GPX and RSS responses

[rails.git] / lib / map_boundary.rb

diff --git a/lib/map_boundary.rb b/lib/map_boundary.rb
index 7d20d2920ba06f25fe317bec859d02a8553fc6a0..b3085d0ec0c83ed6ceb3150bca329eb35d28dd1e 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, limit_small_area = :true)
+  def check_boundaries(min_lon, min_lat, max_lon, max_lat, max_area = MAX_REQUEST_AREA)

     # 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,12 +22,10 @@ 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)
     # check the bbox isn't too large
     requested_area = (max_lat-min_lat)*(max_lon-min_lon)

-    if requested_area > MAX_REQUEST_AREA
-      raise OSM::APIBadBoundingBox.new("The maximum bbox size is " + MAX_REQUEST_AREA.to_s + 
+    if requested_area > max_area
+      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
   end
         ", and your request was too large. Either request a smaller area, or use planet.osm")
     end
   end