X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e799022131f3e833179e9058060ec5e136ed2edd..b465917259e790ed9274d362ebae9d10d2711527:/app/models/old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 6682c644a..a2b165e42 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -5,15 +5,16 @@ class OldWay < ActiveRecord::Base
 
   def self.from_way(way)
     old_way = OldWay.new
+    old_way.visible = way.visible
     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
 
-  def save_with_dependencies
+  def save_with_dependencies!
 
     # dont touch this unless you really have figured out why it's called
     # (Rails doesn't deal well with the old ways table (called 'ways') because
@@ -21,7 +22,7 @@ class OldWay < ActiveRecord::Base
     # id and get it back but we have that and we want to get the 'version' back
     # we could add another column but thats a lot of data. No, set_primary_key
     # doesn't work either.
-    save()
+    save!
     clear_aggregation_cache
     clear_association_cache
     @attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
@@ -34,42 +35,53 @@ class OldWay < ActiveRecord::Base
       tag.v = v
       tag.id = self.id
       tag.version = self.version
-      tag.save
+      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
 
-  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
+    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
 
-  def segs=(s)
-    @segs = s
+  def nds=(s)
+    @nds = s
   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'
 
-  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
@@ -81,10 +93,11 @@ class OldWay < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     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