X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bee38e63a3cf9083d5bf38e8bbfbac62f9a6a9d1..955122e41292828516d6b75c3baf813d00da76e2:/app/controllers/api_controller.rb diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 28d0f413b..26cb93a48 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -4,15 +4,18 @@ class ApiController < ApplicationController before_filter :check_read_availability, :except => [:capabilities] after_filter :compress_output + # Help methods for checking boundary sanity and area size + include MapBoundary + #COUNT is the number of map requests to allow before exiting and starting a new process @@count = COUNT # The maximum area you're allowed to request, in square degrees MAX_REQUEST_AREA = 0.25 - # Number of GPS trace/trackpoints returned per-page TRACEPOINTS_PER_PAGE = 5000 + def trackpoints @@count+=1 @@ -37,30 +40,13 @@ class ApiController < ApplicationController end bbox = bbox.split(',') - - min_lon = bbox[0].to_f - min_lat = bbox[1].to_f - 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") + min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox) + # check boundary is sane and area within defined + # see /config/application.yml + begin + check_boundaries(min_lon, min_lat, max_lon, max_lat) + rescue Exception => err + report_error(err.message) return end @@ -93,60 +79,46 @@ class ApiController < ApplicationController exit! end - render :text => doc.to_s, :content_type => "text/xml" + response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\"" + render :text => doc.to_s, :content_type => "text/xml" end def map GC.start @@count+=1 - # Figure out the bbox bbox = params['bbox'] + unless bbox and bbox.count(',') == 3 + # alternatively: report_error(TEXT['boundary_parameter_required'] report_error("The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat") return end bbox = bbox.split(',') - min_lon = bbox[0].to_f - min_lat = bbox[1].to_f - 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 + min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox) - # 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") + # check boundary is sane and area within defined + # see /config/application.yml + begin + check_boundaries(min_lon, min_lat, max_lon, max_lat) + rescue Exception => err + report_error(err.message) return end - # get all the nodes - nodes = Node.find_by_area(min_lat, min_lon, max_lat, max_lon, :conditions => "visible = 1") - - node_ids = nodes.collect {|node| node.id } + @nodes = Node.find_by_area(min_lat, min_lon, max_lat, max_lon, :conditions => "visible = 1", :limit => APP_CONFIG['max_number_of_nodes']+1) + # get all the nodes, by tag not yet working, waiting for change from NickB + # need to be @nodes (instance var) so tests in /spec can be performed + #@nodes = Node.search(bbox, params[:tag]) - if node_ids.length > 50_000 + node_ids = @nodes.collect(&:id) + if node_ids.length > APP_CONFIG['max_number_of_nodes'] report_error("You requested too many nodes (limit is 50,000). Either request a smaller area, or use planet.osm") return end - if node_ids.length == 0 render :text => "", :content_type => "text/xml" return @@ -161,11 +133,11 @@ class ApiController < ApplicationController ways = Array.new if node_ids.length > 0 way_nodes = WayNode.find_all_by_node_id(node_ids) - way_ids = way_nodes.collect {|way_node| way_node.id[0] } + way_ids = way_nodes.collect { |way_node| way_node.id[0] } ways = Way.find(way_ids) list_of_way_nodes = ways.collect { |way| - way.way_nodes.collect { |way_node| way_node.node_id } + way.way_nodes.collect { |way_node| way_node.node_id } } list_of_way_nodes.flatten! @@ -177,13 +149,13 @@ class ApiController < ApplicationController nodes_to_fetch = (list_of_way_nodes.uniq - node_ids) - [0] if nodes_to_fetch.length > 0 - nodes += Node.find(nodes_to_fetch) + @nodes += Node.find(nodes_to_fetch) end visible_nodes = {} user_display_name_cache = {} - nodes.each do |node| + @nodes.each do |node| if node.visible? doc.root << node.to_xml_node(user_display_name_cache) visible_nodes[node.id] = node @@ -198,20 +170,8 @@ class ApiController < ApplicationController end end - # collect relationships. currently done in one big block at the end; - # may need to move this upwards if people want automatic completion of - # relationships, i.e. deliver referenced objects like we do with ways... - relations = Array.new - if visible_nodes.length > 0 - relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + - "e.visible=1 and " + - "em.id = e.id and em.member_type='node' and em.member_id in (#{visible_nodes.keys.join(',')})") - end - if way_ids.length > 0 - relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + - "e.visible=1 and " + - "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})") - end + relations = Relation.find_for_nodes_and_ways(visible_nodes.keys, way_ids) + # we do not normally return the "other" partners referenced by an relation, # e.g. if we return a way A that is referenced by relation X, and there's # another way B also referenced, that is not returned. But we do make @@ -230,6 +190,8 @@ class ApiController < ApplicationController doc.root << relation.to_xml_node(user_display_name_cache) end + response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\"" + render :text => doc.to_s, :content_type => "text/xml" #exit when we have too many requests