Minor tidyups.

diff --git a/app/models/node.rb b/app/models/node.rb
index d61293e82203c6de2d0ce11b8350c67a4895114d..cec755f4765bfc35e9679256934512be093f74da 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -17,13 +17,12 @@ class Node < ActiveRecord::Base
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
 

-  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
-
-  # Atomic undelete support

   has_many :old_way_nodes
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
 
   has_many :old_way_nodes
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
 

+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+

   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?

diff --git a/app/models/old_way_node.rb b/app/models/old_way_node.rb
index a6e65da852ebd73225d27a01d8eaadd231c24274..7420b5cfc6de874fff207e65571eda62f4e9a7ae 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -3,6 +3,5 @@ class OldWayNode < ActiveRecord::Base
 
   set_primary_keys :id, :version, :sequence_id
 
 
   set_primary_keys :id, :version, :sequence_id
 

-   # Atomic undelete support
-   belongs_to :way, :foreign_key=> :id
+  belongs_to :way, :foreign_key=> :id

 end
 end