X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19f05fbf8df3d539f40b7e6fd1f032679a8d6bb9..9d6ae5baae9f86acb8e2d9fcb006d8b81167281b:/app/controllers/node_controller.rb

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 5cdbca827..6815470b8 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -5,15 +5,9 @@ class NodeController < ApplicationController
   after_filter :compress_output
 
   def create
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     if request.put?
-      node = nil
-      begin
-        node = Node.from_xml(request.raw_post, true)
-      rescue
-        render :text => "XML didn't parse", :status => 400 # if we got here the doc didnt parse
-        return
-      end
+      node = Node.from_xml(request.raw_post, true)
 
       if node
         node.user_id = @user.id
@@ -35,7 +29,7 @@ class NodeController < ApplicationController
   end
 
   def rest
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     unless Node.exists?(params[:id])
       render :nothing => true, :status => 404
       return
@@ -61,9 +55,14 @@ class NodeController < ApplicationController
 
     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 => HTTP_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
       end
@@ -71,17 +70,21 @@ class NodeController < ApplicationController
     when :put
       new_node = Node.from_xml(request.raw_post)
 
-      node.timestamp = Time.now
-      node.user_id = @user.id
+      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
+        node.latitude = new_node.latitude 
+        node.longitude = new_node.longitude
+        node.tags = new_node.tags
 
-      if node.id == new_node.id and node.save_with_history
-        render :nothing => true, :status => 200
+        if node.id == new_node.id and node.save_with_history
+          render :nothing => true
+        else
+          render :nothing => true, :status => 500
+        end
       else
-        render :nothing => true, :status => 500
+        render :nothing => true, :status => 400 # if we got here the doc didnt parse
       end
       return
     end
@@ -89,7 +92,7 @@ class NodeController < ApplicationController
   end
 
   def nodes
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     ids = params['nodes'].split(',').collect {|n| n.to_i }
     if ids.length > 0
       nodelist = Node.find(ids)