X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ecefee485b8dc033d020bd6b67d9ae4559ec796a..137509534304be853ab01ca554111c524a9a1bca:/app/models/node.rb?ds=sidebyside

diff --git a/app/models/node.rb b/app/models/node.rb
index e926e06a2..f2fe341ae 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -6,11 +6,6 @@ class Node < ActiveRecord::Base
 
   set_table_name 'current_nodes'
 
-  validates_presence_of :changeset_id, :timestamp
-  validates_inclusion_of :visible, :in => [ true, false ]
-  validates_numericality_of :latitude, :longitude
-  validate :validate_position
-
   belongs_to :changeset
 
   has_many :old_nodes, :foreign_key => :id
@@ -26,6 +21,15 @@ class Node < ActiveRecord::Base
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
 
+  validates_presence_of :id, :on => :update
+  validates_presence_of :timestamp,:version,  :changeset_id
+  validates_uniqueness_of :id
+  validates_inclusion_of :visible, :in => [ true, false ]
+  validates_numericality_of :latitude, :longitude, :changeset_id, :version, :integer_only => true
+  validates_numericality_of :id, :on => :update, :integer_only => true
+  validate :validate_position
+  validates_associated :changeset
+
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?