X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c91b86a1d1271c2bc801ee9dfc3a30fb2758aa9b..a0e8c35c1b3bfba11a755d9f8e282fc0773d953f:/app/controllers/segment_controller.rb?ds=sidebyside

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 28c7580df..a75ff911d 100644
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -14,9 +14,15 @@ class SegmentController < ApplicationController
 
         segment.from_node = Node.find(segment.node_a.to_i)
         segment.to_node = Node.find(segment.node_b.to_i)
+          
+        if segment.from_node == segment.to_node
+          render :nothing => true, :status => HTTP_EXPECTATION_FAILED
+          return
+        end
         
         unless segment.preconditions_ok? # are the nodes visible?
-          render :nothing => true, :status => 412
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
+          return
         end
 
         if segment.save_with_history
@@ -65,13 +71,19 @@ class SegmentController < ApplicationController
       segment.timestamp = Time.now
       segment.user_id = @user.id
 
+      if new_segment.node_a == new_segment.node_b
+        render :nothing => true, :status => HTTP_EXPECTATION_FAILED
+        return
+      end
+
       segment.node_a = new_segment.node_a
       segment.node_b = new_segment.node_b
+      
       segment.tags = new_segment.tags
       segment.visible = new_segment.visible
 
       if segment.id == new_segment.id and segment.save_with_history
-        render :nothing => true, :status => 200
+        render :nothing => true, :status => HTTP_OK
       else
         render :nothing => true, :status => 500
       end