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

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 7a103efa5c3954ce7a4020a653627743587f56f1..b027f2fd49f47bfacab2e9581fa0761c676626d2 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -66,7 +66,8 @@ class Node < GeoRecord
 
   def self.from_xml_node(pt, create=false)
     node = Node.new
-
+    
+    node.version = pt['version']
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
 
@@ -139,6 +140,10 @@ class Node < GeoRecord
   end
 
   def update_from(new_node, user)
+    if new_node.version != version
+      raise OSM::APIVersionMismatchError.new(new_node.version, version)
+    end
+
     self.user_id = user.id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
@@ -185,11 +190,7 @@ class Node < GeoRecord
   end
 
   def tags_as_hash
-    hash = {}
-    Tags.split(self.tags) do |k,v|
-      hash[k] = v
-    end
-    hash
+    return tags
   end
 
   def tags