Merge branch 'rails42'

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 891b89731ec2062071b06f5605e7442ec971b3f2..5ea3a778b38d58e5eefc62da019f7e628d5bd4b0 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,23 +1,29 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
 class OldNode < ActiveRecord::Base
   include GeoRecord

+  include ConsistencyValidations
+  include ObjectMetadata

 
 

-  set_table_name 'nodes'
-  
-  validates_presence_of :user_id, :timestamp
+  self.table_name = "nodes"
+  self.primary_keys = "node_id", "version"
+
+  # note this needs to be included after the table name changes, or
+  # the queries generated by Redactable will use the wrong table name.
+  include Redactable
+
+  validates_presence_of :changeset_id, :timestamp

   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position

+  validates_associated :changeset

 
 

-  belongs_to :user
- 
-  def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
-  end
+  belongs_to :changeset
+  belongs_to :redaction
+  belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"

 
 

-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
+  has_many :old_tags, :class_name => 'OldNodeTag', :foreign_key => [:node_id, :version]
+
+  def validate_position
+    errors.add(:base, "Node is not in the world") unless in_world?

   end
 
   def self.from_node(node)
   end
 
   def self.from_node(node)


@@ -27,27 +33,72 @@ class OldNode < ActiveRecord::Base
     old_node.visible = node.visible
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
     old_node.visible = node.visible
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp

-    old_node.user_id = node.user_id
-    old_node.id = node.id
+    old_node.changeset_id = node.changeset_id
+    old_node.node_id = node.id
+    old_node.version = node.version

     return old_node
   end
     return old_node
   end

+  
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
+
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
+    el = XML::Node.new 'node'
+    el['id'] = self.node_id.to_s
+
+    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)

 
 

-  def to_xml_node
-    el1 = XML::Node.new 'node'
-    el1['id'] = self.id.to_s
-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.to_s
-    el1['user'] = self.user.display_name if self.user.data_public?
+    if self.visible?
+      el['lat'] = self.lat.to_s
+      el['lon'] = self.lon.to_s
+    end
+
+    add_tags_to_xml_node(el, self.old_tags)
+
+    return el
+  end

 
 

-    Tags.split(self.tags) do |k,v|
-      el2 = XML::Node.new('tag')
-      el2['k'] = k.to_s
-      el2['v'] = v.to_s
-      el1 << el2
+  def save_with_dependencies!
+    save!
+   
+    self.tags.each do |k,v|
+      tag = OldNodeTag.new
+      tag.k = k
+      tag.v = v
+      tag.node_id = self.node_id
+      tag.version = self.version
+      tag.save!

     end
     end

+  end
+
+  def tags
+    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
+  end
+
+  def tags=(t)
+    @tags = t 
+  end
+
+  def tags_as_hash 
+    return self.tags
+  end 
+ 
+  # Pretend we're not in any ways 
+  def ways 
+    return [] 
+  end 
+ 
+  # Pretend we're not in any relations 
+  def containing_relation_members 
+    return [] 
+  end 

 
 

-    el1['visible'] = self.visible.to_s
-    el1['timestamp'] = self.timestamp.xmlschema
-    return el1
+  # check whether this element is the latest version - that is,
+  # has the same version as its "current" counterpart.
+  def is_latest_version?
+    current_node.version == self.version

   end
 end
   end
 end