Combine the address and netmask for an ACL in one column

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

diff --git a/app/models/old_way_node.rb b/app/models/old_way_node.rb
index 7420b5cfc6de874fff207e65571eda62f4e9a7ae..b613be0b4b80b6c79e0ceb8006034650ab24adb8 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -1,7 +1,9 @@
 class OldWayNode < ActiveRecord::Base
   set_table_name 'way_nodes'
+  set_primary_keys :way_id, :version, :sequence_id
 
-  set_primary_keys :id, :version, :sequence_id
-
-  belongs_to :way, :foreign_key=> :id
+  belongs_to :old_way, :foreign_key => [:way_id, :version]
+  # A bit messy, referring to current nodes and ways, should do for the data browser for now
+  belongs_to :node
+  belongs_to :way
 end