X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7901811752faea37a9fb0f5f05405a5cfbd63b7e..cb330ffd7a1861830c813d35507ef4b8b288d8f0:/app/controllers/node_controller.rb

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 3f3f882ae..d3f1ce7f6 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,7 +1,10 @@
 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]
   after_filter :compress_output
 
   def create
@@ -11,12 +14,9 @@ class NodeController < ApplicationController
       if node
         node.user_id = @user.id
         node.visible = true
+        node.save_with_history!
 
-        if node.save_with_history
-          render :text => node.id.to_s, :content_type => "text/plain"
-        else
-          render :nothing => true, :status => :internal_server_error
-        end
+        render :text => node.id.to_s, :content_type => "text/plain"
       else
         render :nothing => true, :status => :bad_request
       end
@@ -32,43 +32,32 @@ class NodeController < ApplicationController
       if node.visible
         render :text => node.to_xml.to_s, :content_type => "text/xml"
        else
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
   def update
     begin
       node = Node.find(params[:id])
+      new_node = Node.from_xml(request.raw_post)
 
-      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
+        node.visible = true
+        node.save_with_history!
 
-        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
+        render :nothing => true
       else
-        render :nothing => true, :status => :gone
+        render :nothing => true, :status => :bad_request
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 
@@ -77,21 +66,22 @@ class NodeController < ApplicationController
       node = Node.find(params[:id])
 
       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
+        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 ])
+          render :text => "", :status => :precondition_failed
+        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]])
+          render :text => "", :status => :precondition_failed
         else
           node.user_id = @user.id
           node.visible = 0
-          node.save_with_history
+          node.save_with_history!
+
           render :nothing => true
         end
       else
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end