X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3c24aa0a9b6778ee3d7dd159b5de7da06bd6abab..9752466c0342700ebef5a7741e9105f44957a82a:/app/controllers/amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index ef2e1c78a..febc4db68 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -126,8 +126,9 @@ class AmfController < ApplicationController
   # are IDs only. 
 
   def whichways(xmin, ymin, xmax, ymax) #:doc:
-	xmin -= 0.01; ymin -= 0.01
-	xmax += 0.01; ymax += 0.01
+	enlarge = [(xmax-xmin)/8,0.01].min
+	xmin -= enlarge; ymin -= enlarge
+	xmax += enlarge; ymax += enlarge
 
 	if POTLATCH_USE_SQL then
 	  way_ids = sql_find_way_ids_in_area(xmin, ymin, xmax, ymax)
@@ -397,6 +398,14 @@ class AmfController < ApplicationController
 	  nodes.push(id)
 	end
 
+	# -- Save revised way
+
+	way.tags = attributes
+	way.nds = nodes
+	way.user_id = uid
+	way.visible = true
+	way.save_with_history!
+
 	# -- Delete any unique nodes
 	
 	uniques.each do |n|
@@ -408,14 +417,6 @@ class AmfController < ApplicationController
 	  node.save_with_history!
 	end
 
-	# -- Save revised way
-
-	way.tags = attributes
-	way.nds = nodes
-	way.user_id = uid
-	way.visible = true
-	way.save_with_history!
-
 	[0, originalway, way.id, renumberednodes]
   end
 
@@ -487,6 +488,7 @@ class AmfController < ApplicationController
 	way.unshared_node_ids.each do |n|
 	  deleteitemrelations(n, 'node')
 	end
+	deleteitemrelations(way_id, 'way')
 
 	way.delete_with_relations_and_nodes_and_history(user)