X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/40414cf324309d13d207f9339b7f40ce05a9fa2a..fb5f39f19ae00dad9ec896e216e8e813de42c151:/app/models/old_node.rb?ds=inline diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 58a514bcd..8b3ba784b 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -1,9 +1,10 @@ class OldNode < ActiveRecord::Base include GeoRecord + include ConsistencyValidations set_table_name 'nodes' - validates_presence_of :user_id, :timestamp + validates_presence_of :changeset_id, :timestamp validates_inclusion_of :visible, :in => [ true, false ] validates_numericality_of :latitude, :longitude validate :validate_position @@ -21,7 +22,7 @@ class OldNode < ActiveRecord::Base old_node.visible = node.visible old_node.tags = node.tags old_node.timestamp = node.timestamp - old_node.user_id = node.user_id + old_node.changeset_id = node.changeset_id old_node.id = node.id old_node.version = node.version return old_node @@ -38,7 +39,8 @@ class OldNode < ActiveRecord::Base 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? + el1['changeset'] = self.changeset.id.to_s + el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public? self.tags.each do |k,v| el2 = XML::Node.new('tag')