X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/16a641ac2a663ea926566a5cca2575ee295e8555..a855d20ba484c35b95412828718e5ca027876cb3:/app/models/way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index e0a445074..121dff8bd 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,6 +1,6 @@
 class Way < ActiveRecord::Base
   require 'xml/libxml'
-  
+
   belongs_to :user
 
   has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
@@ -47,6 +47,17 @@ class Way < ActiveRecord::Base
     return way
   end
 
+  # Find a way given it's ID, and in a single SQL call also grab its nodes
+  #
+  
+  # You can't pull in all the tags too unless we put a sequence_id on the way_tags table and have a multipart key
+  def self.find_eager(id)
+    way = Way.find(id, :include => {:way_nodes => :node})
+    #If waytag had a multipart key that was real, you could do this:
+    #way = Way.find(id, :include => [:way_tags, {:way_nodes => :node}])
+  end
+
+  # Find a way given it's ID, and in a single SQL call also grab its nodes and tags
   def to_xml
     doc = OSM::API.new.get_xml_doc
     doc.root << to_xml_node()
@@ -60,7 +71,7 @@ class Way < ActiveRecord::Base
     el1['timestamp'] = self.timestamp.xmlschema
 
     user_display_name_cache = {} if user_display_name_cache.nil?
-    
+
     if user_display_name_cache and user_display_name_cache.key?(self.user_id)
       # use the cache if available
     elsif self.user.data_public?
@@ -94,7 +105,7 @@ class Way < ActiveRecord::Base
         el1 << e
       end
     end
- 
+
     self.way_tags.each do |tag|
       e = XML::Node.new 'tag'
       e['k'] = tag.k
@@ -106,20 +117,20 @@ class Way < ActiveRecord::Base
 
   def nds
     unless @nds
-        @nds = Array.new
-        self.way_nodes.each do |nd|
-            @nds += [nd.node_id]
-        end
+      @nds = Array.new
+      self.way_nodes.each do |nd|
+        @nds += [nd.node_id]
+      end
     end
     @nds
   end
 
   def tags
     unless @tags
-        @tags = Hash.new
-        self.way_tags.each do |tag|
-            @tags[tag.k] = tag.v
-        end
+      @tags = {}
+      self.way_tags.each do |tag|
+        @tags[tag.k] = tag.v
+      end
     end
     @tags
   end
@@ -169,14 +180,13 @@ class Way < ActiveRecord::Base
 
       WayNode.delete_all(['id = ?', self.id])
 
-      i = 1
+      sequence = 1
       nds.each do |n|
         nd = WayNode.new
-        nd.id = self.id
+        nd.id = [self.id, sequence]
         nd.node_id = n
-        nd.sequence_id = i
         nd.save!
-        i += 1
+        sequence += 1
       end
     end
 
@@ -196,4 +206,58 @@ class Way < ActiveRecord::Base
     return true
   end
 
+  # 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
+      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
+      else
+        self.user_id = user.id
+        self.tags = []
+        self.nds = []
+        self.visible = false
+        self.save_with_history!
+      end
+    else
+      raise OSM::APIAlreadyDeletedError
+    end
+  end
+
+  # delete a way and it's nodes that aren't part of other ways, with history
+  # WARNING, INCOMPLETE - Read the code
+  def delete_with_relations_and_nodes_and_history(user)
+    return false # until complete, just return false
+    
+    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 not #{self.id}")
+    
+    node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
+
+    nodes_to_delete = node_ids - node_ids_not_to_delete
+
+    # update the visibility etc on the current nodes
+    update_time = Time.now()
+    
+    Node.update(node_ids_to_delete, {:user_id = user.id, :timestamp => update_time, :visibility => false})
+
+    # create old nodes
+
+    old_nodes_to_create = []
+    OldNode.find(node_ids_to_delete).each do |old_node|
+      old_nodes_to_create << {:id => old_node.id, :timestamp => update_time, :latitude => old_node.latitude, :longitude => old_node.longitude, :visible => false}
+    end
+
+    OldNode.create(old_nodes_to_create)
+
+    # FIXME - the old nodes need to have their tile updated and I have no idea how that works
+    # they also need their tags copied over, and that depends on normalising the tags out to their own table that nicks working on
+
+    # finally, delete the way
+    
+    self.delete_with_relations_and_history
+
+  end
 end