X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..c8fc2218e5e342ad7afc9409974fd48a733ba94b:/app/controllers/api/nodes_controller.rb?ds=sidebyside diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb index 92779dd67..6934a13c0 100644 --- a/app/controllers/api/nodes_controller.rb +++ b/app/controllers/api/nodes_controller.rb @@ -15,15 +15,21 @@ module Api before_action :set_request_formats, :except => [:create, :update, :delete] - # Create a node from XML. - def create - assert_method :put + # Dump the details on many nodes whose ids are given in the "nodes" parameter. + def index + raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" unless params["nodes"] - node = Node.from_xml(request.raw_post, :create => true) + ids = params["nodes"].split(",").collect(&:to_i) - # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml - node.create_with_history current_user - render :plain => node.id.to_s + raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty? + + @nodes = Node.find(ids) + + # Render the result + respond_to do |format| + format.xml + format.json + end end # Dump the details on a node given in params[:id] @@ -43,6 +49,17 @@ module Api end end + # Create a node from XML. + def create + assert_method :put + + node = Node.from_xml(request.raw_post, :create => true) + + # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml + node.create_with_history current_user + render :plain => node.id.to_s + end + # Update a node from given XML def update node = Node.find(params[:id]) @@ -66,22 +83,5 @@ module Api node.delete_with_history!(new_node, current_user) render :plain => node.version.to_s end - - # Dump the details on many nodes whose ids are given in the "nodes" parameter. - def index - raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" unless params["nodes"] - - ids = params["nodes"].split(",").collect(&:to_i) - - raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty? - - @nodes = Node.find(ids) - - # Render the result - respond_to do |format| - format.xml - format.json - end - end end end