From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Jun 2009 11:08:18 +0000 (+0000)
Subject: Simplify rejection of existing renumbered nodes.
X-Git-Tag: live~7084
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d6ba46b120806ed5c393cb9768e1f94c4c20c40b

Simplify rejection of existing renumbered nodes.
---

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