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

When two users are <1 km apart display the distance between them in

Browse source 
meters, not kilometers.

Solves ticket:2028
This commit is contained in:
Ævar Arnfjörð Bjarmason 2009-07-04 21:35:09 +00:00
parent 671fc09bfc
commit a08215633c
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/views/user/view.html.erb
View file

@ -71,7 +71,16 @@
<% end %>
</td>
<td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view', :display_name => @friend.display_name %></td>
<td><% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :count => @this_user.distance(@friend).round %><% end %></td>
<td>
<% if @friend.home_lon and @friend.home_lat %>
<% distance = @this_user.distance(@friend) %>
<% if distance < 1 %>
<%= t 'user.view.m away', :count => (distance * 1000).round %>
<% else %>
<%= t 'user.view.km away', :count => distance.round %>
<% end %>
<% end %>
</td>
<td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
</tr>
<%end%>
@ -93,7 +102,14 @@
<% @this_user.nearby.each do |nearby| %>
<tr>
<td class="username"><%= link_to h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %></td>
<td><%= t 'user.view.km away', :count => @this_user.distance(nearby).round %></td>
<td>
<% distance = @this_user.distance(nearby) %>
<% if distance < 1 %>
<%= t 'user.view.m away', :count => (distance * 1000).round %>
<% else %>
<%= t 'user.view.km away', :count => distance.round %>
<% end %>
</td>
<td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
</tr>
<% end %>