Merge remote-tracking branch 'upstream/pull/5246'

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 4f5f074abf4b65600db82cc9de719bf736f30494..f29eed9dda9cbaf7d3532fde9cd22432eca08b1f 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -26,10 +26,8 @@
 
 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.
 
   # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.


@@ -87,10 +85,6 @@ class OldNode < ApplicationRecord
 
   attr_writer :tags
 
 
   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