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

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 9690dc46ca807106f7080f41e88e9e94048d6e78..81d8e331fcf5e1fc507e5a19119cfc5773e9ab5f 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -2,14 +2,14 @@
 #
 # Table name: nodes
 #
 #
 # Table name: nodes
 #

-#  node_id      :integer          not null, primary key
+#  node_id      :bigint(8)        not null, primary key

 #  latitude     :integer          not null
 #  longitude    :integer          not null
 #  latitude     :integer          not null
 #  longitude    :integer          not null

-#  changeset_id :integer          not null
+#  changeset_id :bigint(8)        not null

 #  visible      :boolean          not null
 #  timestamp    :datetime         not null
 #  visible      :boolean          not null
 #  timestamp    :datetime         not null

-#  tile         :integer          not null
-#  version      :integer          not null, primary key
+#  tile         :bigint(8)        not null
+#  version      :bigint(8)        not null, primary key

 #  redaction_id :integer
 #
 # Indexes
 #  redaction_id :integer
 #
 # Indexes


@@ -24,23 +24,22 @@
 #  nodes_redaction_id_fkey  (redaction_id => redactions.id)
 #
 
 #  nodes_redaction_id_fkey  (redaction_id => redactions.id)
 #
 

-class OldNode < ActiveRecord::Base
+class OldNode < ApplicationRecord

   include GeoRecord
   include ConsistencyValidations
   include GeoRecord
   include ConsistencyValidations

-  include ObjectMetadata

 
   self.table_name = "nodes"
   self.primary_keys = "node_id", "version"
 
 
   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 :changeset, :presence => true, :associated => true
   validates :latitude, :presence => true,
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 
   validates :changeset, :presence => true, :associated => true
   validates :latitude, :presence => true,

-                       :numericality => { :integer_only => true }
+                       :numericality => { :only_integer => true }

   validates :longitude, :presence => true,
   validates :longitude, :presence => true,

-                        :numericality => { :integer_only => true }
+                        :numericality => { :only_integer => true }

   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 


@@ -69,28 +68,6 @@ class OldNode < ActiveRecord::Base
     old_node
   end
 
     old_node
   end
 

-  def to_xml
-    doc = OSM::API.new.get_xml_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"] = node_id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    if visible?
-      el["lat"] = lat.to_s
-      el["lon"] = lon.to_s
-    end
-
-    add_tags_to_xml_node(el, old_tags)
-
-    el
-  end
-

   def save_with_dependencies!
     save!
 
   def save_with_dependencies!
     save!
 


@@ -105,7 +82,7 @@ class OldNode < ActiveRecord::Base
   end
 
   def tags
   end
 
   def tags

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

   end
 
   attr_writer :tags
   end
 
   attr_writer :tags