X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/150ae0610421d6ae50f8eff23ed9b03f1e4f3830:/app/views/user/_friend_map.html.erb..acd72861ed8ad46d759a6e509f3e7c459db1a4f5:/app/views/user/_map.html.erb

diff --git a/app/views/user/_friend_map.html.erb b/app/views/user/_map.html.erb
similarity index 58%
rename from app/views/user/_friend_map.html.erb
rename to app/views/user/_map.html.erb
index a73bb53b8..17f4ed344 100644
--- a/app/views/user/_friend_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -1,14 +1,23 @@
-<% nearest_str = "" %>
-<% if !@user.home_lat.nil? and !@user.home_lon.nil? %>
-  <% if !@user.nearby.empty? %>
-    <% @user.nearby.each do |nearby| %>
-    <% nearest_str += "nearest.push( { 'display_name' : '#{escape_javascript(nearby.display_name)}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %>
+<script type="text/javascript">
+  var nearest = [], friends = [];
+  <% friends = @user.friends.collect { |f| f.befriendee } %>
+  <% friends.each do |friend| %>
+    <% if !friend.home_lat.nil? and !friend.home_lon.nil? %>
+      friends.push({
+        display_name : "<%= escape_javascript(friend.display_name) %>",
+        home_lat : <%= friend.home_lat %>,
+        home_lon : <%= friend.home_lon %>
+      });
     <% end %>
   <% end %>
-<% end %>
-<script type="text/javascript">
-    var nearest = [], friends = [];
-    <%= nearest_str %>
+  <% nearest = @user.nearby - friends %>
+  <% nearest.each do |nearby| %>
+    nearest.push({
+      display_name : "<%= escape_javascript(nearby.display_name) %>",
+      home_lat : <%= nearby.home_lat %>,
+      home_lon : <%= nearby.home_lon %>
+    });
+  <% end %>
 </script>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
@@ -47,17 +56,25 @@
     setMapCenter(centre, zoom);
 
     <% if marker %>
-    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "<%= t 'user.friend_map.your location' %>");
+    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "<%= t 'user.map.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.friend_map.nearby mapper'%>', { nearby_user: '<a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>' });
+      var description = i18n('<%= t 'user.map.nearby mapper'%>', { nearby_user: '<a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>' });
       var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
     }
 
+    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: '<a href="/user/'+friends[i].display_name+'">'+friends[i].display_name+'</a>' });
+      var friendmarker = addMarkerToMap(new OpenLayers.LonLat(friends[i].home_lon, friends[i].home_lat), friend_icon.clone(), description);
+    }
+
     if (document.getElementById('updatehome')) {
       map.events.register("click", map, setHome);
     }
@@ -77,7 +94,7 @@
         removeMarkerFromMap(marker);
       }
 
-      marker = addMarkerToMap(lonlat, null, "<%= t 'user.friend_map.your location' %>");
+      marker = addMarkerToMap(lonlat, null, "<%= t 'user.map.your location' %>");
     }
   }