From: Steve Coast <steve@asklater.com>
Date: Mon, 27 Nov 2006 12:33:20 +0000 (+0000)
Subject: way stuff, now creates correctly
X-Git-Tag: live~8573
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0638eefe22586b9e9f20448e99bfe9a37f3b1540

way stuff, now creates correctly
---

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 820437fce..db0108ea8 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -14,15 +14,15 @@ class OldWay < ActiveRecord::Base
   end
 
   def save_with_dependencies
-    t = Time.now
-    self.timestamp = t
-    self.save
-    
+    save()
+    self.reload()
+
     self.tags.each do |k,v|
       tag = OldWayTag.new
       tag.k = k
       tag.v = v
       tag.id = self.id
+      tag.version = self.version
       tag.save
     end
 
@@ -31,13 +31,9 @@ class OldWay < ActiveRecord::Base
       seg = OldWaySegment.new
       seg.id = self.id
       seg.segment_id = n
-      seg.sequence_id = i
+      seg.version = self.version
       seg.save
-      i += 1
     end
-
-    old_way = OldWay.from_way(self)
-    old_way.save
   end
 
   def segs
diff --git a/app/models/old_way_segment.rb b/app/models/old_way_segment.rb
index 4f96f7469..45d1ce009 100644
--- a/app/models/old_way_segment.rb
+++ b/app/models/old_way_segment.rb
@@ -1,2 +1,6 @@
 class OldWaySegment < ActiveRecord::Base
+  belongs_to :user
+
+  set_table_name 'way_segments'
+
 end
diff --git a/app/models/old_way_tag.rb b/app/models/old_way_tag.rb
index 7fe61968f..b02fd45b9 100644
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -1,2 +1,6 @@
 class OldWayTag < ActiveRecord::Base
+  belongs_to :user
+
+  set_table_name 'way_tags'
+
 end
diff --git a/app/models/way.rb b/app/models/way.rb
index 55b953ce9..a87244563 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -121,6 +121,7 @@ class Way < ActiveRecord::Base
     end
 
     old_way = OldWay.from_way(self)
+    old_way.timestamp = t
     old_way.save_with_dependencies
   end