X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70..3dacce23daca336c7b93b059a2c4d26a9828d57d:/lib/diff_reader.rb?ds=inline diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb index 217e9309d..0b1593158 100644 --- a/lib/diff_reader.rb +++ b/lib/diff_reader.rb @@ -72,8 +72,8 @@ class DiffReader def with_model with_element do |model_name| model = MODELS[model_name] - raise "Unexpected element type #{model_name}, " + - "expected node, way, relation." if model.nil? + raise OSM::APIBadUserInput.new("Unexpected element type #{model_name}, " + + "expected node, way or relation.") if model.nil? yield model, @reader.expand @reader.next end @@ -130,7 +130,7 @@ class DiffReader # some elements may have placeholders for other elements in the # diff, so we must fix these before saving the element. - new.fix_placeholders!(ids) + new.fix_placeholders!(ids, placeholder_id) # create element given user new.create_with_history(@changeset.user) @@ -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 - 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) + # translate any placeholder IDs to their true IDs. new.fix_placeholders!(ids) + new.id = id + 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!