X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f3e23f6eb2bd571a39486773f0f10d65a2398a1..0c0b082cd2ae086eba5c65e64db8d3c5b7694181:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index dd0438218..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) - renumberednodes=r[4].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 @@ -588,11 +587,12 @@ class AmfController < ApplicationController # # Returns: # 0. '0' (code for success), - # 1. original way id (unchanged), - # 2. new way id, - # 3. hash of renumbered nodes (old id=>new id), - # 4. way version, - # 5. hash of node versions (node=>version) + # 1. message, + # 2. original way id (unchanged), + # 3. new way id, + # 4. hash of renumbered nodes (old id=>new id), + # 5. way version, + # 6. hash of node versions (node=>version) def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc: amf_handle_error("'putway' #{originalway}") do