X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9544ab12b8237b4e471f03df981a189c80216c63..71c5cb21c5d3255899a405599261b3bb182ba321:/app/models/old_node.rb?ds=inline diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 3a0ecc367..9690dc46c 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -1,3 +1,29 @@ +# == Schema Information +# +# Table name: nodes +# +# node_id :integer not null, primary key +# latitude :integer not null +# longitude :integer not null +# changeset_id :integer not null +# visible :boolean not null +# timestamp :datetime not null +# tile :integer not null +# version :integer not null, primary key +# redaction_id :integer +# +# Indexes +# +# nodes_changeset_id_idx (changeset_id) +# nodes_tile_idx (tile) +# nodes_timestamp_idx (timestamp) +# +# Foreign Keys +# +# nodes_changeset_id_fkey (changeset_id => changesets.id) +# nodes_redaction_id_fkey (redaction_id => redactions.id) +# + class OldNode < ActiveRecord::Base include GeoRecord include ConsistencyValidations @@ -10,17 +36,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? @@ -36,81 +66,67 @@ class OldNode < ActiveRecord::Base old_node.changeset_id = node.changeset_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(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new 'node' - el['id'] = self.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'] = self.lat.to_s - el['lon'] = self.lon.to_s + if visible? + el["lat"] = lat.to_s + el["lon"] = lon.to_s end - add_tags_to_xml_node(el, self.old_tags) + add_tags_to_xml_node(el, old_tags) - return el + 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.where(:node_id => self.node_id, :timestamp => self.timestamp, :version => self.version).first.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.node_id = self.node_id - tag.version = self.version + tag.node_id = node_id + tag.version = version tag.save! end end def tags - unless @tags - @tags = Hash.new - self.old_tags.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 - def tags=(t) - @tags = t + attr_writer :tags + + def tags_as_hash + tags + end + + # Pretend we're not in any ways + def ways + [] 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 + # Pretend we're not in any relations + def containing_relation_members + [] + 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 == self.version + current_node.version == version end end