Add inverse_of to relationships that can't detect it automatically

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 7bb82b281bc4e10603ea2ffc29eee928c4ff9709..0c6e645b7e2ce40f89bf81ca2002a5c056550cf2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -22,15 +22,14 @@ class Way < ApplicationRecord
 
   include ConsistencyValidations
   include NotRedactable
-  include ObjectMetadata
 
   self.table_name = "current_ways"
 
   belongs_to :changeset
 
-  has_many :old_ways, -> { order(:version) }
+  has_many :old_ways, -> { order(:version) }, :inverse_of => :current_way
 
-  has_many :way_nodes, -> { order(:sequence_id) }
+  has_many :way_nodes, -> { order(:sequence_id) }, :inverse_of => :way
   has_many :nodes, :through => :way_nodes
 
   has_many :way_tags
@@ -113,7 +112,7 @@ class Way < ApplicationRecord
   end
 
   def tags
-    @tags ||= way_tags.collect { |t| [t.k, t.v] }.to_h
+    @tags ||= way_tags.to_h { |t| [t.k, t.v] }
   end
 
   attr_writer :nds, :tags