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

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 2e71813ff948e853a429df6764b4ca375f220ce0..52c4b6d67a0256abbe97a9e1efffbee173123cec 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -21,7 +21,7 @@
 #  current_nodes_changeset_id_fkey  (changeset_id => changesets.id)
 #
 
-class Node < ActiveRecord::Base
+class Node < ApplicationRecord
   require "xml/libxml"
 
   include GeoRecord
@@ -74,11 +74,13 @@ class Node < ActiveRecord::Base
   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)
+    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