X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3d6e1c67fb2291c6933f37bac3b9a3f518e8487a..df11677afd55ef592330a05c43ed4baa81b60572:/app/models/way.rb?ds=sidebyside

diff --git a/app/models/way.rb b/app/models/way.rb
index 0c927c11c..de69f7565 100644
--- 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|
-	way = Way.from_xml_node pt, create
+	return Way.from_xml_node(pt, create)
       end
     rescue
-      way = nil
+      return nil
     end
-
-    return way
   end
 
   def self.from_xml_node(pt, create=false)
@@ -33,6 +31,8 @@ class Way < ActiveRecord::Base
     if !create and pt['id'] != '0'
       way.id = pt['id'].to_i
     end
+    
+    way.version = pt['version']
 
     if create
       way.timestamp = Time.now
@@ -196,6 +196,18 @@ class Way < ActiveRecord::Base
     end
   end
 
+  def update_from(new_way, user)
+    if !new_way.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new
+    else
+      self.user_id = user.id
+      self.tags = new_way.tags
+      self.nds = new_way.nds
+      self.visible = true
+      save_with_history!
+    end
+  end
+
   def preconditions_ok?
     return false if self.nds.empty?
     self.nds.each do |n|
@@ -213,6 +225,8 @@ class Way < ActiveRecord::Base
 	  # FIXME
 	  # this should actually delete the relations,
 	  # not just throw a PreconditionFailed if it's a member of a relation!!
+
+      # FIXME: this should probably renamed to delete_with_history
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
                              :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
         raise OSM::APIPreconditionFailedError