Add notice about upcoming downtime

[rails.git] / app / views / user / _map.html.erb

diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 6ab7139956a10854dcb9662baaa682e2dc148de3..2d886527ccf437c2c2b0e5285af2776b9ef82a1f 100644 (file)
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -13,8 +13,7 @@ else
 end
 %>
 
 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">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">


@@ -25,11 +24,11 @@ end
 
   function init(){
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
 
   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 %>;
     var zoom = <%= zoom %>;

-
-    <% if params['scale'] and params['scale'].length > 0 then %>
-    zoom = scaleToZoom(<%= params['scale'].to_f() %>);
-    <% end %>
+    <% end -%>

 
     var map = createMap("map");
 
 
     var map = createMap("map");
 


@@ -53,7 +52,7 @@ end
       <% nearest = @user.nearby - friends %>
 
       var near_icon = OpenLayers.Marker.defaultIcon();
       <% 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(),
       <% nearest.each do |u| %>
         addMarkerToMap(new OpenLayers.LonLat(
           <%= u.home_lon %>, <%= u.home_lat %>), near_icon.clone(),


@@ -62,7 +61,7 @@ end
       <% end %>
 
       var friend_icon = OpenLayers.Marker.defaultIcon();
       <% 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(),
       <% friends.each do |u| %>
         addMarkerToMap(new OpenLayers.LonLat(
           <%= u.home_lon %>, <%= u.home_lat %>), friend_icon.clone(),