Enable active_record.belongs_to_required_by_default

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 620cc24d227029091e610bfccb0813bb792c0449..3261c9a0e2875b58c8646169930d7381740ad41b 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -27,7 +27,6 @@
 class OldNode < ApplicationRecord
   include GeoRecord
   include ConsistencyValidations
 class OldNode < ApplicationRecord
   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"


@@ -47,7 +46,7 @@ class OldNode < ApplicationRecord
   validate :validate_position
 
   belongs_to :changeset
   validate :validate_position
 
   belongs_to :changeset

-  belongs_to :redaction
+  belongs_to :redaction, :optional => true

   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"
 
   has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version]
   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"
 
   has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version]


@@ -69,28 +68,6 @@ class OldNode < ApplicationRecord
     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 < 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