Set required Flash version to 10.1.x per request of RichardF

[rails.git] / app / views / site / index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index e268d5d3c8ea4076b3844e1b019a0ae10b081926..9102214afb54190953150739b59017bf5c22ed22 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -144,18 +144,18 @@ end
       <% if bbox %>
         var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
       <% if bbox %>
         var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 

-        map.setExtent(proj(bbox));
+        map.zoomToExtent(proj(bbox));

 
         <% if box %>
           $(window).load(function() { addBoxToMap(bbox) });
         <% end %>
       <% else %>
         var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
 
         <% if box %>
           $(window).load(function() { addBoxToMap(bbox) });
         <% end %>
       <% else %>
         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 and params[:scale].to_f > 0 then %>
-            zoom = <%= Math.log(360.0 / (params[:scale].to_f * 512.0)) / Math.log(2.0) %>;
-        <% end %>
+        <% end -%>

 
         setMapCenter(centre, zoom);
       <% end %>
 
         setMapCenter(centre, zoom);
       <% end %>


@@ -200,7 +200,7 @@ end
     if (min_lon && min_lat && max_lon && max_lat) {
       var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
 
     if (min_lon && min_lat && max_lon && max_lat) {
       var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
 

-      map.setExtent(proj(bbox));
+      map.zoomToExtent(proj(bbox));

     } else {
       setMapCenter(centre, zoom);
     }
     } else {
       setMapCenter(centre, zoom);
     }