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

Reduce number of nearby people listed to the closest 5 by default, and show friends ahead of nearby people.

Browse source
This commit is contained in:
Dan Karran 2007-10-10 19:22:16 +00:00
parent 63bd068f2e
commit 60d8673e30
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -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

32
app/views/user/view.rhtml
View file

@ -27,23 +27,8 @@
You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
<% end %>
<% else %>
Nearby users:<br/>
<% if @this_user.nearby.empty? %>
There are no users who admit to mapping nearby yet.
<% else %>
<table id="nearbyusers">
<% @this_user.nearby.each do |nearby| %>
<tr>
<td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %></td>
<td><%= @this_user.distance(nearby).round %>km away</td>
<td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
</tr>
<%end%>
</table>
<%end%>
<% if @user and @this_user.id == @user.id %>
<br/>
Your friends:<br/>
<% if @this_user.friends.empty? %>
You have not added any friends yet.
@ -59,5 +44,22 @@
<%end%>
</table>
<%end%>
<br/>
<%end%>
Nearby users:<br/>
<% if @this_user.nearby.empty? %>
There are no users who admit to mapping nearby yet.
<% else %>
<table id="nearbyusers">
<% @this_user.nearby.each do |nearby| %>
<tr>
<td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %></td>
<td><%= @this_user.distance(nearby).round %>km away</td>
<td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
</tr>
<%end%>
</table>
<%end%>
<% end %>