X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/03f733c4f4091dc53e391aa74a020681af98a4ff..f77a3c75bee528caaa6fc8e237ee6eaef704efe0:/app/views/user/_map.html.erb diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb index 7c29526cf..6ab713995 100644 --- a/app/views/user/_map.html.erb +++ b/app/views/user/_map.html.erb @@ -1,18 +1,17 @@ -<% 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') %> - <% lat = h(params['lat'] || '51.5') %> - <% zoom = h(params['zoom'] || '4') %> -<% else %> - <% marker = true %> - <% mlon = @user.home_lon %> - <% mlat = @user.home_lat %> - <% lon = @user.home_lon %> - <% lat = @user.home_lat %> - <% zoom = '12' %> -<% end %> +<% +if @user.home_lat.nil? or @user.home_lon.nil? + lon = h(params['lon'] || '0') + lat = h(params['lat'] || '20') + zoom = h(params['zoom'] || '1') +else + marker = true + mlon = @user.home_lon + mlat = @user.home_lat + lon = @user.home_lon + lat = @user.home_lat + zoom = '12' +end +%> <%= javascript_include_tag '/openlayers/OpenLayers.js' %> <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> @@ -38,34 +37,42 @@ <% if marker %> marker = addMarkerToMap( - new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, - '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>' + new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>) + <% if not setting_location %> + , null, '<%=escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>' + <% end %> ); <% end %> - - var near_icon = OpenLayers.Marker.defaultIcon(); - 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" })) %>' - ); + + <% if setting_location %> + map.events.register("click", map, setHome); <% end %> - - var friend_icon = OpenLayers.Marker.defaultIcon(); - 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" })) %>' - ); + + <% 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(); + 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"; + <% 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 %> <% end %> - - if (document.getElementById('updatehome')) { - map.events.register("click", map, setHome); - } } + <% if setting_location %> function setHome( e ) { closeMapPopup(); @@ -80,12 +87,10 @@ removeMarkerFromMap(marker); } - marker = addMarkerToMap( - lonlat, null, - '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>' - ); + marker = addMarkerToMap(lonlat); } } + <% end %> window.onload = init; // -->