X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e3693d487a8da3743d53e90926e8064ed8bf34c7..56aefb8dcd86aca391285abf84eb53f3e3e03572:/app/controllers/node_controller.rb?ds=sidebyside diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 8eb698920..33e0ed3ee 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -4,6 +4,7 @@ class NodeController < ApplicationController require 'xml/libxml' before_filter :authorize, :only => [:create, :update, :delete] + before_filter :require_allow_write_api, :only => [:create, :update, :delete] before_filter :require_public_data, :only => [:create, :update, :delete] before_filter :check_api_writable, :only => [:create, :update, :delete] before_filter :check_api_readable, :except => [:create, :update, :delete] @@ -38,7 +39,7 @@ class NodeController < ApplicationController new_node = Node.from_xml(request.raw_post) unless new_node and new_node.id == node.id - raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") + raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") end node.update_from(new_node, @user) render :text => node.version.to_s, :content_type => "text/plain" @@ -52,7 +53,7 @@ class NodeController < ApplicationController new_node = Node.from_xml(request.raw_post) unless new_node and new_node.id == node.id - raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") + raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") end node.delete_with_history!(new_node, @user) render :text => node.version.to_s, :content_type => "text/plain" @@ -63,7 +64,7 @@ class NodeController < ApplicationController ids = params['nodes'].split(',').collect { |n| n.to_i } if ids.length == 0 - raise OSM::BadUserInput.new("No nodes were given to search for") + raise OSM::APIBadUserInput.new("No nodes were given to search for") end doc = OSM::API.new.get_xml_doc