more testing of node tags

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

diff --git a/app/models/node.rb b/app/models/node.rb
index b027f2fd49f47bfacab2e9581fa0761c676626d2..c8770922d7b38b1547b6d3f49a05a8f0ab95c546 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,6 +1,8 @@
-class Node < GeoRecord
+class Node < ActiveRecord::Base

   require 'xml/libxml'
 
   require 'xml/libxml'
 

+  include GeoRecord
+

   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp
   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp


@@ -8,21 +10,23 @@ class Node < GeoRecord
   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
+
+  # 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
 

-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
-  end
-

   #
   # Search for nodes matching tags within bounding_box
   #
   #
   # Search for nodes matching tags within bounding_box
   #


@@ -57,7 +61,7 @@ class Node < GeoRecord
       doc = p.parse
 
       doc.find('//osm/node').each do |pt|
       doc = p.parse
 
       doc.find('//osm/node').each do |pt|

-       return Node.from_xml_node(pt, create)
+        return Node.from_xml_node(pt, create)

       end
     rescue
       return nil
       end
     rescue
       return nil


@@ -75,7 +79,7 @@ class Node < GeoRecord
 
     unless create
       if pt['id'] != '0'
 
     unless create
       if pt['id'] != '0'

-       node.id = pt['id'].to_i
+        node.id = pt['id'].to_i

       end
     end
 
       end
     end
 


@@ -85,7 +89,7 @@ class Node < GeoRecord
       node.timestamp = Time.now
     else
       if pt['timestamp']
       node.timestamp = Time.now
     else
       if pt['timestamp']

-       node.timestamp = Time.parse(pt['timestamp'])
+        node.timestamp = Time.parse(pt['timestamp'])

       end
     end
 
       end
     end
 


@@ -109,11 +113,11 @@ class Node < GeoRecord
       tags = self.tags
       NodeTag.delete_all(['id = ?', self.id])
       tags.each do |k,v|
       tags = self.tags
       NodeTag.delete_all(['id = ?', self.id])
       tags.each do |k,v|

-       tag = NodeTag.new
-       tag.k = k 
-       tag.v = v 
-       tag.id = self.id
-       tag.save!
+        tag = NodeTag.new
+        tag.k = k 
+        tag.v = v 
+        tag.id = self.id
+        tag.save!

       end 
 
       # Create an OldNode
       end 
 
       # Create an OldNode