X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ebb7045fe53d831502f054cf5007843e023d094..7151fa05e4d4f73956d7f9a7ad2db1f5b956a0c0:/app/models/way.rb?ds=sidebyside

diff --git a/app/models/way.rb b/app/models/way.rb
index e16ec53e0..ea027fb47 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
@@ -199,6 +199,8 @@ class Way < ActiveRecord::Base
   def update_from(new_way, user)
     if !new_way.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
+    elsif new_way.version != version
+      raise OSM::APIVersionMismatchError.new(new_way.version, version)
     else
       self.user_id = user.id
       self.tags = new_way.tags
@@ -219,8 +221,7 @@ class Way < ActiveRecord::Base
     return true
   end
 
-  # Delete the way and it's relations, but don't really delete it - set its visibility to false and update the history etc to maintain wiki-like functionality.
-  def delete_with_relations_and_history(user)
+  def delete_with_history(user)
     if self.visible
 	  # FIXME
 	  # this should actually delete the relations,
@@ -244,6 +245,8 @@ class Way < ActiveRecord::Base
   end
 
   # delete a way and it's nodes that aren't part of other ways, with history
+
+  # FIXME: merge the potlatch code to delete the relations
   def delete_with_relations_and_nodes_and_history(user)
     
     node_ids = self.nodes.collect {|node| node.id }
@@ -264,7 +267,7 @@ class Way < ActiveRecord::Base
     
     self.user_id = user.id
 
-    self.delete_with_relations_and_history(user)
+    self.delete_with_history(user)
 
   end
 end