Disable filter inheritance on tiles, apply filter to tile container

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 3470561cee4df036a318d2901a7c59752ae19bbd..9f551d839fc2c57be000f37f67ccd952ec9a313c 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -2,10 +2,10 @@
 #
 # Table name: relations
 #
 #
 # Table name: relations
 #

-#  relation_id  :integer          default(0), not null, primary key
-#  changeset_id :integer          not null
+#  relation_id  :bigint(8)        not null, primary key
+#  changeset_id :bigint(8)        not null

 #  timestamp    :datetime         not null
 #  timestamp    :datetime         not null

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

 #  visible      :boolean          default(TRUE), not null
 #  redaction_id :integer
 #
 #  visible      :boolean          default(TRUE), not null
 #  redaction_id :integer
 #


@@ -20,25 +20,21 @@
 #  relations_redaction_id_fkey  (redaction_id => redactions.id)
 #
 
 #  relations_redaction_id_fkey  (redaction_id => redactions.id)
 #
 

-class OldRelation < ActiveRecord::Base
-  include ConsistencyValidations
-  include ObjectMetadata
-
+class OldRelation < ApplicationRecord

   self.table_name = "relations"
   self.table_name = "relations"

-  self.primary_keys = "relation_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
 
   belongs_to :changeset
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 
   belongs_to :changeset

-  belongs_to :redaction
-  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
+  belongs_to :redaction, :optional => true
+  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id", :inverse_of => :old_relations

 
 

-  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version]
-  has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version]
+  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation
+  has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation

 
 

-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true

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


@@ -83,37 +79,10 @@ class OldRelation < ActiveRecord::Base
   end
 
   def tags
   end
 
   def tags

-    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]
-  end
-
-  attr_writer :members
-
-  attr_writer :tags
-
-  def to_xml
-    doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node
-    doc
+    @tags ||= old_tags.to_h { |t| [t.k, t.v] }

   end
 
   end
 

-  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new "relation"
-    el["id"] = relation_id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    old_members.each do |member|
-      member_el = XML::Node.new "member"
-      member_el["type"] = member.member_type.to_s.downcase
-      member_el["ref"] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
-      member_el["role"] = member.member_role.to_s
-      el << member_el
-    end
-
-    add_tags_to_xml_node(el, old_tags)
-
-    el
-  end
+  attr_writer :members, :tags

 
   # Temporary method to match interface to relations
   def relation_members
 
   # Temporary method to match interface to relations
   def relation_members


@@ -127,7 +96,7 @@ class OldRelation < ActiveRecord::Base
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.

-  def is_latest_version?
+  def latest_version?

     current_relation.version == version
   end
 end
     current_relation.version == version
   end
 end