X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/461f99dfe03ed0dfea2d973378e0ace70134c199..aeb9c4df971e57c6470281990429965728ea76a8:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index 4d48112fc..a5346e87f 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -71,19 +71,21 @@ 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") - doc.find("//osm/node").each do |pt| - return Node.from_xml_node(pt, create) + if pt + Node.from_xml_node(pt, :create => create) + else + raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.") end - raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.") rescue LibXML::XML::Error, ArgumentError => e 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?