X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/413baecf6b27056cb73e6bb4bedb33de6410c65e..427f5457d9699c319a1957940a50dea887b00f9d:/app/models/old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 0d4fd144f..b103e5c73 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -10,16 +10,22 @@ class OldNode < ActiveRecord::Base
   # 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
+  validates :changeset, :presence => true, :associated => true
+  validates :latitude, :presence => true,
+                       :numericality => { :integer_only => true }
+  validates :longitude, :presence => true,
+                        :numericality => { :integer_only => true }
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]
+
   validate :validate_position
-  validates_associated :changeset
 
   belongs_to :changeset
   belongs_to :redaction
   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"
 
+  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
@@ -34,85 +40,67 @@ class OldNode < ActiveRecord::Base
     old_node.changeset_id = node.changeset_id
     old_node.node_id = node.id
     old_node.version = node.version
-    return old_node
+    old_node
   end
-  
+
   def to_xml
     doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node()
-    return doc
+    doc.root << to_xml_node
+    doc
   end
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el1 = XML::Node.new 'node'
-    el1['id'] = self.node_id.to_s
-    add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)
+    el = XML::Node.new "node"
+    el["id"] = node_id.to_s
 
-    if self.visible?
-      el1['lat'] = self.lat.to_s
-      el1['lon'] = self.lon.to_s
-    end
+    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
-    self.tags.each do |k,v|
-      el2 = XML::Node.new('tag')
-      el2['k'] = k.to_s
-      el2['v'] = v.to_s
-      el1 << el2
+    if visible?
+      el["lat"] = lat.to_s
+      el["lon"] = lon.to_s
     end
 
-    return el1
+    add_tags_to_xml_node(el, old_tags)
+
+    el
   end
 
   def save_with_dependencies!
     save!
-    #not sure whats going on here
-    clear_aggregation_cache
-    clear_association_cache
-    #ok from here
-    @attributes.update(OldNode.where(:node_id => self.node_id, :timestamp => self.timestamp, :version => self.version).first.instance_variable_get('@attributes'))
-   
-    self.tags.each do |k,v|
+
+    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.node_id = node_id
+      tag.version = version
       tag.save!
     end
   end
 
   def tags
-    unless @tags
-      @tags = Hash.new
-      OldNodeTag.where(:node_id => self.node_id, :version => self.version).each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]
   end
 
-  def tags=(t)
-    @tags = t 
+  attr_writer :tags
+
+  def tags_as_hash
+    tags
   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 
+  # Pretend we're not in any ways
+  def ways
+    []
+  end
+
+  # Pretend we're not in any relations
+  def containing_relation_members
+    []
+  end
 
   # 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
+    current_node.version == version
   end
 end