cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimise the finding of nearby users a bit.

Browse source
This commit is contained in:
Tom Hughes 2009-06-05 08:27:45 +00:00
parent 7669d55f6f
commit 857eeae8b2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -99,12 +99,12 @@ class User < ActiveRecord::Base
gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
bounds = gc.bounds(radius)
nearby = User.find(:all, :conditions => ["visible = ? and home_lat between #{bounds[:minlat]} and #{bounds[:maxlat]} and home_lon between #{bounds[:minlon]} and #{bounds[:maxlon]} and data_public = ? and id != #{self.id}", true, true])
nearby = nearby.sort_by { |u| gc.distance(u.home_lat, u.home_lon) }.first(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
nearby = []
end
return nearby.first(num)
return nearby
end
def distance(nearby_user)