X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/48918f19dc0214a1e9bf731fe72d34a2c68383db..a1378a6bd4cdeca537856650e6ea7321ae6eca26:/app/views/export/start.rjs

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 7a323b05b..2d3ec06ec 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -25,8 +25,6 @@ page << <<EOJ
 
     openSidebar({ onclose: stopExport });
 
-    setBounds(map.getExtent());
-
     if (map.baseLayer.name == "Mapnik") {
       $("format_mapnik").checked = true;
     } else if (map.baseLayer.name == "Osmarender") {
@@ -34,6 +32,7 @@ page << <<EOJ
     }
 
     formatChanged();
+    setBounds(map.getExtent());
 
     $("viewanchor").className = "";
     $("exportanchor").className = "active";
@@ -64,6 +63,7 @@ page << <<EOJ
     drawBox(bounds);
 
     validateControls();
+    mapnikSizeChanged();
   }
 
   $("maxlat").onchange = boundsChanged;
@@ -107,6 +107,8 @@ page << <<EOJ
     $("minlat").value = Math.round(bounds.bottom * decimals) / decimals;
     $("maxlon").value = Math.round(bounds.right * decimals) / decimals;
     $("maxlat").value = Math.round(bounds.top * decimals) / decimals;
+
+    mapnikSizeChanged();
   }
 
   function clearBox() {
@@ -129,13 +131,18 @@ page << <<EOJ
     } else {
       $("format_osm").disabled = false;
     }
-    
-    var max_zoom = maxOsmarenderZoom();
+
     var max_scale = maxMapnikScale();
 
-    $("mapnik_max_scale").innerHTML = roundScale(max_scale);
+    if ($("format_mapnik").checked && $("mapnik_scale").value < max_scale) {
+      $("export_commit").disabled = true;
+    } else {
+      $("export_commit").disabled = false;
+    }
 
-    mapnikScaleChanged();
+    $("mapnik_max_scale").innerHTML = roundScale(max_scale);
+  
+    var max_zoom = maxOsmarenderZoom();
 
     for (var o = 0; o < $("osmarender_zoom").options.length; o++) {
       var option = $("osmarender_zoom").options[o];
@@ -162,8 +169,6 @@ page << <<EOJ
     if ($("format_mapnik").checked) {
       $("mapnik_scale").value = roundScale(map.getScale());
       $("export_mapnik").style.display = "inline";
-
-      mapnikScaleChanged();
     } else {
       $("export_mapnik").style.display = "none";
     }
@@ -176,6 +181,8 @@ page << <<EOJ
     } else {
       $("export_osmarender").style.display = "none";
     }
+
+    validateControls();
   }
 
   $("format_osm").onclick = formatChanged;
@@ -228,12 +235,7 @@ page << <<EOJ
 
   function mapnikScaleChanged() {
     mapnikSizeChanged();
-
-    if ($("mapnik_scale").value < maxMapnikScale()) {
-      $("export_commit").disabled = true;
-    } else {
-      $("export_commit").disabled = false;
-    }
+    validateControls();
   }
 
   $("mapnik_scale").onchange = mapnikScaleChanged;