Actually showing the closest neighbours instead of a fixed number of people within...
authorDan Karran <dan@karran.net>
Thu, 11 Oct 2007 18:47:30 +0000 (18:47 +0000)
committerDan Karran <dan@karran.net>
Thu, 11 Oct 2007 18:47:30 +0000 (18:47 +0000)
app/models/user.rb

index e55f373b7456e7567031c7fcab332f15c76e9f14..2ad45e8acd7d87ae6e63d01583548e3bfe9b9900 100644 (file)
@@ -76,13 +76,13 @@ class User < ActiveRecord::Base
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
       bounds = gc.bounds(radius)
-      nearby = User.find(:all, :conditions => "home_lat between #{bounds[:minlat]} and #{bounds[:maxlat]} and home_lon between #{bounds[:minlon]} and #{bounds[:maxlon]} and data_public = 1 and id != #{self.id}", :limit => num)
+      nearby = User.find(:all, :conditions => "home_lat between #{bounds[:minlat]} and #{bounds[:maxlat]} and home_lon between #{bounds[:minlon]} and #{bounds[:maxlon]} and data_public = 1 and id != #{self.id}")
       nearby.delete_if { |u| gc.distance(u.home_lat, u.home_lon) > radius }
       nearby.sort! { |u1,u2| gc.distance(u1.home_lat, u1.home_lon) <=> gc.distance(u2.home_lat, u2.home_lon) }
     else
       nearby = []
     end
-    return nearby
+    return nearby.first(num)
   end
 
   def distance(nearby_user)