X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70..cd3db7df4d111d04fe121e3d91b06007b8a98e31:/app/models/old_node.rb?ds=sidebyside diff --git a/app/models/old_node.rb b/app/models/old_node.rb index be115c53e..84899d7fb 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -1,19 +1,33 @@ class OldNode < ActiveRecord::Base include GeoRecord include ConsistencyValidations + include ObjectMetadata + + self.table_name = "nodes" + self.primary_keys = "node_id", "version" + + # note this needs to be included after the table name changes, or + # the queries generated by Redactable will use the wrong table name. + include Redactable + + 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] - set_table_name 'nodes' - - 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 - + 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_to_base("Node is not in the world") unless in_world? + errors.add(:base, "Node is not in the world") unless in_world? end def self.from_node(node) @@ -24,85 +38,69 @@ class OldNode < ActiveRecord::Base old_node.tags = node.tags old_node.timestamp = node.timestamp old_node.changeset_id = node.changeset_id - old_node.id = node.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 - el1 = XML::Node.new 'node' - el1['id'] = self.id.to_s - el1['lat'] = self.lat.to_s - el1['lon'] = self.lon.to_s - el1['changeset'] = self.changeset.id.to_s - if self.changeset.user.data_public? - el1['user'] = self.changeset.user.display_name - el1['uid'] = self.changeset.user.id.to_s - end + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) + el = XML::Node.new "node" + el["id"] = node_id.to_s - self.tags.each do |k,v| - el2 = XML::Node.new('tag') - el2['k'] = k.to_s - el2['v'] = v.to_s - el1 << el2 + 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 end - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - el1['version'] = self.version.to_s - 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.find(:first, :conditions => ['id = ? AND timestamp = ? AND version = ?', self.id, self.timestamp, self.version]).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.id = self.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.find(:all, :conditions => ["id = ? AND version = ?", self.id, 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 + + attr_writer :tags + + def tags_as_hash + tags + end + + # Pretend we're not in any ways + def ways + [] end - def tags=(t) - @tags = t + # Pretend we're not in any relations + def containing_relation_members + [] 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 + # 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 == version + end end