Tidy up a bit after shaun's merge...

diff --git a/app/models/node.rb b/app/models/node.rb
index 7f9b939db0b5da6a0e9c35762f175c5385e19dca..c8770922d7b38b1547b6d3f49a05a8f0ab95c546 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,5 +1,6 @@
 class Node < ActiveRecord::Base
   require 'xml/libxml'
 class Node < ActiveRecord::Base
   require 'xml/libxml'

+

   include GeoRecord
 
   set_table_name 'current_nodes'
   include GeoRecord
 
   set_table_name 'current_nodes'


@@ -9,14 +10,19 @@ class Node < ActiveRecord::Base
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 

+  belongs_to :user
+

   has_many :old_nodes, :foreign_key => :id
   has_many :old_nodes, :foreign_key => :id

+

   has_many :way_nodes
   has_many :way_nodes

+  has_many :ways, :through => :way_nodes
+

   has_many :node_tags, :foreign_key => :id
   has_many :node_tags, :foreign_key => :id

-  belongs_to :user

   
   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
   
   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?
   end
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 0182845282ebc38f4f5d9f14ec1730a94ae8f468..42f55f2d0fbd6db5ef66390e3bd08a192482ceb3 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,5 +1,6 @@
-class OldNode < ActiveRecord::Base 
-       include GeoRecord
+class OldNode < ActiveRecord::Base
+  include GeoRecord
+

   set_table_name 'nodes'
   
   validates_presence_of :user_id, :timestamp
   set_table_name 'nodes'
   
   validates_presence_of :user_id, :timestamp