Merge remote-tracking branch 'openstreetmap/pull/1495'

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 00f46dba61e195479fb35ab5bce043c1686b8e09..b103e5c7310160033f1d733029b26f5a29da50d7 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -10,17 +10,21 @@ 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]
+  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?
@@ -46,14 +50,14 @@ class OldNode < ActiveRecord::Base
   end
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new 'node'
-    el['id'] = node_id.to_s
+    el = XML::Node.new "node"
+    el["id"] = node_id.to_s
 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
-    if self.visible?
-      el['lat'] = lat.to_s
-      el['lon'] = lon.to_s
+    if visible?
+      el["lat"] = lat.to_s
+      el["lon"] = lon.to_s
     end
 
     add_tags_to_xml_node(el, old_tags)