Only add the data layer to the main map, and use the visibility changed

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index edd755ddb2bbf857f0558020a21d6175c177cf28..bd114a6b36e54c640dc1221261de6ccec5f37e2a 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -21,7 +21,7 @@
 <tr>
 <td colspan="2" align="center">
 Licensed under the Creative Commons Attribution-Share Alike 2.0 license
 <tr>
 <td colspan="2" align="center">
 Licensed under the Creative Commons Attribution-Share Alike 2.0 license

-by the OpenStreetMap project and it's contributors.
+by the OpenStreetMap project and its contributors.

 </td>
 </table>
 </div>
 </td>
 </table>
 </div>


@@ -86,21 +86,23 @@ by the OpenStreetMap project and it's contributors.
   function mapInit(){
     map = createMap("map");
 
   function mapInit(){
     map = createMap("map");
 

+    map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false });
+    map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+    map.addLayer(map.dataLayer);
+

     <% if bbox %>
     <% if bbox %>

-    var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
-    var max = lonLatToMercator(new OpenLayers.LonLat(<%= maxlon %>, <%= maxlat %>));
-    var bbox = new OpenLayers.Bounds(min.lon, min.lat, max.lon, max.lat);
+    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);

 
 

-    map.zoomToExtent(bbox);
+    setMapExtent(bbox);

     <% else %>
     <% else %>

-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);

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

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

     <% end %>
 
     <% if layers %>
     <% end %>
 
     <% if layers %>


@@ -108,7 +110,7 @@ by the OpenStreetMap project and it's contributors.
     <% end %>
 
     <% if marker %>
     <% end %>
 
     <% if marker %>

-    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));

     <% end %>
 
     map.events.register("zoomend", map, updateKey);
     <% end %>
 
     map.events.register("zoomend", map, updateKey);


@@ -120,14 +122,22 @@ by the OpenStreetMap project and it's contributors.
     handleResize();
   }
 
     handleResize();
   }
 

+  function toggleData() {
+    if (map.dataLayer.visibility) {
+      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
+    } else {
+      closeSidebar();
+    }
+  }
+

   function getPosition() {
   function getPosition() {

-    return mercatorToLonLat(map.getCenter());
+    return getMapCenter();

   }
 
   function setPosition(lat, lon, zoom) {
   }
 
   function setPosition(lat, lon, zoom) {

-    var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
+    var centre = new OpenLayers.LonLat(lon, lat);

 
 

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

 
     if (marker)
       removeMarkerFromMap(marker);
 
     if (marker)
       removeMarkerFromMap(marker);


@@ -136,7 +146,7 @@ by the OpenStreetMap project and it's contributors.
   }
 
   function updateLocation() {
   }
 
   function updateLocation() {

-    var lonlat = mercatorToLonLat(map.getCenter());
+    var lonlat = getMapCenter();

     var zoom = map.getZoom();
     var layers = getMapLayers();
 
     var zoom = map.getZoom();
     var layers = getMapLayers();
 


@@ -182,5 +192,9 @@ by the OpenStreetMap project and it's contributors.
 
   window.onload = handleResize;
   window.onresize = handleResize;
 
   window.onload = handleResize;
   window.onresize = handleResize;

+
+  <% if params['action'] == 'export' %>
+  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
+  <% end %>

 // -->
 </script>
 // -->
 </script>