Merge remote-tracking branch 'upstream/pull/2915' into master

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

diff --git a/app/models/way.rb b/app/models/way.rb
index d0d1e2a2e43836a52018a93213a2cc463850e4a8..ca6829df434cc699974896944d5586c1566ebc3a 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -55,11 +55,13 @@ class Way < ApplicationRecord
   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)
+    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
@@ -114,9 +116,7 @@ class Way < ApplicationRecord
     @tags ||= Hash[way_tags.collect { |t| [t.k, t.v] }]
   end
 
-  attr_writer :nds
-
-  attr_writer :tags
+  attr_writer :nds, :tags
 
   def add_nd_num(n)
     @nds ||= []