Merge potlatch_010 branch to head.

[rails.git] / app / views / export / start.rjs

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index daa56a676d0f139afea081c951653e143f215956..923613c1853cf9609d6b1d6942977a9c8d5a3b4f 100644 (file)
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -229,8 +229,10 @@ page << <<EOJ
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
     var layerName = map.baseLayer.name.toLowerCase();
     var url = "http://#{SERVER_URL}/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName;
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
     var layerName = map.baseLayer.name.toLowerCase();
     var url = "http://#{SERVER_URL}/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName;

-    
+    var markerUrl = "";
+

     if ($("marker_lat").value && $("marker_lon").value) {
     if ($("marker_lat").value && $("marker_lon").value) {

+      markerUrl = "&mlat=" + $("marker_lat").value + "&mlon=" + $("marker_lon").value;

       url += "&marker=" + $("marker_lat").value + "," + $("marker_lon").value;
     } 
     
       url += "&marker=" + $("marker_lat").value + "," + $("marker_lon").value;
     } 
     


@@ -244,7 +246,9 @@ page << <<EOJ
     bounds.transform(epsg4326, epsg900913);
     var zoom = map.getZoomForExtent(bounds);
     
     bounds.transform(epsg4326, epsg900913);
     var zoom = map.getZoomForExtent(bounds);
     

-    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+'">View Larger Map</a></small>';
+    var layers = getMapLayers();
+
+    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+'&layers='+layers+markerUrl+'">View Larger Map</a></small>';

 
     $("export_html_text").value = html;
 
 
     $("export_html_text").value = html;
 


@@ -272,6 +276,7 @@ page << <<EOJ
     if ($("format_osmarender").checked) {
       var zoom = Math.min(map.getZoom(), maxOsmarenderZoom());
 
     if ($("format_osmarender").checked) {
       var zoom = Math.min(map.getZoom(), maxOsmarenderZoom());
 

+      $("osmarender_format").disabled = true;

       $("osmarender_zoom").options.selectedIndex = zoom - 4;
       $("export_osmarender").style.display = "inline";
     } else {
       $("osmarender_zoom").options.selectedIndex = zoom - 4;
       $("export_osmarender").style.display = "inline";
     } else {