X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6c66507427961a22a8f282b5b2f4ab7fda1dad6f..32c0a7e5a874d0369bcde1bc8cbdb1f04d1463c1:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 59bba5e60..01b0f220e 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -123,21 +123,22 @@ class Node < ActiveRecord::Base
   # Should probably be renamed delete_from to come in line with update
   def delete_with_history!(new_node, user)
     unless self.visible
-      raise OSM::APIAlreadyDeletedError.new
+      raise OSM::APIAlreadyDeletedError.new("node", new_node.id)
     end
 
     # need to start the transaction here, so that the database can 
     # provide repeatable reads for the used-by checks. this means it
     # shouldn't be possible to get race conditions.
     Node.transaction do
+      self.lock!
       check_consistency(self, new_node, user)
-      way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", 
+      way = WayNode.find(:first, :joins => :way, 
                          :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
-      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.id}.") unless way.nil?
+      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.way.id}.") unless way.nil?
       
-      rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", 
+      rel = RelationMember.find(:first, :joins => :relation, 
                                 :conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
-      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.id}.") unless rel.nil?
+      raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.relation.id}.") unless rel.nil?
 
       self.changeset_id = new_node.changeset_id
       self.visible = false
@@ -150,25 +151,28 @@ class Node < ActiveRecord::Base
   end
 
   def update_from(new_node, user)
-    check_consistency(self, new_node, user)
-
-    # update changeset first
-    self.changeset_id = new_node.changeset_id
-    self.changeset = new_node.changeset
-
-    # update changeset bbox with *old* position first
-    changeset.update_bbox!(bbox);
-
-    # FIXME logic needs to be double checked
-    self.latitude = new_node.latitude 
-    self.longitude = new_node.longitude
-    self.tags = new_node.tags
-    self.visible = true
-
-    # update changeset bbox with *new* position
-    changeset.update_bbox!(bbox);
-
-    save_with_history!
+    Node.transaction do
+      self.lock!
+      check_consistency(self, new_node, user)
+      
+      # update changeset first
+      self.changeset_id = new_node.changeset_id
+      self.changeset = new_node.changeset
+      
+      # update changeset bbox with *old* position first
+      changeset.update_bbox!(bbox);
+      
+      # FIXME logic needs to be double checked
+      self.latitude = new_node.latitude 
+      self.longitude = new_node.longitude
+      self.tags = new_node.tags
+      self.visible = true
+      
+      # update changeset bbox with *new* position
+      changeset.update_bbox!(bbox);
+      
+      save_with_history!
+    end
   end
   
   def create_with_history(user)
@@ -188,27 +192,33 @@ class Node < ActiveRecord::Base
     return doc
   end
 
-  def to_xml_node(user_display_name_cache = nil)
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'node'
     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)
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
+
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
       # use the cache if available
     elsif self.changeset.user.data_public?
-      user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
+      user_display_name_cache[user_id] = self.changeset.user.display_name
     else
-      user_display_name_cache[self.changeset.user_id] = nil
+      user_display_name_cache[user_id] = nil
     end
 
-    if not user_display_name_cache[self.changeset.user_id].nil?
-      el1['user'] = user_display_name_cache[self.changeset.user_id]
-      el1['uid'] = self.changeset.user_id.to_s
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
     end
 
     self.tags.each do |k,v|
@@ -261,7 +271,7 @@ class Node < ActiveRecord::Base
   ##
   # dummy method to make the interfaces of node, way and relation
   # more consistent.
-  def fix_placeholders!(id_map)
+  def fix_placeholders!(id_map, placeholder_id = nil)
     # nodes don't refer to anything, so there is nothing to do here
   end