X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/84f3668fc4c49f4d3d6faa89990aed5e03b8592d..9a05a7ba490cbf2ed7fdc50ef5ae203dc5cbfd18:/app/controllers/node_controller.rb?ds=sidebyside diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index a5f20acea..1e34bc10d 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -1,162 +1,84 @@ +# The NodeController is the RESTful interface to Node objects + class NodeController < ApplicationController require 'xml/libxml' - before_filter :authorize + skip_before_filter :verify_authenticity_token + 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] + after_filter :compress_output + around_filter :api_call_handle_error, :api_call_timeout + # Create a node from XML. def create - if request.put? - p = XML::Parser.new - p.string = request.raw_post - doc = p.parse - - doc.find('//osm/node').each do |pt| - lat = pt['lat'].to_f - lon = pt['lon'].to_f - node_id = pt['id'].to_i - - if lat > 90 or lat < -90 or lon > 180 or lon < -180 or node_id != 0 - render :nothing => true, :status => 400 # BAD REQUEST - return - end - - tags = [] + assert_method :put - pt.find('tag').each do |tag| - tags << [tag['k'],tag['v']] - end - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - tags = '' if tags.nil? + node = Node.from_xml(request.raw_post, true) - now = Time.now - - node = Node.new - node.latitude = lat - node.longitude = lon - node.visible = 1 - node.tags = tags - node.timestamp = now - node.user_id = @user.id + # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml + node.create_with_history @user + render :text => node.id.to_s, :content_type => "text/plain" + end - #FIXME add a node to the old nodes table too + # Dump the details on a node given in params[:id] + def read + node = Node.find(params[:id]) - if node.save - render :text => node.id - else - render :nothing => true, :status => 500 - end + response.last_modified = node.timestamp - return - end + if node.visible + render :text => node.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end - - render :nothing => true, :status => 400 # if we got here the doc didnt parse end - - def rest - unless Node.exists?(params[:id]) - render :nothing => true, :status => 400 - return + + # 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 + node.update_from(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" + end + # 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 + node.delete_with_history!(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" + end + # 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 - case request.method - when :get - doc = XML::Document.new - - doc.encoding = "UTF-8" - root = XML::Node.new 'osm' - root['version'] = '0.4' - root['generator'] = 'OpenStreetMap server' - doc.root = root - el1 = XML::Node.new 'node' - el1['id'] = node.id.to_s - el1['lat'] = node.latitude.to_s - el1['lon'] = node.longitude.to_s - split_tags(el1, node.tags) - el1['visible'] = node.visible.to_s - el1['timestamp'] = node.timestamp.xmlschema - root << el1 - - render :text => doc.to_s - - when :delete - # - # DELETE - # - - if node.visible - node.visible = 0 - node.save - render :nothing => true - else - render :nothing => true, :status => 410 - end - - when :put - # - # PUT - # - - p = XML::Parser.new - p.string = request.raw_post - doc = p.parse - - doc.find('//osm/node').each do |pt| - lat = pt['lat'].to_f - lon = pt['lon'].to_f - node_id = pt['id'].to_i - - if lat > 90 or lat < -90 or lon > 180 or lon < -180 or node_id != params[:id] - render :nothing => true, :status => 400 - return - end - - tags = [] - - pt.find('tag').each do |tag| - tags << [tag['k'],tag['v']] - end - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - tags = '' if tags.nil? - - now = Time.now - - node.latitude = lat - node.longitude = lon - node.visible = 1 - node.tags = tags - node.timestamp = now - node.user_id = @user.id - - #FIXME add a node to the old nodes table too + ids = params['nodes'].split(',').collect { |n| n.to_i } - if node.save - render :text => node.id - else - render :nothing => true, :status => 500 - end - end + if ids.length == 0 + raise OSM::APIBadUserInput.new("No nodes were given to search for") end - end + doc = OSM::API.new.get_xml_doc - private - def split_tags(el, tags) - tags.split(';').each do |tag| - parts = tag.split('=') - key = '' - val = '' - key = parts[0].strip unless parts[0].nil? - val = parts[1].strip unless parts[1].nil? - if key != '' && val != '' - el2 = Node.new('tag') - el2['k'] = key.to_s - el2['v'] = val.to_s - el << el2 - end + Node.find(ids).each do |node| + doc.root << node.to_xml_node end - end - + render :text => doc.to_s, :content_type => "text/xml" + end end