Update to use libxml 1.0.0 gem.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 2a073f5428d4bd0ab32cea436c888963419a99b4..af88a117d83879ef0eb21d438a11d211cb670dc7 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,8 +1,8 @@
-# The node model represents a current existing node, that is, the latest version. Use OldNode for historical nodes.
-
-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


@@ -10,28 +10,54 @@ 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

-  belongs_to :user
- 
+  has_many :ways, :through => :way_nodes
+
+  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?
   end
 
   # 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
 

-  # Is this node withing -90 > latitude > 90 and -180 > longitude > 180>
-  # * returns true/false
-  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
+  #
+  # Search for nodes matching tags within bounding_box
+  #
+  # Also adheres to limitations such as within max_number_of_nodes
+  #
+  def self.search(bounding_box, tags = {})
+    min_lon, min_lat, max_lon, max_lat = *bounding_box
+    # @fixme a bit of a hack to search for only visible nodes
+    # couldn't think of another to add to tags condition
+    #conditions_hash = tags.merge({ 'visible' => 1 })
+  
+    # using named placeholders http://www.robbyonrails.com/articles/2005/10/21/using-named-placeholders-in-ruby
+    #keys = []
+    #values = {}
+
+    #conditions_hash.each do |key,value|
+    #  keys <<  "#{key} = :#{key}"
+    #  values[key.to_sym] = value
+    #end 
+    #conditions = keys.join(' AND ')
+ 
+    find_by_area(min_lat, min_lon, max_lat, max_lon,
+                    :conditions => 'visible = 1',
+                    :limit => APP_CONFIG['max_number_of_nodes']+1)  

   end
 
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create=false)
     begin
   end
 
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create=false)
     begin

-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)

       doc = p.parse
   
       node = Node.new
       doc = p.parse
   
       node = Node.new