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

Fixup the user map code to match existing code style

Browse source
This commit is contained in:
Tom Hughes 2011-04-03 16:00:06 +01:00
parent 41589b6ef9
commit 9e6e6c2e23
1 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/views/user/_map.html.erb
View file

@ -35,27 +35,23 @@ end
setMapCenter(centre, zoom); setMapCenter(centre, zoom);
<% <% if marker %>
if marker :
%>
marker = addMarkerToMap( marker = addMarkerToMap(
new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>) new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)
<% if not setting_location : %> <% if not setting_location %>
, null, '<%=escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>' , null, '<%=escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
<% end %> <% end %>
); );
<% <% end %>
end #endif
if setting_location : <% if setting_location %>
# We're setting a location. Register for click events during init map.events.register("click", map, setHome);
%> map.events.register("click", map, setHome); <% <% end %>
end
<% if show_other_users %>
<% friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? } %>
<% nearest = @user.nearby - friends %>
if show_other_users :
friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? }
nearest = @user.nearby - friends
%>
var near_icon = OpenLayers.Marker.defaultIcon(); var near_icon = OpenLayers.Marker.defaultIcon();
near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png"; near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";
<% nearest.each do |u| %> <% nearest.each do |u| %>
@ -63,7 +59,7 @@ end
<%= u.home_lon %>, <%= u.home_lat %>), near_icon.clone(), <%= u.home_lon %>, <%= u.home_lat %>), near_icon.clone(),
'<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "nearby mapper" })) %>' '<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "nearby mapper" })) %>'
); );
<% end #next nearby user %> <% end %>
var friend_icon = OpenLayers.Marker.defaultIcon(); var friend_icon = OpenLayers.Marker.defaultIcon();
friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png"; friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png";
@ -72,14 +68,11 @@ end
<%= u.home_lon %>, <%= u.home_lat %>), friend_icon.clone(), <%= u.home_lon %>, <%= u.home_lat %>), friend_icon.clone(),
'<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "friend" })) %>' '<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "friend" })) %>'
); );
<% <% end %>
end #next friend <% end %>
end #endif
%>
} }
<% if setting_location : %> <% if setting_location %>
function setHome( e ) { function setHome( e ) {
closeMapPopup(); closeMapPopup();
@ -97,7 +90,6 @@ end
marker = addMarkerToMap(lonlat); marker = addMarkerToMap(lonlat);
} }
} }
<% end %> <% end %>
window.onload = init; window.onload = init;