Use flexbox instead of floating to position the comment icon

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 2fe60e5f77049def901d3da23df912231aaf43e0..25564940bdd1a4013cf2ae3a533b3fdf2afc4bde 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -22,7 +22,6 @@ class Relation < ApplicationRecord
 
   include ConsistencyValidations
   include NotRedactable
 
   include ConsistencyValidations
   include NotRedactable

-  include ObjectMetadata

 
   self.table_name = "current_relations"
 
 
   self.table_name = "current_relations"
 


@@ -54,13 +53,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 +67,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 +130,7 @@ class Relation < ApplicationRecord
   end
 
   def tags
   end
 
   def tags

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

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