X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/abf35dd75665d07bfb3b46f3372b56ba721e6ed7..e4c40cbd36567d050f1b779f1444c4ef26c50a5b:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 3284c47f3..724965ddf 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -17,12 +17,11 @@ # current_ways_changeset_id_fkey (changeset_id => changesets.id) # -class Way < ActiveRecord::Base +class Way < ApplicationRecord require "xml/libxml" include ConsistencyValidations include NotRedactable - include ObjectMetadata self.table_name = "current_ways" @@ -52,19 +51,21 @@ class Way < ActiveRecord::Base 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") - doc.find("//osm/way").each do |pt| - return Way.from_xml_node(pt, create) + if pt + Way.from_xml_node(pt, :create => create) + else + raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.") end - raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.") rescue LibXML::XML::Error, ArgumentError => e 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? @@ -111,12 +112,10 @@ class Way < ActiveRecord::Base 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 - - attr_writer :tags + attr_writer :nds, :tags def add_nd_num(n) @nds ||= []