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 e16ec53e000c87fc8ddf105b009bae7419361ddf..a6192e2d735e7ce128096a84cd32780da23db9d2 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|
-       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