Merge pull request #3935 from Hufkratzer/rename-horse-riding-label

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 2fe60e5f77049def901d3da23df912231aaf43e0..0a4a660a6fa536c52a025a4b337c521e85ab59be 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -22,15 +22,14 @@ class Relation < ApplicationRecord
 
   include ConsistencyValidations
   include NotRedactable
 
   include ConsistencyValidations
   include NotRedactable

-  include ObjectMetadata

 
   self.table_name = "current_relations"
 
   belongs_to :changeset
 
 
   self.table_name = "current_relations"
 
   belongs_to :changeset
 

-  has_many :old_relations, -> { order(:version) }
+  has_many :old_relations, -> { order(:version) }, :inverse_of => :current_relation

 
 

-  has_many :relation_members, -> { order(:sequence_id) }
+  has_many :relation_members, -> { order(:sequence_id) }, :inverse_of => :relation

   has_many :relation_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :relation_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member


@@ -40,8 +39,6 @@ class Relation < ApplicationRecord
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }

-  validates :changeset_id, :presence => true,
-                           :numericality => { :only_integer => true }

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


@@ -54,13 +51,13 @@ class Relation < ApplicationRecord
 
   TYPES = %w[node way relation].freeze
 
 
   TYPES = %w[node way relation].freeze
 

-  def self.from_xml(xml, create = false)
+  def self.from_xml(xml, create: false)

     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
     pt = doc.find_first("//osm/relation")
 
     if pt
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
     pt = doc.find_first("//osm/relation")
 
     if pt

-      Relation.from_xml_node(pt, create)
+      Relation.from_xml_node(pt, :create => create)

     else
       raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/relation element.")
     end
     else
       raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/relation element.")
     end


@@ -68,7 +65,7 @@ class Relation < ApplicationRecord
     raise OSM::APIBadXMLError.new("relation", xml, e.message)
   end
 
     raise OSM::APIBadXMLError.new("relation", xml, e.message)
   end
 

-  def self.from_xml_node(pt, create = false)
+  def self.from_xml_node(pt, create: false)

     relation = Relation.new
 
     raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create || !pt["version"].nil?
     relation = Relation.new
 
     raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create || !pt["version"].nil?


@@ -131,7 +128,7 @@ class Relation < ApplicationRecord
   end
 
   def tags
   end
 
   def tags

-    @tags ||= Hash[relation_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= relation_tags.to_h { |t| [t.k, t.v] }

   end
 
   attr_writer :members, :tags
   end
 
   attr_writer :members, :tags


@@ -207,6 +204,8 @@ class Relation < ApplicationRecord
   end
 
   def preconditions_ok?(good_members = [])
   end
 
   def preconditions_ok?(good_members = [])

+    raise OSM::APITooManyRelationMembersError.new(id, members.length, Settings.max_number_of_relation_members) if members.length > Settings.max_number_of_relation_members
+

     # These are hastables that store an id in the index of all
     # the nodes/way/relations that have already been added.
     # If the member is valid and visible then we add it to the
     # These are hastables that store an id in the index of all
     # the nodes/way/relations that have already been added.
     # If the member is valid and visible then we add it to the


@@ -264,7 +263,7 @@ class Relation < ApplicationRecord
   private
 
   def save_with_history!
   private
 
   def save_with_history!

-    t = Time.now.getutc
+    t = Time.now.utc

 
     self.version += 1
     self.timestamp = t
 
     self.version += 1
     self.timestamp = t