From: Tom Hughes <tom@compton.nu>
Date: Sun, 22 Jul 2007 11:33:01 +0000 (+0000)
Subject: Don't include deleted segments when converting unwayed segments to ways.
X-Git-Tag: live~8269
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/db0e3b8cda1e03037e41463e61e4d693701673a8

Don't include deleted segments when converting unwayed segments to ways.
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 96ba9d7c0..cad7a1e0f 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -518,9 +518,10 @@ def makeway(args)
 		 WHERE (cn1.longitude BETWEEN #{xs1} AND #{xs2}) 
 		   AND (cn1.latitude  BETWEEN #{ys1} AND #{ys2}) 
 		   AND segment_id IS NULL 
+                   AND cs.visible=1
 		   AND cn1.id=node_a AND cn1.visible=1 
 		   AND cn2.id=node_b AND cn2.visible=1 
-      ORDER BY SQRT(POW(cn1.longitude-#{xc},2)+
+	      ORDER BY SQRT(POW(cn1.longitude-#{xc},2)+
       				POW(cn1.latitude -#{yc},2)) 
       	 LIMIT 1
 	EOF
@@ -563,6 +564,7 @@ def findconnect(id,nodesused,lookfor,baselong,basey,masterscale)
 		       current_segments AS cs 
 		       LEFT OUTER JOIN current_way_segments ON segment_id=cs.id 
 		 WHERE segment_id IS NULL 
+                   AND cs.visible=1
 		   AND cn1.id=node_a AND cn1.visible=1 
 		   AND cn2.id=node_b AND cn2.visible=1 
 		   AND node_a=#{id}
@@ -574,6 +576,7 @@ def findconnect(id,nodesused,lookfor,baselong,basey,masterscale)
 		       current_segments AS cs 
 		       LEFT OUTER JOIN current_way_segments ON segment_id=cs.id 
 		 WHERE segment_id IS NULL 
+                   AND cs.visible=1
 		   AND cn1.id=node_a AND cn1.visible=1 
 		   AND cn2.id=node_b AND cn2.visible=1 
 		   AND node_b=#{id}