X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c11d961f624cb610c4b8184d24e522b2c093d1ea..57aeccccc8d23adceac028616b7877ae6c4e0c87:/app/controllers/node_controller.rb?ds=sidebyside

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index f2a3ce329..fba41e330 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,107 +1,114 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
-  before_filter :authorize
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_availability, :only => [:create, :update, :delete]
   after_filter :compress_output
 
   def create
-    response.headers["Content-Type"] = 'text/xml'
     if request.put?
       node = Node.from_xml(request.raw_post, true)
 
       if node
         node.user_id = @user.id
-        node.visible = 1
+        node.visible = true
+
         if node.save_with_history
-          render :text => node.id.to_s
+          render :text => node.id.to_s, :content_type => "text/plain"
         else
-          render :nothing => true, :status => 500
+          render :nothing => true, :status => :internal_server_error
         end
-        return
-
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :bad_request
       end
+    else
+      render :nothing => true, :status => :method_not_allowed
     end
-
-    render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def rest
-    response.headers["Content-Type"] = 'text/xml'
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
-    end
-
-    node = Node.find(params[:id])
-
-    case request.method
-
-    when :get
-      unless node
-        render :nothing => true, :status => 500
-        return
-      end
+  def read
+    begin
+      node = Node.find(params[:id])
 
-      unless node.visible
-        render :nothing => true, :status => 410
-        return
+      if node.visible
+        render :text => node.to_xml.to_s, :content_type => "text/xml"
+       else
+        render :nothing => true, :status => :gone
       end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    end
+  end
 
-      render :text => node.to_xml.to_s
-      return
+  def update
+    begin
+      node = Node.find(params[:id])
 
-    when :delete
       if node.visible
-        if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
-          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
+        new_node = Node.from_xml(request.raw_post)
+
+        if new_node and new_node.id == node.id
+          node.user_id = @user.id
+          node.latitude = new_node.latitude 
+          node.longitude = new_node.longitude
+          node.tags = new_node.tags
+
+          if node.save_with_history
+            render :nothing => true
+          else
+            render :nothing => true, :status => :internal_server_error
+          end
         else
-          node.visible = 0
-          node.save_with_history
-          render :nothing => true
+          render :nothing => true, :status => :bad_request
         end
       else
-        render :nothing => true, :status => 410
+        render :nothing => true, :status => :gone
       end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    end
+  end
 
-    when :put
-      new_node = Node.from_xml(request.raw_post)
-
-      if new_node
-        node.timestamp = Time.now
-        node.user_id = @user.id
-
-        node.latitude = new_node.latitude 
-        node.longitude = new_node.longitude
-        node.tags = new_node.tags
+  def delete
+    begin
+      node = Node.find(params[:id])
 
-        if node.id == new_node.id and node.save_with_history
-          render :nothing => true
+      if node.visible
+        if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
+          render :nothing => true, :status => :precondition_failed
         else
-          render :nothing => true, :status => 500
+          node.user_id = @user.id
+          node.visible = 0
+          node.save_with_history
+          render :nothing => true
         end
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
+        render :nothing => true, :status => :gone
       end
-      return
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
     end
-
   end
 
   def nodes
-    response.headers["Content-Type"] = 'text/xml'
-    ids = params['nodes'].split(',').collect {|n| n.to_i }
+    ids = params['nodes'].split(',').collect { |n| n.to_i }
+
     if ids.length > 0
-      nodelist = Node.find(ids)
-      doc = get_xml_doc
-      nodelist.each do |node|
+      doc = OSM::API.new.get_xml_doc
+
+      Node.find(ids).each do |node|
         doc.root << node.to_xml_node
       end 
-      render :text => doc.to_s
+
+      render :text => doc.to_s, :content_type => "text/xml"
     else
-      render :nothing => true, :status => 400
+      render :nothing => true, :status => :bad_request
     end
   end
 end