api06: s/delete_with_relations_and_history/delete_with_history/g

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

diff --git a/app/models/way.rb b/app/models/way.rb
index de69f7565c6493fa27ab466008bd24f78cf62c77..ea027fb47908d2148ae7d07476843972aeeebd86 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -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