X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8a2db368f194686bd6a0bcfe1b7e13c58c0588fa..8afc6abb7e6b2602612ea2ad62717dd10dd12270:/app/controllers/node_controller.rb?ds=sidebyside

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index b104688d3..3f3f882ae 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,7 +1,8 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
-  before_filter :authorize
+  before_filter :authorize, :only => [:create, :update, :delete]
+  after_filter :compress_output
 
   def create
     if request.put?
@@ -9,63 +10,104 @@ class NodeController < ApplicationController
 
       if node
         node.user_id = @user.id
-        if node.save_with_history
+        node.visible = true
 
-          render :text => node.id
+        if node.save_with_history
+          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
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
-      return
+  def read
+    begin
+      node = Node.find(params[:id])
+
+      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
 
-    node = Node.find(params[:id])
+  def update
+    begin
+      node = Node.find(params[:id])
 
-    case request.method
+      if node.visible
+        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
+          render :nothing => true, :status => :bad_request
+        end
+      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
 
-    when :get
-      render :text => node.to_xml.to_s
-      return
+  def delete
+    begin
+      node = Node.find(params[:id])
 
-    when :delete
       if node.visible
-        node.visible = 0
-        node.save_with_history
-        render :nothing => true
+        if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
+          render :nothing => true, :status => :precondition_failed
+        else
+          node.user_id = @user.id
+          node.visible = 0
+          node.save_with_history
+          render :nothing => true
+        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)
+  def nodes
+    ids = params['nodes'].split(',').collect { |n| n.to_i }
 
-      node.timestamp = Time.now
-      node.user_id = @user.id
+    if ids.length > 0
+      doc = OSM::API.new.get_xml_doc
 
-      node.latitude = new_node.latitude 
-      node.longitude = new_node.longitude
-      node.tags = new_node.tags
+      Node.find(ids).each do |node|
+        doc.root << node.to_xml_node
+      end 
 
-      if node.id == new_node.id and node.save_with_history
-        render :nothing => true, :status => 200
-      else
-        render :nothing => true, :status => 500
-      end
-      return
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
     end
-
   end
 end