move potlatch presets to only be generated once, and allow pulling in way_tags in...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index ff2e643709b24bf2a2c9a423b208e52701e6a812..2c9ce9f72d06e0560632953a1fafd9b069ff26b6 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -49,9 +49,10 @@ class Way < ActiveRecord::Base
 
   # 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})
+    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
@@ -177,14 +178,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