X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f857565a628aac8bf7a3c815ff72ffb4793bb15..97cb1fd7fa2916974538fde2a6ea311a3f793989:/app/models/relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 93e9379b6..b7cb0f15b 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -16,32 +16,38 @@ class Relation < ActiveRecord::Base
       p.string = xml
       doc = p.parse
 
-      relation = Relation.new
-
       doc.find('//osm/relation').each do |pt|
-        if !create and pt['id'] != '0'
-          relation.id = pt['id'].to_i
-        end
+	return Relation.from_xml_node(pt, create)
+      end
+    rescue
+      return nil
+    end
+  end
 
-        if create
-          relation.timestamp = Time.now
-          relation.visible = true
-        else
-          if pt['timestamp']
-            relation.timestamp = Time.parse(pt['timestamp'])
-          end
-        end
+  def self.from_xml_node(pt, create=false)
+    relation = Relation.new
 
-        pt.find('tag').each do |tag|
-          relation.add_tag_keyval(tag['k'], tag['v'])
-        end
+    if !create and pt['id'] != '0'
+      relation.id = pt['id'].to_i
+    end
 
-        pt.find('member').each do |member|
-          relation.add_member(member['type'], member['ref'], member['role'])
-        end
+    relation.version = pt['version']
+
+    if create
+      relation.timestamp = Time.now
+      relation.visible = true
+    else
+      if pt['timestamp']
+	relation.timestamp = Time.parse(pt['timestamp'])
       end
-    rescue
-      relation = nil
+    end
+
+    pt.find('tag').each do |tag|
+      relation.add_tag_keyval(tag['k'], tag['v'])
+    end
+
+    pt.find('member').each do |member|
+      relation.add_member(member['type'], member['ref'], member['role'])
     end
 
     return relation
@@ -58,6 +64,7 @@ class Relation < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
+    el1['version'] = self.version.to_s
 
     user_display_name_cache = {} if user_display_name_cache.nil?
     
@@ -108,8 +115,8 @@ class Relation < ActiveRecord::Base
   # relationships, i.e. deliver referenced objects like we do with ways... 
   # FIXME: rip out the fucking SQL
   def self.find_for_nodes_and_ways(node_ids, way_ids)
-    return [] if node_ids.empty? and node_ids.empty?
-    relations = Array.new
+    relations = []
+
     if node_ids.length > 0
       relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +
             "e.visible=1 and " +
@@ -120,6 +127,8 @@ class Relation < ActiveRecord::Base
             "e.visible=1 and " +
             "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})")
     end
+
+    relations # if you don't do this then it returns nil and not []
   end
 
 
@@ -165,13 +174,12 @@ class Relation < ActiveRecord::Base
   def save_with_history!
     Relation.transaction do
       t = Time.now
+      self.version += 1
       self.timestamp = t
       self.save!
 
       tags = self.tags
-
       RelationTag.delete_all(['id = ?', self.id])
-
       tags.each do |k,v|
         tag = RelationTag.new
         tag.k = k
@@ -181,9 +189,7 @@ class Relation < ActiveRecord::Base
       end
 
       members = self.members
-
       RelationMember.delete_all(['id = ?', self.id])
-
       members.each do |n|
         mem = RelationMember.new
         mem.id = self.id
@@ -199,6 +205,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")