X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/398d5fa3298b7aacea4a9cbddd0c4e5f8a9e6638..7e7ede890e8e948236d3dbc48e24aca00cd01f62:/app/models/old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 76eab8427..f29eed9dd 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,23 +1,56 @@
-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
 
-  set_table_name 'nodes'
-  
-  validates_presence_of :user_id, :timestamp
-  validates_inclusion_of :visible, :in => [ true, false ]
-  validates_numericality_of :latitude, :longitude
+  self.table_name = "nodes"
+
+  # 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, :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
 
-  belongs_to :user
- 
-  def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
-  end
+  belongs_to :changeset
+  belongs_to :redaction, :optional => true
+  belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes
 
-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
+  has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node
+
+  def validate_position
+    errors.add(:base, "Node is not in the world") unless in_world?
   end
 
   def self.from_node(node)
@@ -27,45 +60,44 @@ 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.id = node.id
-    return old_node
+    old_node.changeset_id = node.changeset_id
+    old_node.node_id = node.id
+    old_node.version = node.version
+    old_node
   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['user'] = self.user.display_name if self.user.data_public?
-
-    Tags.split(self.tags) do |k,v|
-      el2 = XML::Node.new('tag')
-      el2['k'] = k.to_s
-      el2['v'] = v.to_s
-      el1 << el2
-    end
+  def save_with_dependencies!
+    save!
 
-    el1['visible'] = self.visible.to_s
-    el1['timestamp'] = self.timestamp.xmlschema
-    return el1
-  end
-  
-  def tags_as_hash
-    hash = {}
-    Tags.split(self.tags) do |k,v|
-      hash[k] = v
+    tags.each do |k, v|
+      tag = OldNodeTag.new
+      tag.k = k
+      tag.v = v
+      tag.node_id = node_id
+      tag.version = version
+      tag.save!
     end
-    hash
   end
 
+  def tags
+    @tags ||= old_tags.to_h { |t| [t.k, t.v] }
+  end
+
+  attr_writer :tags
+
   # 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 latest_version?
+    current_node.version == version
   end
 end