Making amf controller act more like the xml apis

[rails.git] / lib / diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index d793f63e7bfda199d1ecc73b8d7dd6e32c8aa69d..6a053e4adc19dc8a010d6744da1a125b47314e25 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -79,6 +79,7 @@ class DiffReader
     ids = { :node => node_ids, :way => way_ids, :relation => rel_ids}
 
     result = OSM::API.new.get_xml_doc
+    result.root.name = "diffResult"
 
     # loop at the top level, within the <osmChange> element (although we
     # don't actually check this...)
@@ -129,8 +130,10 @@ class DiffReader
 
           xml_result = XML::Node.new model.to_s.downcase
           xml_result["old_id"] = old.id.to_s
-          xml_result["new_id"] = new.id.to_s
-          xml_result["new_version"] = new.version.to_s
+          xml_result["new_id"] = new.id.to_s 
+          # version is updated in "old" through the update, so we must not
+          # return new.version here but old.version!
+          xml_result["new_version"] = old.version.to_s
           result.root << xml_result
         end