X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1ecf13d8461b2b0c597ba8b6492f6ffd973c61a0..c91b86a1d1271c2bc801ee9dfc3a30fb2758aa9b:/app/controllers/api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index f13802f7f..3cebdcf53 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -3,12 +3,15 @@ class ApiController < ApplicationController
   before_filter :authorize
   after_filter :compress_output
 
+  # The maximum area you're allowed to request, in square degrees
+  MAX_REQUEST_AREA = 0.25
+
   def map
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     # Figure out the bbox
     bbox = params['bbox']
     unless bbox and bbox.count(',') == 3
-      render :nothing => true, :status => 400
+       report_error("The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")
       return
     end
 
@@ -19,17 +22,42 @@ class ApiController < ApplicationController
     max_lon = bbox[2].to_f
     max_lat = bbox[3].to_f
 
+    # check the bbox is sane
+    unless min_lon <= max_lon
+       report_error("The minimum longitude must be less than the maximum longitude, but it wasn't")
+      return
+    end
+    unless min_lat <= max_lat
+       report_error("The minimum latitude must be less than the maximum latitude, but it wasn't")
+      return
+    end
+	unless min_lon >= -180 && min_lat >= -90 && max_lon <= 180 && max_lat <= 90
+       report_error("The latitudes must be between -90 and 90, and longitudes between -180 and 180")
+      return
+	end
+
+    # check the bbox isn't too large
+    requested_area = (max_lat-min_lat)*(max_lon-min_lon)
+    if requested_area > MAX_REQUEST_AREA
+       report_error("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")
+      return
+    end
+
     # get all the nodes
     nodes = Node.find(:all, :conditions => ['latitude > ? AND longitude > ? AND latitude < ? AND longitude < ? AND visible = 1', min_lat, min_lon, max_lat, max_lon])
 
     node_ids = nodes.collect {|node| node.id }
+
+    # (in the future, we may wish to abort here if we found too many nodes)
+
+    # grab the segments
     segments = Array.new
     if node_ids.length > 0
       node_ids_sql = "(#{node_ids.join(',')})"
       # get the referenced segments
-      segments = Segment.find_by_sql "select * from current_segments where node_a in #{node_ids_sql} or node_b in #{node_ids_sql}"
+      segments = Segment.find_by_sql "select * from current_segments where visible = 1 and (node_a in #{node_ids_sql} or node_b in #{node_ids_sql})"
     end
-    # see if we have nay missing nodes
+    # see if we have any missing nodes
     segments_nodes = segments.collect {|segment| segment.node_a }
     segments_nodes += segments.collect {|segment| segment.node_b }
 
@@ -40,7 +68,7 @@ class ApiController < ApplicationController
     # get missing nodes if there are any
     nodes += Node.find(missing_nodes) if missing_nodes.length > 0
 
-    doc = get_xml_doc
+    doc = OSM::API.get_xml_doc
 
     # get ways
     # find which ways are needed
@@ -49,8 +77,7 @@ class ApiController < ApplicationController
     if segment_ids.length > 0
       way_segments = WaySegment.find_all_by_segment_id(segment_ids)
       way_ids = way_segments.collect {|way_segment| way_segment.id }
-
-      ways = Way.find(way_ids)
+      ways = Way.find(way_ids) # NB: doesn't pick up segments, tags from db until accessed via way.way_segments etc.
     end
 
     nodes.each do |node|