X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/37f8f8a28caea936b53271c9f9de36cdbaf15d0e..a25b7953b3889ce6847a13c579fa9fd32219b5e3:/app/controllers/api/map_controller.rb diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb index 27d6f3667..da8138597 100644 --- a/app/controllers/api/map_controller.rb +++ b/app/controllers/api/map_controller.rb @@ -2,8 +2,7 @@ module Api class MapController < ApiController authorize_resource :class => false - before_action :check_api_readable - around_action :api_call_handle_error, :api_call_timeout + before_action :set_request_formats # This is probably the most common call of all. It is used for getting the # OSM data for a specified bounding box, usually for editing. First the @@ -19,15 +18,17 @@ module Api # check boundary is sane and area within defined # see /config/application.yml begin - bbox = BoundingBox.from_bbox_params(params) - bbox.check_boundaries - bbox.check_size - rescue StandardError => err - report_error(err.message) + raise OSM::APIBadUserInput, "The parameter bbox is required" unless params[:bbox] + + @bounds = BoundingBox.from_bbox_params(params) + @bounds.check_boundaries + @bounds.check_size + rescue StandardError => e + report_error(e.message) return end - nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(Settings.max_number_of_nodes + 1) + nodes = Node.bbox(@bounds).where(:visible => true).includes(:node_tags).limit(Settings.max_number_of_nodes + 1) node_ids = nodes.collect(&:id) if node_ids.length > Settings.max_number_of_nodes @@ -35,11 +36,6 @@ module Api return end - doc = OSM::API.new.get_xml_doc - - # add bounds - doc.root << bbox.add_bounds_to(XML::Node.new("bounds")) - # get ways # find which ways are needed ways = [] @@ -62,43 +58,43 @@ module Api nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty? visible_nodes = {} - changeset_cache = {} - user_display_name_cache = {} - + @nodes = [] nodes.each do |node| if node.visible? - doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) visible_nodes[node.id] = node + @nodes << node end end + @ways = [] way_ids = [] ways.each do |way| if way.visible? - doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) way_ids << way.id + @ways << way end end - relations = Relation.nodes(visible_nodes.keys).visible + - Relation.ways(way_ids).visible + @relations = Relation.nodes(visible_nodes.keys).visible + + Relation.ways(way_ids).visible # 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 # an exception for cases where an relation references another *relation*; # in that case we return that as well (but we don't go recursive here) - relations += Relation.relations(relations.collect(&:id)).visible + @relations += Relation.relations(@relations.collect(&:id)).visible # this "uniq" may be slightly inefficient; it may be better to first collect and output # all node-related relations, then find the *not yet covered* way-related ones etc. - relations.uniq.each do |relation| - doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache) - end + @relations.uniq! response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\"" - - render :xml => doc.to_s + # Render the result + respond_to do |format| + format.xml + format.json + end end end end