X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3d6e1c67fb2291c6933f37bac3b9a3f518e8487a..013ef53c97a1d2c8319f1ac624e8325a06828366:/app/models/relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 2c155e9e1..58add6dd0 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -17,13 +17,11 @@ class Relation < ActiveRecord::Base
       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|
-	relation = Relation.from_xml_node pt, create
+	return Relation.from_xml_node(pt, create)
       end
     rescue
-      relation = nil
+      return nil
     end
-
-    return relation
   end
 
   def self.from_xml_node(pt, create=false)
@@ -205,6 +203,34 @@ class Relation < ActiveRecord::Base
     end
   end
 
+  def delete_with_history(user)
+    if self.visible
+      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
+	self.tags = []
+	self.members = []
+	self.visible = false
+	save_with_history!
+      end
+    else
+      raise OSM::APIAlreadyDeletedError.new
+    end
+  end
+
+  def update_from(new_relation, user)
+    if !new_relation.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    else
+      self.user_id = user.id
+      self.tags = new_relation.tags
+      self.members = new_relation.members
+      self.visible = true
+      save_with_history!
+    end
+  end
+
   def preconditions_ok?
     self.members.each do |m|
       if (m[0] == "node")