Update to rails 6.1.4.2

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 1ee6935ed6c0b0b505d1fdc1eb147041f2174804..9acf8665d2a5fa144c927b9da2763874599f1a95 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -22,12 +22,11 @@
 
 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"
 

-  # 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
 
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 


@@ -81,28 +80,11 @@ class OldWay < ApplicationRecord
   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 :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