From d6ba46b120806ed5c393cb9768e1f94c4c20c40b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 8 Jun 2009 11:08:18 +0000 Subject: [PATCH] Simplify rejection of existing renumbered nodes. --- app/controllers/amf_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 03b354b6a..aee31295c 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -127,14 +127,13 @@ class AmfController < ApplicationController case message when 'putway'; orn=renumberednodes.dup r=putway(renumberednodes,*args) - r[4]=renumberednodes.dup - r[4].delete_if { |k,v| orn.has_key?(k) } + r[4]=renumberednodes.reject { |k,v| orn.has_key?(k) } if r[2] != r[3] then renumberedways[r[2]] = r[3] end results[index]=AMF.putdata(index,r) when 'putrelation'; results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args)) when 'deleteway'; results[index]=AMF.putdata(index,deleteway(*args)) when 'putpoi'; r=putpoi(*args) - if r[2] != r[3] then renumberednodes[r[2]] = r[3] end + if r[2] != r[3] then renumberednodes[r[2]] = r[3] end results[index]=AMF.putdata(index,r) when 'startchangeset'; results[index]=AMF.putdata(index,startchangeset(*args)) end -- 2.43.2