adding the controller code to be able to get a specific version of a node, way or...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index d152be6d302eb881345a37b1962f2e09ced7e6d4..a25a19f703e14f266031264d2c3f566ea93255a3 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -134,13 +134,13 @@ class Node < ActiveRecord::Base
   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
+        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.user_id = user.id
+        self.visible = 0
+        save_with_history!
       end
     else
       raise OSM::APIAlreadyDeletedError.new
@@ -150,10 +150,14 @@ class Node < ActiveRecord::Base
   def update_from(new_node, user)
     if new_node.version != version
       raise OSM::APIVersionMismatchError.new(new_node.version, version)
+    elsif new_node.changeset.user_id != user.id
+      raise OSM::APIUserChangesetMismatchError.new
+    elsif not new_node.changeset.open?
+      raise OSM::APIChangesetAlreadyClosedError.new
     end
 
     # FIXME logic need looked at
-    self.changeset_id = user.id
+    self.changeset_id = new_node.changeset_id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags
@@ -196,7 +200,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