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 872c5c9228f941e30b0afcb87a074b2afff73001..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
 
@@ -122,6 +123,35 @@ class Node < GeoRecord
     end
   end
 
+  def delete_with_history(user)
+    if self.visible
+      if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", self.id ])
+       raise OSM::APIPreconditionFailedError.new
+      elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", self.id])
+       raise OSM::APIPreconditionFailedError.new
+      else
+       self.user_id = user.id
+       self.visible = 0
+       save_with_history!
+      end
+    else
+      raise OSM::APIAlreadyDeletedError.new
+    end
+  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
+    self.tags = new_node.tags
+    self.visible = true
+    save_with_history!
+  end
+
   def to_xml
     doc = OSM::API.new.get_xml_doc
     doc.root << to_xml_node()
@@ -160,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