dont eager load tags (false primary key fucks all sorts of things up) and move delete...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index e0a4450741202b2ed5f39e9c6a672f9abb1f8a48..924fffe5c84b99775a37fec5b116f5d9a0ec4ec0 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,6 +1,6 @@
 class Way < ActiveRecord::Base
   require 'xml/libxml'
 class Way < ActiveRecord::Base
   require 'xml/libxml'

-  
+

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


@@ -47,6 +47,17 @@ class Way < ActiveRecord::Base
     return way
   end
 
     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()
   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?
     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?
     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
         el1 << e
       end
     end

- 
+

     self.way_tags.each do |tag|
       e = XML::Node.new 'tag'
       e['k'] = tag.k
     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
 
   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
     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
     end
     @tags
   end


@@ -169,14 +180,13 @@ class Way < ActiveRecord::Base
 
       WayNode.delete_all(['id = ?', self.id])
 
 
       WayNode.delete_all(['id = ?', self.id])
 

-      i = 1
+      sequence = 1

       nds.each do |n|
         nd = WayNode.new
       nds.each do |n|
         nd = WayNode.new

-        nd.id = self.id
+        nd.id = [self.id, sequence]

         nd.node_id = n
         nd.node_id = n

-        nd.sequence_id = i

         nd.save!
         nd.save!

-        i += 1
+        sequence += 1

       end
     end
 
       end
     end
 


@@ -196,4 +206,22 @@ class Way < ActiveRecord::Base
     return true
   end
 
     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

 end
 end