From: Steve Coast <steve@asklater.com>
Date: Sun, 22 Apr 2007 10:10:43 +0000 (+0000)
Subject: close #411 segments should not be allowed where node_a == node_b
X-Git-Tag: live~8507
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/15d39586276ebe0db617ec1b220063f7123bac60?ds=sidebyside

close #411 segments should not be allowed where node_a == node_b
---

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 28c7580df..c6d4ad611 100644
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -14,9 +14,14 @@ 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
         end
 
         if segment.save_with_history
@@ -65,13 +70,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
diff --git a/config/environment.rb b/config/environment.rb
index b55fbe441..ac50d21f7 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -61,3 +61,18 @@ ActionMailer::Base.server_settings = {
   :port  => 25, 
   :domain  => 'localhost',
 } 
+
+
+# HTTP CODES
+
+# 200's
+
+HTTP_OK = 200
+
+# 400's
+
+HTTP_PRECONDITION_FAILED = 412
+HTTP_EXPECTATION_FAILED = 417
+
+
+