make sure preset menu is removed on deselect

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

diff --git a/app/models/way.rb b/app/models/way.rb
index d0b961123ca729367706c913322b2a147f9c0a3b..45789dabe4bf5c03aff02482f6855678620f2427 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,15 +1,19 @@
 class Way < ActiveRecord::Base
   require 'xml/libxml'
 
 class Way < ActiveRecord::Base
   require 'xml/libxml'
 

+  set_table_name 'current_ways'
+

   belongs_to :user
 
   belongs_to :user
 

-  has_many :nodes, :through => :way_nodes, :order => 'sequence_id'
+  has_many :old_ways, :foreign_key => 'id', :order => 'version'
+

   has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
   has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'

-  has_many :way_tags, :foreign_key => 'id'
+  has_many :nodes, :through => :way_nodes, :order => 'sequence_id'

 
 

-  has_many :old_ways, :foreign_key => 'id', :order => 'version'
+  has_many :way_tags, :foreign_key => 'id'

 
 

-  set_table_name 'current_ways'
+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder

 
   def self.from_xml(xml, create=false)
     begin
 
   def self.from_xml(xml, create=false)
     begin


@@ -210,10 +214,13 @@ class Way < ActiveRecord::Base
   # Delete the way and it's relations, but don't really delete it - set its visibility to false and update the history etc to maintain wiki-like functionality.
   def delete_with_relations_and_history(user)
     if self.visible
   # Delete the way and it's relations, but don't really delete it - set its visibility to false and update the history etc to maintain wiki-like functionality.
   def delete_with_relations_and_history(user)
     if self.visible

-      # omg FIXME
+         # FIXME
+         # this should actually delete the relations,
+         # not just throw a PreconditionFailed if it's a member of a relation!!

       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
                              :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
         raise OSM::APIPreconditionFailedError
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
                              :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
         raise OSM::APIPreconditionFailedError

+      # end FIXME

       else
         self.user_id = user.id
         self.tags = []
       else
         self.user_id = user.id
         self.tags = []


@@ -228,17 +235,10 @@ class Way < ActiveRecord::Base
 
   # delete a way and it's nodes that aren't part of other ways, with history
   def delete_with_relations_and_nodes_and_history(user)
 
   # delete a way and it's nodes that aren't part of other ways, with history
   def delete_with_relations_and_nodes_and_history(user)

-    
-    node_ids = self.nodes.collect {|node| node.id }
-    node_ids_not_to_delete = []
-    way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")
-    
-    node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
-

     node_ids_to_delete = node_ids - node_ids_not_to_delete
 
     # delete the nodes not used by other ways
     node_ids_to_delete = node_ids - node_ids_not_to_delete
 
     # delete the nodes not used by other ways

-    node_ids_to_delete.each do |node_id|
+    self.unshared_node_ids.each do |node_id|

       n = Node.find(node_id)
       n.user_id = user.id
       n.visible = false
       n = Node.find(node_id)
       n.user_id = user.id
       n.visible = false


@@ -248,6 +248,22 @@ class Way < ActiveRecord::Base
     self.user_id = user.id
 
     self.delete_with_relations_and_history(user)
     self.user_id = user.id
 
     self.delete_with_relations_and_history(user)

+  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

   end
 end
   end
 end