api06: Preliminary support for diff uploading. This will not return anything

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 5e5e7a0b2671166c6ce3a596ea00d59316e1c77d..872c5c9228f941e30b0afcb87a074b2afff73001 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -55,40 +55,43 @@ class Node < GeoRecord
       p = XML::Parser.new
       p.string = xml
       doc = p.parse
       p = XML::Parser.new
       p.string = xml
       doc = p.parse

-  
-      node = Node.new

 
       doc.find('//osm/node').each do |pt|
 
       doc.find('//osm/node').each do |pt|

-        node.lat = pt['lat'].to_f
-        node.lon = pt['lon'].to_f
-
-        return nil unless node.in_world?
+       return Node.from_xml_node(pt, create)
+      end
+    rescue
+      return nil
+    end
+  end

 
 

-        unless create
-          if pt['id'] != '0'
-            node.id = pt['id'].to_i
-          end
-        end
+  def self.from_xml_node(pt, create=false)
+    node = Node.new

 
 

-        node.visible = pt['visible'] and pt['visible'] == 'true'
+    node.lat = pt['lat'].to_f
+    node.lon = pt['lon'].to_f

 
 

-        if create
-          node.timestamp = Time.now
-        else
-          if pt['timestamp']
-            node.timestamp = Time.parse(pt['timestamp'])
-          end
-        end
+    return nil unless node.in_world?

 
 

-        tags = []
+    unless create
+      if pt['id'] != '0'
+       node.id = pt['id'].to_i
+      end
+    end

 
 

-        pt.find('tag').each do |tag|
-          node.add_tag_key_val(tag['k'],tag['v'])
-        end
+    node.visible = pt['visible'] and pt['visible'] == 'true'

 
 

+    if create
+      node.timestamp = Time.now
+    else
+      if pt['timestamp']
+       node.timestamp = Time.parse(pt['timestamp'])

       end
       end

-    rescue
-      node = nil
+    end
+
+    tags = []
+
+    pt.find('tag').each do |tag|
+      node.add_tag_key_val(tag['k'],tag['v'])

     end
 
     return node
     end
 
     return node