From 34d9360bee4c1f277bb908280ca3daa6f3d88aa9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 15 Jul 2008 18:23:00 +0000 Subject: [PATCH] Minor tidyups. --- app/models/node.rb | 7 +++---- app/models/old_way_node.rb | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/node.rb b/app/models/node.rb index d61293e82..cec755f47 100644 --- 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 :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 :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? diff --git a/app/models/old_way_node.rb b/app/models/old_way_node.rb index a6e65da85..7420b5cfc 100644 --- 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 - # Atomic undelete support - belongs_to :way, :foreign_key=> :id + belongs_to :way, :foreign_key=> :id end -- 2.43.2