Added a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to...

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 076c03eec72dad790f09a3857038a071ca99d96a..b7e7248d9bab19b246df2d97f5151d2ed90a7415 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,12 +1,14 @@
 class OldRelation < ActiveRecord::Base
 class OldRelation < ActiveRecord::Base

+  include ConsistencyValidations
+  

   set_table_name 'relations'
 
   set_table_name 'relations'
 

-  belongs_to :user
+  belongs_to :changeset

 
   def self.from_relation(relation)
     old_relation = OldRelation.new
     old_relation.visible = relation.visible
 
   def self.from_relation(relation)
     old_relation = OldRelation.new
     old_relation.visible = relation.visible

-    old_relation.user_id = relation.user_id
+    old_relation.changeset_id = relation.changeset_id

     old_relation.timestamp = relation.timestamp
     old_relation.id = relation.id
     old_relation.version = relation.version
     old_relation.timestamp = relation.timestamp
     old_relation.id = relation.id
     old_relation.version = relation.version


@@ -86,12 +88,20 @@ class OldRelation < ActiveRecord::Base
     OldRelationTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
   end
 
     OldRelationTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
   end
 

+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
+

   def to_xml_node
     el1 = XML::Node.new 'relation'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
   def to_xml_node
     el1 = XML::Node.new 'relation'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    el1['user'] = self.user.display_name if self.user.data_public?
+    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
+    el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s

     
     self.old_members.each do |member|
       e = XML::Node.new 'member'
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'


@@ -108,5 +118,20 @@ class OldRelation < ActiveRecord::Base
       el1 << e
     end
     return el1
       el1 << e
     end
     return el1

-  end 
+  end
+
+  # Temporary method to match interface to nodes
+  def tags_as_hash
+    return self.tags
+  end
+
+  # Temporary method to match interface to relations
+  def relation_members
+    return self.old_members
+  end
+
+  # Pretend we're not in any relations
+  def containing_relation_members
+    return []
+  end

 end
 end