From eeeb13e4e4d67600e02f949cdeec11277a1156db Mon Sep 17 00:00:00 2001 From: Dan Karran Date: Thu, 11 Oct 2007 18:47:30 +0000 Subject: [PATCH] Actually showing the closest neighbours instead of a fixed number of people within the search radius --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index e55f373b7..2ad45e8ac 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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) -- 2.39.5