X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c8f9387420233bd7e845cb205c3b68ede1f90024..cf24a5a3ee68905c5f55cf6f17c5d2ea983cb34f:/app/controllers/node_controller.rb diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index c27081650..f1023e78f 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -1,325 +1,122 @@ +# The NodeController is the RESTful interface to Node objects + class NodeController < ApplicationController require 'xml/libxml' - - before_filter :authorize - - def create - if request.put? - doc = XML::Document.new(request.raw_post) #THIS IS BROKEN, libxml docus dont talk about creating a doc from a string - doc.find('//osm/node').each do |pt| - render :text => 'arghsd.rkugt;dsrt' - return - lat = pt.attributes['lat'].to_f - lon = pt.attributes['lon'].to_f - node_id = pt.attributes['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 = [] + 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 - pt.elements.each('tag') do |tag| - tags << [tag.attributes['k'],tag.attributes['v']] - end - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - tags = '' if tags.nil? - - 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 - - #FIXME add a node to the old nodes table too + # Create a node from XML. + def create + begin + if request.put? + node = Node.from_xml(request.raw_post, true) - if node.save - render :text => node.id + if node + node.create_with_history @user + render :text => node.id.to_s, :content_type => "text/plain" else - render :nothing => true, :status => 500 + render :nothing => true, :status => :bad_request end + else + render :nothing => true, :status => :method_not_allowed end + rescue OSM::APIError => ex + render ex.render_opts end - - render :text => 'WRONG! ' - return - end - def rest - unless Node.exists?(params[:id]) - render :nothing => true, :status => 400 - return + # Dump the details on a node given in params[:id] + def read + begin + node = Node.find(params[:id]) + if node.visible? + response.headers['Last-Modified'] = node.timestamp.rfc822 + render :text => node.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone + end + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found end - - node = Node.find(params[:id]) - - - case request.method - when :get - doc = XML::Document.new - - # this needs a new libxml: - # 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 - - # - # DELETE - # - when :delete - + end + + # Dump a specific version of the node based on the given params[:id] and params[:version] + def version + begin + node = Node.find(:first, :conditions => { :id => params[:id], :version => params[:version] } ) if node.visible - node.visible = 0 - node.save + response.headers['Last-Modified'] = node.timestamp.rfc822 + render :text => node.to_xml.to_s, :content_type => "text/xml" else - render :nothing => true, :status => 410 - end - - # - # PUT - # - when :put - - doc = XML::Document.new(request.raw_post) - doc.elements.each('osm/node') do |pt| - lat = pt.attributes['lat'].to_f - lon = pt.attributes['lon'].to_f - node_id = pt.attributes['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 # BAD REQUEST - return - end - - tags = [] - - pt.elements.each('tag') do |tag| - tags << [tag.attributes['k'],tag.attributes['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 - - if node.save - render :text => node.id - else - render :nothing => true, :status => 500 - end + render :nothing => true, :status => :gone end + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found end end + # Update a node from given XML + def update + begin + node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) - def dummy - if request.post? - userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw) - doc = Document.new $stdin.read - - doc.elements.each('osm/node') do |pt| - lat = pt.attributes['lat'].to_f - lon = pt.attributes['lon'].to_f - xmlnodeid = pt.attributes['id'].to_i - - tags = [] - pt.elements.each('tag') do |tag| - tags << [tag.attributes['k'],tag.attributes['v']] - end - - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - - tags = '' unless tags - if xmlnodeid == nodeid && userid != 0 - if nodeid == 0 - new_node_id = dao.create_node(lat, lon, userid, tags) - if new_node_id - puts new_node_id - exit - else - exit HTTP_INTERNAL_SERVER_ERROR - end - else - node = dao.getnode(nodeid) - if node - #FIXME: need to check the node hasn't moved too much - if dao.update_node?(nodeid, userid, lat, lon, tags) - exit - else - exit HTTP_INTERNAL_SERVER_ERROR - end - else - exit HTTP_NOT_FOUND - end - end - - else - exit BAD_REQUEST - end + if new_node and new_node.id == node.id + node.update_from(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" + else + render :nothing => true, :status => :bad_request end - exit HTTP_INTERNAL_SERVER_ERROR - - + rescue OSM::APIError => ex + render ex.render_opts + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found end end - - def dummydummy - - # - # POST ??? - # - - if request.post? - nodeid = r.args.match(/nodeid=([0-9]+)/).captures.first.to_i - userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw) - doc = Document.new $stdin.read - - doc.elements.each('osm/node') do |pt| - lat = pt.attributes['lat'].to_f - lon = pt.attributes['lon'].to_f - xmlnodeid = pt.attributes['id'].to_i - - tags = [] - pt.elements.each('tag') do |tag| - tags << [tag.attributes['k'],tag.attributes['v']] - end - - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - - tags = '' unless tags - if xmlnodeid == nodeid && userid != 0 - if nodeid == 0 - new_node_id = dao.create_node(lat, lon, userid, tags) - if new_node_id - puts new_node_id - exit - else - exit HTTP_INTERNAL_SERVER_ERROR - end - else - node = dao.getnode(nodeid) - if node - #FIXME: need to check the node hasn't moved too much - if dao.update_node?(nodeid, userid, lat, lon, tags) - exit - else - exit HTTP_INTERNAL_SERVER_ERROR - end - else - exit HTTP_NOT_FOUND - end - end - - else - exit BAD_REQUEST - end - end - exit HTTP_INTERNAL_SERVER_ERROR - - end - - # - # GET ??? - # - - if request.get? - node = node.find(params[:id]) - doc = document.new - doc.encoding = "utf-8" - root = node.new 'osm' - root['version'] = '0.4' - root['generator'] = 'openstreetmap server' - doc.root = root - el1 = 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 - root << el1 - - render :text => doc.to_s, :template => false - end - - # - # DELETE???? - # - - if request.delete? - userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw) - #cgi doesnt work with DELETE so extract manually: - nodeid = r.args.match(/nodeid=([0-9]+)/).captures.first.to_i - - if userid > 0 && nodeid != 0 - node = dao.getnode(nodeid) - if node - if node.visible - if dao.delete_node?(nodeid, userid) - exit - else - exit HTTP_INTERNAL_SERVER_ERROR - end - else - exit HTTP_GONE - end - else - exit HTTP_NOT_FOUND - end + # Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way. + # FIXME remove all the fricking SQL + def delete + begin + node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) + # FIXME we no longer care about the user, (or maybe we want to check + # that the user of the changeset is the same user as is making this + # little change?) we really care about the + # changeset which must be open, and that the version that we have been + # given is the one that is currently stored in the database + + if new_node and new_node.id == node.id + node.delete_with_history(new_node, @user) + render :nothing => true else - exit BAD_REQUEST - + render :nothing => true, :status => :bad_request end - - + rescue ActiveRecord::RecordNotFound + render :nothing => true, :status => :not_found + rescue OSM::APIError => ex + render ex.render_opts end + end + # WTF does this do? + def nodes + ids = params['nodes'].split(',').collect { |n| n.to_i } - end + if ids.length > 0 + 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 + + render :text => doc.to_s, :content_type => "text/xml" + else + render :nothing => true, :status => :bad_request end end - end