adds two migrations to create old_node_tags and node_tags table and indexes. Does...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index bb99ba33e36e468bb214006637cb7b1da494f57d..1fe628171c9f91eefc47c050e70efb773e6715b7 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'


@@ -37,7 +37,7 @@ class Way < ActiveRecord::Base
         end
 
         pt.find('nd').each do |nd|
         end
 
         pt.find('nd').each do |nd|

-          way.add_nd_num(nd['id'])
+          way.add_nd_num(nd['ref'])

         end
       end
     rescue
         end
       end
     rescue


@@ -47,6 +47,14 @@ 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})
+  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 +68,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?


@@ -90,11 +98,11 @@ class Way < ActiveRecord::Base
     ordered_nodes.each do |nd_id|
       if nd_id and nd_id != '0'
         e = XML::Node.new 'nd'
     ordered_nodes.each do |nd_id|
       if nd_id and nd_id != '0'
         e = XML::Node.new 'nd'

-        e['id'] = nd_id
+        e['ref'] = nd_id

         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 +114,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


@@ -142,49 +150,46 @@ class Way < ActiveRecord::Base
     @tags[k] = v
   end
 
     @tags[k] = v
   end
 

-  def save_with_history
-    begin
-      Way.transaction do
-        t = Time.now
-        self.timestamp = t
-        self.save!
+  def save_with_history!
+    t = Time.now

 
 

-        tags = self.tags
+    Way.transaction do
+      self.timestamp = t
+      self.save!
+    end

 
 

-        WayTag.delete_all(['id = ?', self.id])
+    WayTag.transaction do
+      tags = self.tags

 
 

-        tags.each do |k,v|
-          tag = WayTag.new
-          tag.k = k
-          tag.v = v
-          tag.id = self.id
-          tag.save!
-        end
+      WayTag.delete_all(['id = ?', self.id])

 
 

-        nds = self.nds
+      tags.each do |k,v|
+        tag = WayTag.new
+        tag.k = k
+        tag.v = v
+        tag.id = self.id
+        tag.save!
+      end
+    end

 
 

-        WayNode.delete_all(['id = ?', self.id])
+    WayNode.transaction do
+      nds = self.nds

 
 

-        i = 1
-        nds.each do |n|
-          nd = WayNode.new
-          nd.id = self.id
-          nd.node_id = n
-          nd.sequence_id = i
-          nd.save!
-          i += 1
-        end
+      WayNode.delete_all(['id = ?', self.id])

 
 

-        old_way = OldWay.from_way(self)
-        old_way.timestamp = t
-        old_way.save_with_dependencies!
+      sequence = 1
+      nds.each do |n|
+        nd = WayNode.new
+        nd.id = [self.id, sequence]
+        nd.node_id = n
+        nd.save!
+        sequence += 1

       end
       end

-
-      return true
-    rescue => ex
-      puts ex
-      return nil

     end
     end

+
+    old_way = OldWay.from_way(self)
+    old_way.timestamp = t
+    old_way.save_with_dependencies!

   end
 
   def preconditions_ok?
   end
 
   def preconditions_ok?