X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d6e1c67fb2291c6933f37bac3b9a3f518e8487a..4e64291839d45a0c660fc84f11a6c4c811cf8f21:/app/controllers/way_controller.rb?ds=sidebyside diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index fd01008fa..e7a968a09 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -1,153 +1,115 @@ class WayController < ApplicationController - require 'xml/libxml' + require "xml/libxml" - session :off - before_filter :authorize, :only => [:create, :update, :delete] - before_filter :check_write_availability, :only => [:create, :update, :delete] - before_filter :check_read_availability, :except => [:create, :update, :delete] - 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 - if !way.preconditions_ok? - render :text => "", :status => :precondition_failed - else - way.version = 0 - way.user_id = @user.id - way.save_with_history! - - render :text => way.id.to_s, :content_type => "text/plain" - end - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :method_not_allowed - end + assert_method :put + + way = Way.from_xml(request.raw_post, true) + + # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml + way.create_with_history @user + render :text => way.id.to_s, :content_type => "text/plain" end def read - begin - way = Way.find(params[:id]) + way = Way.find(params[:id]) - response.headers['Last-Modified'] = way.timestamp.rfc822 + response.last_modified = way.timestamp - if way.visible - render :text => way.to_xml.to_s, :content_type => "text/xml" - else - render :text => "", :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + if way.visible + render :text => way.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end def update - begin - way = Way.find(params[:id]) - new_way = Way.from_xml(request.raw_post) - - if new_way and new_way.id == way.id - unless update_internal(way, new_way) - render :text => "", :status => :precondition_failed - else - render :nothing => true - end - else - render :nothing => true, :status => :bad_request - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - end - end - - def update_internal way, new_way - way = Way.find(new_way.id) if way.nil? + way = Way.find(params[:id]) + new_way = Way.from_xml(request.raw_post) - if !new_way.preconditions_ok? - return false - else - way.user_id = @user.id - way.tags = new_way.tags - way.nds = new_way.nds - way.visible = true - way.save_with_history! - - return true + unless new_way && new_way.id == way.id + fail OSM::APIBadUserInput.new("The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})") end + + way.update_from(new_way, @user) + render :text => way.version.to_s, :content_type => "text/plain" end # This is the API call to delete a way def delete - begin - way = Way.find(params[:id]) - way.delete_with_relations_and_history(@user) + way = Way.find(params[:id]) + new_way = Way.from_xml(request.raw_post) - # if we get here, all is fine, otherwise something will catch below. - render :nothing => true - rescue OSM::APIAlreadyDeletedError - render :text => "", :status => :gone - rescue OSM::APIPreconditionFailedError - render :text => "", :status => :precondition_failed - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + 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 def full - begin - way = Way.find(params[:id]) + way = Way.includes(:nodes => :node_tags).find(params[:id]) - if way.visible - nd_ids = way.nds + [-1] - nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{nd_ids.join(',')})") + if way.visible + visible_nodes = {} + changeset_cache = {} + user_display_name_cache = {} - # Render - doc = OSM::API.new.get_xml_doc - nodes.each do |node| - doc.root << node.to_xml_node() + 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 - doc.root << way.to_xml_node() - - render :text => doc.to_s, :content_type => "text/xml" - else - render :text => "", :status => :gone end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + 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 - begin - ids = params['ways'].split(',').collect { |w| w.to_i } - rescue - ids = [] + unless params["ways"] + fail OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]") end - if ids.length > 0 - doc = OSM::API.new.get_xml_doc + ids = params["ways"].split(",").collect(&:to_i) - Way.find(ids).each do |way| - doc.root << way.to_xml_node - end + if ids.length == 0 + fail OSM::APIBadUserInput.new("No ways were given to search for") + end - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :bad_request + 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.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id[0] }.uniq + 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 + doc.root << way.to_xml_node if way.visible end render :text => doc.to_s, :content_type => "text/xml"