nicer fix I think for nil / [] issue

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index d89b2962168de9abf414cf6a5586d5bfa5d23960..a2b165e42716f5cfa7f095aa76654616274f95b5 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -9,7 +9,7 @@ class OldWay < ActiveRecord::Base
     old_way.user_id = way.user_id
     old_way.timestamp = way.timestamp
     old_way.id = way.id
     old_way.user_id = way.user_id
     old_way.timestamp = way.timestamp
     old_way.id = way.id

-    old_way.segs = way.segs
+    old_way.nds = way.nds

     old_way.tags = way.tags
     return old_way
   end
     old_way.tags = way.tags
     return old_way
   end


@@ -38,39 +38,50 @@ class OldWay < ActiveRecord::Base
       tag.save!
     end
 
       tag.save!
     end
 

-    i = 0
-    self.segs.each do |n|
-      seg = OldWaySegment.new
-      seg.id = self.id
-      seg.segment_id = n
-      seg.version = self.version
-      seg.save!
+    sequence = 1
+    self.nds.each do |n|
+      nd = OldWayNode.new
+      nd.id = [self.id, self.version, sequence]
+      nd.node_id = n
+      nd.save!
+      sequence += 1

     end
   end
 
     end
   end
 

-  def segs
-    @segs = Array.new unless @segs
-    @segs
+  def nds
+    unless @nds
+        @nds = Array.new
+        OldWayNode.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version], :order => "sequence_id").each do |nd|
+            @nds += [nd.node_id]
+        end
+    end
+    @nds

   end
 
   def tags
   end
 
   def tags

+    unless @tags
+        @tags = Hash.new
+        OldWayTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
+            @tags[tag.k] = tag.v
+        end
+    end

     @tags = Hash.new unless @tags
     @tags
   end
 
     @tags = Hash.new unless @tags
     @tags
   end
 

-  def segs=(s)
-    @segs = s
+  def nds=(s)
+    @nds = s

   end
 
   def tags=(t)
     @tags = t
   end
 
   end
 
   def tags=(t)
     @tags = t
   end
 

-#  has_many :way_segments, :class_name => 'OldWaySegment', :foreign_key => 'id'
+#  has_many :way_nodes, :class_name => 'OldWayNode', :foreign_key => 'id'

 #  has_many :way_tags, :class_name => 'OldWayTag', :foreign_key => 'id'
 
 #  has_many :way_tags, :class_name => 'OldWayTag', :foreign_key => 'id'
 

-  def old_segments
-    OldWaySegment.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+  def old_nodes
+    OldWayNode.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    

   end
 
   def old_tags
   end
 
   def old_tags


@@ -84,9 +95,9 @@ class OldWay < ActiveRecord::Base
     el1['timestamp'] = self.timestamp.xmlschema
     el1['user'] = self.user.display_name if self.user.data_public?
     
     el1['timestamp'] = self.timestamp.xmlschema
     el1['user'] = self.user.display_name if self.user.data_public?
     

-    self.old_segments.each do |seg| # FIXME need to make sure they come back in the right order
-      e = XML::Node.new 'seg'
-      e['id'] = seg.segment_id.to_s
+    self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
+      e = XML::Node.new 'nd'
+      e['ref'] = nd.node_id.to_s

       el1 << e
     end
  
       el1 << e
     end