X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/071c3581e94552e5da08a2eed14e9a69e4f87e4f..34e3e51456774127d43408b7ab65c24f41373f62:/app/controllers/node_controller.rb diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 5064a3c0b..597aa4a44 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -26,19 +26,21 @@ class NodeController < ApplicationController # Dump the details on a node given in params[:id] def read node = Node.find(params[:id]) - if node.visible? - response.last_modified = node.timestamp + + response.last_modified = node.timestamp + + if node.visible render :text => node.to_xml.to_s, :content_type => "text/xml" else render :text => "", :status => :gone end end - + # Update a node from given XML def update node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - + unless new_node and new_node.id == 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 @@ -46,13 +48,13 @@ class NodeController < ApplicationController render :text => node.version.to_s, :content_type => "text/plain" end - # Delete a node. Doesn't actually delete it, but retains its history + # Delete a node. Doesn't actually delete it, but retains its history # in a wiki-like way. We therefore treat it like an update, so the delete # method returns the new version number. def delete node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - + unless new_node and new_node.id == 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 @@ -62,6 +64,10 @@ class NodeController < ApplicationController # Dump the details on many nodes whose ids are given in the "nodes" parameter. def nodes + if not params['nodes'] + raise OSM::APIBadUserInput.new("The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]") + end + ids = params['nodes'].split(',').collect { |n| n.to_i } if ids.length == 0