X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/932c2d4f8faa0e43f4777089c859d99dfb517d9d..77e8a16a153752b919a9153c1c9ded9834d387f7:/app/controllers/way_controller.rb?ds=sidebyside diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index 10e0f8442..dd9b65fd8 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -1,103 +1,120 @@ class WayController < ApplicationController - require 'xml/libxml' + require "xml/libxml" - before_filter :authorize - after_filter :compress_output + skip_before_action :verify_authenticity_token + before_action :authorize, :only => [:create, :update, :delete] + before_action :require_allow_write_api, :only => [:create, :update, :delete] + before_action :require_public_data, :only => [:create, :update, :delete] + before_action :check_api_writable, :only => [:create, :update, :delete] + before_action :check_api_readable, :except => [:create, :update, :delete] + around_action :api_call_handle_error, :api_call_timeout def create - if request.put? - way = Way.from_xml(request.raw_post, true) - - if way - way.user_id = @user.id - unless way.preconditions_ok? # are the segments (and their nodes) visible? - render :nothing => true, :status => 412 - return - end + assert_method :put - if way.save_with_history - render :text => way.id.to_s - return - else - render :nothing => true, :status => 500 - return - end - return - else - render :nothing => true, :status => 400 # if we got here the doc didnt parse - return - end + way = Way.from_xml(request.raw_post, true) + + if way + way.create_with_history @user + render :text => way.id.to_s, :content_type => "text/plain" + else + render :text => "", :status => :bad_request end + end + + def read + way = Way.find(params[:id]) + + response.last_modified = way.timestamp - render :nothing => true, :status => 500 # something went very wrong + if way.visible + render :text => way.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone + end end - def rest - unless Way.exists?(params[:id]) - render :nothing => true, :status => 404 - return + def update + way = Way.find(params[:id]) + new_way = Way.from_xml(request.raw_post) + + if new_way && new_way.id == way.id + way.update_from(new_way, @user) + render :text => way.version.to_s, :content_type => "text/plain" + else + render :text => "", :status => :bad_request end + end + # This is the API call to delete a way + def delete way = Way.find(params[:id]) - case request.method + new_way = Way.from_xml(request.raw_post) - when :get - unless way.visible - render :nothing => true, :status => 410 - return - end - render :text => way.to_xml.to_s + if new_way && new_way.id == way.id + way.delete_with_history!(new_way, @user) + render :text => way.version.to_s, :content_type => "text/plain" + else + render :text => "", :status => :bad_request + end + end - when :delete - unless way.visible - render :nothing => true, :status => 410 - return - end + def full + way = Way.includes(:nodes => :node_tags).find(params[:id]) + + if way.visible + visible_nodes = {} + changeset_cache = {} + user_display_name_cache = {} - way.visible = false - way.save_with_history - render :nothing => true - return - when :put - way = Way.from_xml(request.raw_post) - - if way - way_in_db = Way.find(way.id) - if way_in_db - way_in_db.user_id = @user.id - way_in_db.tags = way.tags - way_in_db.segs = way.segs - way_in_db.timestamp = way.timestamp - way_in_db.visible = true - if way_in_db.save_with_history - render :text => way.id - else - render :nothing => true, :status => 500 - end - return - else - render :nothing => true, :status => 404 # way doesn't exist yet + doc = OSM::API.new.get_xml_doc + way.nodes.uniq.each do |node| + if node.visible + doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) + visible_nodes[node.id] = node end - else - render :nothing => true, :status => 400 # if we got here the doc didnt parse - return end + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) + + render :text => doc.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end def ways - response.headers["Content-Type"] = 'application/xml' - ids = params['ways'].split(',').collect {|w| w.to_i } - if ids.length > 0 - waylist = Way.find(ids) - doc = get_xml_doc - waylist.each do |way| - doc.root << way.to_xml_node - end - render :text => doc.to_s - else - render :nothing => true, :status => 400 + unless params["ways"] + fail OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]") + end + + ids = params["ways"].split(",").collect(&:to_i) + + if ids.length == 0 + fail OSM::APIBadUserInput.new("No ways were given to search for") end + + doc = OSM::API.new.get_xml_doc + + Way.find(ids).each do |way| + doc.root << way.to_xml_node + end + + render :text => doc.to_s, :content_type => "text/xml" end + ## + # returns all the ways which are currently using the node given in the + # :id parameter. note that this used to return deleted ways as well, but + # this seemed not to be the expected behaviour, so it was removed. + def ways_for_node + wayids = WayNode.where(:node_id => params[:id]).collect { |ws| ws.id[0] }.uniq + + doc = OSM::API.new.get_xml_doc + + Way.find(wayids).each do |way| + doc.root << way.to_xml_node if way.visible + end + + render :text => doc.to_s, :content_type => "text/xml" + end end