X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9e6e6c2e231514e7b2eb96dacb0e5cc88fdd2abb..5aa09fbfd069faf1eb04d4be201a6a1f1eca6cd9:/app/views/user/_map.html.erb

diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 6ab713995..c1ef0c6f0 100644
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -13,23 +13,17 @@ else
 end
 %>
 
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.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");
 
@@ -53,7 +47,7 @@ end
       <% nearest = @user.nearby - friends %>
 
       var near_icon = OpenLayers.Marker.defaultIcon();
-      near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";
+      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(),
@@ -62,7 +56,7 @@ end
       <% end %>
 
       var friend_icon = OpenLayers.Marker.defaultIcon();
-      friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png";
+      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(),