Get rid of foreign_class specification which is no longer needed.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 325ffae4875fd8a53bb14244795d7b6f326f02ff..64b3991336c7d9bf21664f4c0979405550a805ab 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -251,9 +251,9 @@ class Way < ActiveRecord::Base
     # shouldn't be possible to get race conditions.
     Way.transaction do
       check_consistency(self, new_way, user)
     # 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",
+      if RelationMember.find(:first, :joins => :relation,

                              :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.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
       else
         self.changeset_id = new_way.changeset_id
         self.changeset = new_way.changeset


@@ -266,18 +266,6 @@ class Way < ActiveRecord::Base
     end
   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 }
-    end
-
-    return node_ids
-  end
-

   # Temporary method to match interface to nodes
   def tags_as_hash
     return self.tags
   # Temporary method to match interface to nodes
   def tags_as_hash
     return self.tags