Added a consistency check that both ids are valid and match. Fixed diff upload code...

diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb
index 4f3881542e39afcadf490c089669a2369f692b57..d23ef8400ee4ab1df6fc2c19f3db0a724795eb52 100644 (file)
--- a/lib/consistency_validations.rb
+++ b/lib/consistency_validations.rb
@@ -6,7 +6,9 @@ module ConsistencyValidations
   # needed for creates, but are currently not run :-( 
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)
   # needed for creates, but are currently not run :-( 
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)

-    if new.version != old.version
+    if new.id != old.id or new.id.nil? or old.id.nil?
+      raise OSM::APIPreconditionFailedError.new("New and old IDs don't match on #{new.class.to_s}. #{new.id} != #{old.id}.")
+    elsif new.version != old.version

       raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
     elsif new.changeset.nil?
       raise OSM::APIChangesetMissingError.new
       raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
     elsif new.changeset.nil?
       raise OSM::APIChangesetMissingError.new

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index be48f8b4e9caa6548a8a220859e996f56be69c54..0b159315830e25a6eb6c56c98c2295fbcac3ee36 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -156,19 +156,21 @@ class DiffReader
 
           # if the ID is a placeholder then map it to the real ID
           model_sym = model.to_s.downcase.to_sym
 
           # if the ID is a placeholder then map it to the real ID
           model_sym = model.to_s.downcase.to_sym

-          is_placeholder = ids[model_sym].include? new.id
-          id = is_placeholder ? ids[model_sym][new.id] : new.id
+          client_id = new.id
+          is_placeholder = ids[model_sym].include? client_id
+          id = is_placeholder ? ids[model_sym][client_id] : client_id

 
           # and the old one from the database
           old = model.find(id)
 
 
           # and the old one from the database
           old = model.find(id)
 

+          # translate any placeholder IDs to their true IDs.

           new.fix_placeholders!(ids)
           new.fix_placeholders!(ids)

+          new.id = id
+

           old.update_from(new, @changeset.user)
 
           xml_result = XML::Node.new model.to_s.downcase
           old.update_from(new, @changeset.user)
 
           xml_result = XML::Node.new model.to_s.downcase

-          # oh, the irony... the "new" element actually contains the "old" ID
-          # a better name would have been client/server, but anyway...
-          xml_result["old_id"] = new.id.to_s
+          xml_result["old_id"] = client_id.to_s

           xml_result["new_id"] = 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_id"] = id.to_s 
           # version is updated in "old" through the update, so we must not
           # return new.version here but old.version!