api06: simplify exception handling and add exception handling to the diff

[rails.git] / app / models / relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 2c155e9e1f73772b397285cc19562c7f82f01411..984732c71c98f6b0bc9c1463029135fb2345f64a 100644 (file)
--- 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)
@@ -33,6 +31,8 @@ class Relation < ActiveRecord::Base
       relation.id = pt['id'].to_i
     end
 
+    relation.version = pt['version']
+
     if create
       relation.timestamp = Time.now
       relation.visible = true
@@ -205,6 +205,36 @@ 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
+    elsif new_relation.version != version
+      raise OSM::APIVersionMismatchError.new(new_relation.version, version)
+    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")