moving the conistency checks for updates and deletes to library, hopefully got the...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 2f3001a49a8c627c571f45bd2ed2c68711026a8f..39e1228acf80c8dd41f6d2c4be520c80be736637 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -4,7 +4,7 @@ class Node < ActiveRecord::Base
   include GeoRecord
 
   set_table_name 'current_nodes'
-  
+
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
@@ -131,16 +131,18 @@ class Node < ActiveRecord::Base
     end
   end
 
-  def delete_with_history(user)
+  # Should probably be renamed delete_from to come in line with update
+  def delete_with_history(new_node, user)
     if self.visible
+      check_consistency(self, new_node, user)
       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
+        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
+        raise OSM::APIPreconditionFailedError.new
       else
-       self.user_id = user.id
-       self.visible = 0
-       save_with_history!
+        self.changeset_id = new_node.changeset_id
+        self.visible = 0
+        save_with_history!
       end
     else
       raise OSM::APIAlreadyDeletedError.new
@@ -148,12 +150,10 @@ class Node < ActiveRecord::Base
   end
 
   def update_from(new_node, user)
-    if new_node.version != version
-      raise OSM::APIVersionMismatchError.new(new_node.version, version)
-    end
+    check_consistency(self, new_node, user)
 
-    # FIXME logic need looked at
-    self.changeset_id = user.id
+    # FIXME logic needs to be double checked
+    self.changeset_id = new_node.changeset_id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags
@@ -172,7 +172,9 @@ class Node < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
-
+    el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s
+    
     user_display_name_cache = {} if user_display_name_cache.nil?
 
     if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
@@ -194,7 +196,6 @@ class Node < ActiveRecord::Base
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    el1['version'] = self.version.to_s
     return el1
   end