X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/63bd068f2ed5027485dff791ab44e31fbdaf4052..60d8673e3027ea672f50bb12873a440d46195ff3:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index c4b81e7ab..e55f373b7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -72,11 +72,11 @@ class User < ActiveRecord::Base return el1 end - def nearby(radius = 50) + def nearby(radius = 50, num = 5) 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}") + 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.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