api06: Move version-checking into the models, raising an exception on mismatch

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

diff --git a/app/models/way.rb b/app/models/way.rb
index de69f7565c6493fa27ab466008bd24f78cf62c77..a6192e2d735e7ce128096a84cd32780da23db9d2 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