X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bf31791f65fee149b660c1395d59204309f906fa..34381e56b7df8478a63403f3244571108cb6e161:/app/models/way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index 52d280209..d37fb1533 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -253,7 +253,7 @@ class Way < ActiveRecord::Base
       check_consistency(self, new_way, user)
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
                              :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.")
+        raise OSM::APIPreconditionFailedError.new("You need to make sure that the way with id: #{self.id} is not a member of a relation.")
       else
         self.changeset_id = new_way.changeset_id
         self.changeset = new_way.changeset
@@ -266,18 +266,6 @@ class Way < ActiveRecord::Base
     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 }
-    end
-
-    return node_ids
-  end
-
   # Temporary method to match interface to nodes
   def tags_as_hash
     return self.tags
@@ -287,11 +275,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