iD: listen to manual hashchanges from iframe parent

[rails.git] / app / models / old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 81d8e331fcf5e1fc507e5a19119cfc5773e9ab5f..f29eed9dda9cbaf7d3532fde9cd22432eca08b1f 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -26,16 +26,14 @@
 
 class OldNode < ApplicationRecord
   include GeoRecord
 
 class OldNode < ApplicationRecord
   include GeoRecord

-  include ConsistencyValidations

 
   self.table_name = "nodes"
 
   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
 
 
   # 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 :changeset, :associated => true

   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,
   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,


@@ -46,10 +44,10 @@ class OldNode < ApplicationRecord
   validate :validate_position
 
   belongs_to :changeset
   validate :validate_position
 
   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", :foreign_key => [:node_id, :version], :inverse_of => :old_node

 
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?
 
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?


@@ -82,15 +80,11 @@ class OldNode < ApplicationRecord
   end
 
   def tags
   end
 
   def tags

-    @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h
+    @tags ||= old_tags.to_h { |t| [t.k, t.v] }

   end
 
   attr_writer :tags
 
   end
 
   attr_writer :tags
 

-  def tags_as_hash
-    tags
-  end
-

   # Pretend we're not in any ways
   def ways
     []
   # Pretend we're not in any ways
   def ways
     []


@@ -103,7 +97,7 @@ class OldNode < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.

-  def is_latest_version?
+  def latest_version?

     current_node.version == version
   end
 end
     current_node.version == version
   end
 end