X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/127bb4523e111bca6b7bb1d2d0125d069a1f6b78..417ded9da545299026b96f5f81f79897f8e3769b:/app/models/relation.rb?ds=inline

diff --git a/app/models/relation.rb b/app/models/relation.rb
index dd2d1c7d5..db4dd52a6 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -182,6 +182,11 @@ class Relation < ActiveRecord::Base
 
   def add_tag_keyval(k, v)
     @tags = Hash.new unless @tags
+
+    # duplicate tags are now forbidden, so we can't allow values
+    # in the hash to be overwritten.
+    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+
     @tags[k] = v
   end
 
@@ -219,14 +224,12 @@ class Relation < ActiveRecord::Base
     end
   end
 
-  def delete_with_history(new_relation, user)
+  def delete_with_history!(new_relation, user)
     if self.visible
       check_consistency(self, new_relation, user)
-      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", self.id ])
+      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=? ", self.id ])
         raise OSM::APIPreconditionFailedError.new
       else
-        #self.user_id = user.id
-        # FIXME we need to deal with changeset here, which is probably already dealt with
         self.changeset_id = new_relation.changeset_id
         self.tags = []
         self.members = []
@@ -243,14 +246,22 @@ class Relation < ActiveRecord::Base
     if !new_relation.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
     end
-    # FIXME need to deal with changeset etc
-    #self.user_id = user.id
     self.changeset_id = new_relation.changeset_id
     self.tags = new_relation.tags
     self.members = new_relation.members
     self.visible = true
     save_with_history!
   end
+  
+  def create_with_history(user)
+    check_create_consistency(self, user)
+    if !self.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    end
+    self.version = 0
+    self.visible = true
+    save_with_history!
+  end
 
   def preconditions_ok?
     # These are hastables that store an id in the index of all