X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a8c7d1c4ce7b0b11eda847947a50dadcbee75cae..160429e62d88810ec49ccc9c504edee675dca080:/app/views/export/start.rjs?ds=inline

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index c146e236d..d556d8bf9 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -191,16 +191,16 @@ page << <<EOJ
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
 
     if (bounds.getWidth() * bounds.getHeight() > #{APP_CONFIG['max_request_area']}) {
-      $("format_osm").disabled = true;
-      $("format_osm").checked = false;
-      $("export_osm").style.display = "none";
+      $("export_osm_too_large").style.display = "block";
     } else {
-      $("format_osm").disabled = false;
+      $("export_osm_too_large").style.display = "none";
     }
 
     var max_scale = maxMapnikScale();
 
-    if ($("format_mapnik").checked && $("mapnik_scale").value < max_scale) {
+    if ($("format_osm").checked && bounds.getWidth() * bounds.getHeight() > #{APP_CONFIG['max_request_area']}) {
+      $("export_commit").disabled = true;
+    } else if ($("format_mapnik").checked && $("mapnik_scale").value < max_scale) {
       $("export_commit").disabled = true;
     } else {
       $("export_commit").disabled = false;
@@ -248,7 +248,7 @@ page << <<EOJ
     
     var layers = getMapLayers();
 
-    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+'&layers='+layers+markerUrl+'">'+"#{I18n.t('export.start_rjs.view_larger_map')}"+'</a></small>';
+    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+'&layers='+layers+markerUrl+'">'+"#{html_escape_unicode(I18n.t('export.start_rjs.view_larger_map'))}"+'</a></small>';
 
     $("export_html_text").value = html;