remove indexes before renaming tables (some dbs have database-level index namespaces...

[rails.git] / lib / diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index eca6d438c642722912227235370b528d47eb0343..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
     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...)
 
     # loop at the top level, within the <osmChange> element (although we
     # don't actually check this...)


@@ -99,9 +100,8 @@ class DiffReader
           # diff, so we must fix these before saving the element.
           new.fix_placeholders!(ids)
 
           # diff, so we must fix these before saving the element.
           new.fix_placeholders!(ids)
 

-          # set the initial version to zero and save (which increments it)
-          new.version = 0
-          new.save_with_history!
+          # create element given user
+          new.create_with_history(@changeset.user)

           
           # save placeholder => allocated ID map
           ids[model.to_s.downcase.to_sym][placeholder_id] = new.id
           
           # save placeholder => allocated ID map
           ids[model.to_s.downcase.to_sym][placeholder_id] = new.id


@@ -130,8 +130,10 @@ class DiffReader
 
           xml_result = XML::Node.new model.to_s.downcase
           xml_result["old_id"] = old.id.to_s
 
           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
 
           result.root << xml_result
         end
 


@@ -156,7 +158,7 @@ class DiffReader
 
       else
         # no other actions to choose from, so it must be the users fault!
 
       else
         # no other actions to choose from, so it must be the users fault!

-        raise "Unknown action #{action_name}, choices are create, modify, delete."
+        raise OSM::APIChangesetActionInvalid.new(action_name)

       end
     end
 
       end
     end