api06: Fix normal way and relation uploading (i.e. not as part of a diff).

(I'm sorry that I couldn't commit it earlier, but I didn't have access to an
internet connection until now.)

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 559b78440e61b10d7b908d8b50aeaf899138ba73..58add6dd0e96f3c2debc71f2a699533df34f5dda 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -17,13 +17,11 @@ class Relation < ActiveRecord::Base
       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|
       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|

-       relation = Relation.from_xml_node pt, create
+       return Relation.from_xml_node(pt, create)

       end
     rescue
       end
     rescue

-      relation = nil
+      return nil

     end
     end

-
-    return relation

   end
 
   def self.from_xml_node(pt, create=false)
   end
 
   def self.from_xml_node(pt, create=false)

diff --git a/app/models/way.rb b/app/models/way.rb
index e16ec53e000c87fc8ddf105b009bae7419361ddf..255f4329f89983c49f4a760a32df77caeafeb3f9 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -18,13 +18,11 @@ class Way < ActiveRecord::Base
       doc = p.parse
 
       doc.find('//osm/way').each do |pt|
       doc = p.parse
 
       doc.find('//osm/way').each do |pt|

-       way = Way.from_xml_node pt, create
+       return Way.from_xml_node(pt, create)

       end
     rescue
       end
     rescue

-      way = nil
+      return nil

     end
     end

-
-    return way

   end
 
   def self.from_xml_node(pt, create=false)
   end
 
   def self.from_xml_node(pt, create=false)