X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e2a66e8de55b3719bd307261058b7f898598994..b86390d303030ae5faca278445ca8b404c1937a4:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 52c4b6d67..3214564c8 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -27,7 +27,6 @@ class Node < ApplicationRecord
   include GeoRecord
   include ConsistencyValidations
   include NotRedactable
-  include ObjectMetadata
 
   self.table_name = "current_nodes"
 
@@ -71,13 +70,13 @@ class Node < ApplicationRecord
   end
 
   # Read in xml as text and return it's Node object representation
-  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/node")
 
     if pt
-      Node.from_xml_node(pt, create)
+      Node.from_xml_node(pt, :create => create)
     else
       raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")
     end
@@ -85,7 +84,7 @@ class Node < ApplicationRecord
     raise OSM::APIBadXMLError.new("node", xml, e.message)
   end
 
-  def self.from_xml_node(pt, create = false)
+  def self.from_xml_node(pt, create: false)
     node = Node.new
 
     raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt["lat"].nil?
@@ -207,7 +206,7 @@ class Node < ApplicationRecord
   end
 
   def tags
-    @tags ||= Hash[node_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= node_tags.to_h { |t| [t.k, t.v] }
   end
 
   attr_writer :tags