X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/41589b6ef95e99ee1ff503a47501ff37c050581f..0d34f27fd525def32c8809f0433f42132bd99c5e:/app/views/user/_map.html.erb

diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 8947b05c1..a142e99b9 100644
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -13,73 +13,63 @@ else
 end
 %>
 
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
   <!--
   var marker;
 
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   function init(){
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
+    <% if params[:scale].to_f > 0 then -%>
+    var zoom = <%= scale_to_zoom params[:scale] %>;
+    <% else -%>
     var zoom = <%= zoom %>;
-
-    <% if params['scale'] and params['scale'].length > 0 then %>
-    zoom = scaleToZoom(<%= params['scale'].to_f() %>);
-    <% end %>
+    <% end -%>
 
     var map = createMap("map");
 
     setMapCenter(centre, zoom);
 
-    <%
-    if marker :
-    %>
+    <% if marker %>
     marker = addMarkerToMap(
       new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)
-      <% if not setting_location : %>
-          , null, '<%=escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
+      <% if not setting_location %>
+        , null, '<%=escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
       <% end %>
     );
-    <%
-    end #endif
+    <% end %>
     
-    if setting_location :
-      # We're setting a location. Register for click events during init
-      %> map.events.register("click", map, setHome); <%
-    end
+    <% if setting_location %>
+    map.events.register("click", map, setHome);
+    <% 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 
-    %>
-    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  #next nearby user %>
-
-    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  #next friend
-    end #endif
-    %>
+    <% 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.getImageLocation("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.getImageLocation("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 setting_location : %>
+  <% if setting_location %>
   function setHome( e ) { 
     closeMapPopup();
 
@@ -97,7 +87,6 @@ end
       marker = addMarkerToMap(lonlat);
     }
   }
-  
   <% end %>
 
   window.onload = init;