X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e2a66e8de55b3719bd307261058b7f898598994..26698d6d267ab410d082a9b774b3ad5f9dc86b05:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index ca6829df4..7bb82b281 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -52,13 +52,13 @@ class Way < ApplicationRecord scope :invisible, -> { where(:visible => false) } # Read in xml as text and return it's Way 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/way") if pt - Way.from_xml_node(pt, create) + Way.from_xml_node(pt, :create => create) else raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.") end @@ -66,7 +66,7 @@ class Way < ApplicationRecord raise OSM::APIBadXMLError.new("way", xml, e.message) end - def self.from_xml_node(pt, create = false) + def self.from_xml_node(pt, create: false) way = Way.new raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create || !pt["version"].nil? @@ -113,7 +113,7 @@ class Way < ApplicationRecord end def tags - @tags ||= Hash[way_tags.collect { |t| [t.k, t.v] }] + @tags ||= way_tags.collect { |t| [t.k, t.v] }.to_h end attr_writer :nds, :tags