class NodeController < ApplicationController
require 'xml/libxml'
- 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]
+ 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?
- node = Node.from_xml(request.raw_post, true)
+ assert_method :put
- if node
- node.version = 0
- node.user_id = @user.id
- node.visible = true
- node.save_with_history!
+ node = Node.from_xml(request.raw_post, true)
- render :text => node.id.to_s, :content_type => "text/plain"
- else
- render :nothing => true, :status => :bad_request
- end
- else
- render :nothing => true, :status => :method_not_allowed
- end
+ # 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
# 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
+ 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
end
-
+
# Update a node from given XML
def update
- begin
- node = Node.find(params[:id])
- new_node = Node.from_xml(request.raw_post)
-
- if new_node and new_node.id == node.id
- update_internal node, new_node
- render :nothing => true
- else
- render :nothing => true, :status => :bad_request
- end
- rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ 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
- def update_internal(node, new_node)
- node = Node.find(new_node.id) if node.nil?
-
- node.user_id = @user.id
- node.latitude = new_node.latitude
- node.longitude = new_node.longitude
- node.tags = new_node.tags
- node.visible = true
- node.save_with_history!
-
- return true
- end
-
- # Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way.
- # FIXME remove all the fricking SQL
+ # 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
- begin
- node = Node.find(params[:id])
-
- res = delete_internal(node)
- unless res
- render :text => "", :status => :precondition_failed
- else
- render :text => "", :status => res
- end
- rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
+ 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
- def delete_internal(node)
- if node.visible
- if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ])
- return false
- elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]])
- return false
- else
- node.user_id = @user.id
- node.visible = 0
- node.save_with_history!
-
- return :ok
- end
- else
- return :gone
- end
- end
-
- # WTF does this do?
+ # Dump the details on many nodes whose ids are given in the "nodes" parameter.
def nodes
ids = params['nodes'].split(',').collect { |n| n.to_i }
- if ids.length > 0
- doc = OSM::API.new.get_xml_doc
-
- Node.find(ids).each do |node|
- doc.root << node.to_xml_node
- end
+ if ids.length == 0
+ raise OSM::APIBadUserInput.new("No nodes were given to search for")
+ end
+ doc = OSM::API.new.get_xml_doc
- render :text => doc.to_s, :content_type => "text/xml"
- else
- render :nothing => true, :status => :bad_request
+ Node.find(ids).each do |node|
+ doc.root << node.to_xml_node
end
+
+ render :text => doc.to_s, :content_type => "text/xml"
end
end
projects / rails.git / blobdiff