minor changes

diff --git a/app/models/node.rb b/app/models/node.rb
index 2a073f5428d4bd0ab32cea436c888963419a99b4..37143ff00c5883a70daeed8717da9cbe25594776 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -27,6 +27,32 @@ class Node < GeoRecord
     return true
   end
 
     return true
   end
 

+  #
+  # 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
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create=false)
     begin