Create directories for traces and images

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 4d48112fc6fa9361fcd268f0e17b92b2a3d14776..a5346e87f39b71f297b9b6b4948d01f271d2618e 100644 (file)
--- 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
   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
     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
     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
 
   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?
     node = Node.new
 
     raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt["lat"].nil?