X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6e565802786cfed6350534c984ad20ed49348f01..d00a0667bc6e156061a6c6428b0070ced6acda87:/app/models/old_node.rb diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 5ea3a778b..b323f0b4f 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -1,26 +1,53 @@ -class OldNode < ActiveRecord::Base +# == Schema Information +# +# Table name: nodes +# +# node_id :bigint(8) not null, primary key +# latitude :integer not null +# longitude :integer not null +# changeset_id :bigint(8) not null +# visible :boolean not null +# timestamp :datetime not null +# tile :bigint(8) not null +# version :bigint(8) 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 < ApplicationRecord 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 + # 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_presence_of :changeset_id, :timestamp - validates_inclusion_of :visible, :in => [ true, false ] - validates_numericality_of :latitude, :longitude + validates :changeset, :associated => true + validates :latitude, :presence => true, + :numericality => { :only_integer => true } + validates :longitude, :presence => true, + :numericality => { :only_integer => 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" + belongs_to :redaction, :optional => true + belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes - has_many :old_tags, :class_name => 'OldNodeTag', :foreign_key => [:node_id, :version] + has_many :old_tags, :class_name => "OldNodeTag", :query_constraints => [:node_id, :version], :inverse_of => :old_node def validate_position errors.add(:base, "Node is not in the world") unless in_world? @@ -36,69 +63,45 @@ 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 - end - - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node() - return doc - end - - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new 'node' - el['id'] = self.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 - end - - add_tags_to_xml_node(el, self.old_tags) - - return el + old_node end def save_with_dependencies! save! - - 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 - @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }] + @tags ||= old_tags.to_h { |t| [t.k, t.v] } end - def tags=(t) - @tags = t + attr_writer :tags + + def tags_as_hash + tags 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 ways + def ways + [] + 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 + def latest_version? + current_node.version == version end end