X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/acd72861ed8ad46d759a6e509f3e7c459db1a4f5..155ed85bf5b90fc0419289354904a3f9945dda3f:/app/views/user/_map.html.erb?ds=sidebyside
diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 17f4ed344..7c29526cf 100644
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -1,24 +1,5 @@
-
+<% friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? } %>
+<% nearest = @user.nearby - friends %>
<% if @user.home_lat.nil? or @user.home_lon.nil? %>
<% lon = h(params['lon'] || '-0.1') %>
@@ -56,24 +37,29 @@
setMapCenter(centre, zoom);
<% if marker %>
- marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "<%= t 'user.map.your location' %>");
+ marker = addMarkerToMap(
+ new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null,
+ '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
+ );
<% end %>
var near_icon = OpenLayers.Marker.defaultIcon();
- near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";;
- var i = nearest.length;
- while( i-- ) {
- var description = i18n('<%= t 'user.map.nearby mapper'%>', { nearby_user: ''+nearest[i].display_name+'' });
- var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
- }
+ near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";
+ <% nearest.each do |u| %>
+ addMarkerToMap(new OpenLayers.LonLat(
+ <%= u.home_lon %>, <%= u.home_lat %>), near_icon.clone(),
+ '<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "nearby mapper" })) %>'
+ );
+ <% end %>
var friend_icon = OpenLayers.Marker.defaultIcon();
- friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png";;
- var i = friends.length;
- while( i-- ) {
- var description = i18n('<%= t 'user.map.friend'%>', { friend_user: ''+friends[i].display_name+'' });
- var friendmarker = addMarkerToMap(new OpenLayers.LonLat(friends[i].home_lon, friends[i].home_lat), friend_icon.clone(), description);
- }
+ friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png";
+ <% friends.each do |u| %>
+ addMarkerToMap(new OpenLayers.LonLat(
+ <%= u.home_lon %>, <%= u.home_lat %>), friend_icon.clone(),
+ '<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "friend" })) %>'
+ );
+ <% end %>
if (document.getElementById('updatehome')) {
map.events.register("click", map, setHome);
@@ -94,12 +80,13 @@
removeMarkerFromMap(marker);
}
- marker = addMarkerToMap(lonlat, null, "<%= t 'user.map.your location' %>");
+ marker = addMarkerToMap(
+ lonlat, null,
+ '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
+ );
}
}
window.onload = init;
// -->
-
-