X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/45a9d9433767938a9d313f745f9459400132704a..a22b0c1b64a67e46bcecbce41b07fc7a53fb0632:/app/models/old_node.rb diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 91b5a1a8e..5e3638347 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -4,10 +4,15 @@ class OldNode < ActiveRecord::Base set_table_name 'nodes' + # Should probably have the composite primary key set in the model + # however there are some weird bugs happening when you do + #set_primary_keys :id, :version + validates_presence_of :changeset_id, :timestamp validates_inclusion_of :visible, :in => [ true, false ] validates_numericality_of :latitude, :longitude validate :validate_position + validates_associated :changeset belongs_to :changeset @@ -40,7 +45,10 @@ class OldNode < ActiveRecord::Base el1['lat'] = self.lat.to_s el1['lon'] = self.lon.to_s el1['changeset'] = self.changeset.id.to_s - el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public? + if self.changeset.user.data_public? + el1['user'] = self.changeset.user.display_name + el1['uid'] = self.changeset.user.id.to_s + end self.tags.each do |k,v| el2 = XML::Node.new('tag') @@ -89,11 +97,7 @@ class OldNode < ActiveRecord::Base end def tags_as_hash - hash = {} - Tags.split(self.tags) do |k,v| - hash[k] = v - end - hash + return self.tags end # Pretend we're not in any ways