Enable active_record.belongs_to_required_by_default

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 3260f2a1f57acbed3755fe691949d8e14fa1fbbc..03c281e5a437c40f8f4aef0a8b5bcfaaf16bcdf2 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -22,7 +22,6 @@
 
 class OldWay < ApplicationRecord
   include ConsistencyValidations
 
 class OldWay < ApplicationRecord
   include ConsistencyValidations

-  include ObjectMetadata

 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"
 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"


@@ -32,7 +31,7 @@ class OldWay < ApplicationRecord
   include Redactable
 
   belongs_to :changeset
   include Redactable
 
   belongs_to :changeset

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

   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
 
   has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version]
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
 
   has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version]


@@ -81,28 +80,11 @@ class OldWay < 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 :nds, :tags
 
   end
 
   attr_writer :nds, :tags
 

-  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new "way"
-    el["id"] = way_id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    old_nodes.each do |nd| # FIXME: need to make sure they come back in the right order
-      node_el = XML::Node.new "nd"
-      node_el["ref"] = nd.node_id.to_s
-      el << node_el
-    end
-
-    add_tags_to_xml_node(el, old_tags)
-
-    el
-  end
-

   # Temporary method to match interface to ways
   def way_nodes
     old_nodes
   # Temporary method to match interface to ways
   def way_nodes
     old_nodes