Use correct names for member types.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 99024f176589009088d3d5fb02782d2946f48ab3..54f28172739f2521a33a6dfd4bddc098eb3b4230 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -45,6 +45,7 @@ if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat
        minlat = h(params['minlat'])
        maxlon = h(params['maxlon'])
        maxlat = h(params['maxlat'])
        minlat = h(params['minlat'])
        maxlon = h(params['maxlon'])
        maxlat = h(params['maxlat'])

+       box = true if params['box']=="yes" 

 end
 
 # Decide on a lat lon to initialise the map with. Various ways of doing this
 end
 
 # Decide on a lat lon to initialise the map with. Various ways of doing this


@@ -109,13 +110,17 @@ end
     var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
     setMapExtent(bbox);
     var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
     setMapExtent(bbox);

+    <%    if box %>
+    // IE requires Vector layers be initialised on page load, and not under deferred script conditions
+    Event.observe(window, 'load', function() {addBoxToMap(bbox)});
+    <%    end %>

     <% else %>
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;
 
     <% else %>
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;
 

-    <% if params['scale'] and params['scale'].length > 0 then %>
+    <%    if params['scale'] and params['scale'].length > 0 then %>

     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);

-    <% end %>
+    <%    end %>

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


@@ -164,8 +169,9 @@ end
     var lonlat = getMapCenter();
     var zoom = map.getZoom();
     var layers = getMapLayers();
     var lonlat = getMapCenter();
     var zoom = map.getZoom();
     var layers = getMapLayers();

+    var extents = getMapExtent();

 
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents);

 
     document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;
   }
 
     document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;
   }