Tests for PreconditionFailed error messages.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index e134d697d63a2b14a5cd61a3c29624c8b00b7714..40a024b8bb2cd87853dee1ab2133c59328b40976 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -89,7 +89,7 @@ class Way < ActiveRecord::Base
     return doc
   end
 
-  def to_xml_node(visible_nodes = nil, user_display_name_cache = nil)
+  def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'way'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
@@ -97,19 +97,25 @@ class Way < ActiveRecord::Base
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
 
-    user_display_name_cache = {} if user_display_name_cache.nil?
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
 
-    if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
+    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
 
     # make sure nodes are output in sequence_id order
@@ -199,8 +205,8 @@ class Way < ActiveRecord::Base
 
   def update_from(new_way, user)
     check_consistency(self, new_way, user)
-    if !new_way.preconditions_ok?
-      raise OSM::APIPreconditionFailedError.new
+    unless new_way.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.")
     end
 
     self.changeset_id = new_way.changeset_id
@@ -213,8 +219,8 @@ class Way < ActiveRecord::Base
 
   def create_with_history(user)
     check_create_consistency(self, user)
-    if !self.preconditions_ok?
-      raise OSM::APIPreconditionFailedError.new
+    unless self.preconditions_ok?
+      raise OSM::APIPreconditionFailedError.new("Cannot create way: data is invalid.")
     end
     self.version = 0
     self.visible = true
@@ -224,12 +230,12 @@ class Way < ActiveRecord::Base
   def preconditions_ok?
     return false if self.nds.empty?
     if self.nds.length > APP_CONFIG['max_number_of_way_nodes']
-      raise OSM::APITooManyWayNodesError.new(self.nds.count, APP_CONFIG['max_number_of_way_nodes'])
+      raise OSM::APITooManyWayNodesError.new(self.nds.length, APP_CONFIG['max_number_of_way_nodes'])
     end
     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])
       unless node and node.visible
-        raise OSM::APIPreconditionFailedError.new("The node with id #{n} either does not exist, or is not visible")
+        raise OSM::APIPreconditionFailedError.new("Way #{self.id} requires the node with id #{n}, which either does not exist, or is not visible.")
       end
     end
     return true
@@ -237,7 +243,7 @@ class Way < ActiveRecord::Base
 
   def delete_with_history!(new_way, user)
     unless self.visible
-      raise OSM::APIAlreadyDeletedError
+      raise OSM::APIAlreadyDeletedError.new("way", new_way.id)
     end
     
     # need to start the transaction here, so that the database can 
@@ -245,31 +251,18 @@ class Way < ActiveRecord::Base
     # shouldn't be possible to get race conditions.
     Way.transaction do
       check_consistency(self, new_way, user)
-      if 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='Way' and member_id=? ", true, self.id])
-        raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
-      else
-        self.changeset_id = new_way.changeset_id
-        self.changeset = new_way.changeset
-
-        self.tags = []
-        self.nds = []
-        self.visible = false
-        save_with_history!
-      end
-    end
-  end
-
-  # Find nodes that belong to this way only
-  def unshared_node_ids
-    node_ids = self.nodes.collect { |node| node.id }
-
-    unless node_ids.empty?
-      way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")
-      node_ids = node_ids - way_nodes.collect { |way_node| way_node.node_id }
+      raise OSM::APIPreconditionFailedError.new("Way #{self.id} still used by relation #{rel.relation.id}.") if rel
+      
+      self.changeset_id = new_way.changeset_id
+      self.changeset = new_way.changeset
+
+      self.tags = []
+      self.nds = []
+      self.visible = false
+      save_with_history!
     end
-
-    return node_ids
   end
 
   # Temporary method to match interface to nodes
@@ -281,11 +274,11 @@ class Way < ActiveRecord::Base
   # if any referenced nodes are placeholder IDs (i.e: are negative) then
   # this calling this method will fix them using the map from placeholders 
   # to IDs +id_map+. 
-  def fix_placeholders!(id_map)
+  def fix_placeholders!(id_map, placeholder_id = nil)
     self.nds.map! do |node_id|
       if node_id < 0
         new_id = id_map[:node][node_id]
-        raise "invalid placeholder for #{node_id.inspect}: #{new_id.inspect}" if new_id.nil?
+        raise OSM::APIBadUserInput.new("Placeholder node not found for reference #{node_id} in way #{self.id.nil? ? placeholder_id : self.id}") if new_id.nil?
         new_id
       else
         node_id