When the area selected for export is too large to be downloaded from

the API then disable the export button and display a message rather
than forcibly disabling that export option. Closes #1996.

diff --git a/app/views/export/_start.html.erb b/app/views/export/_start.html.erb
index 9e3d6478363a1246d0095180d90b75353eb0243f..d541aae8b40fe819ae370f944cf624c31faf3834 100644 (file)
--- a/app/views/export/_start.html.erb
+++ b/app/views/export/_start.html.erb
@@ -34,6 +34,14 @@
     <div class="export_details">
       <p><%= t'export.start.export_details' %></p>
     </div>
     <div class="export_details">
       <p><%= t'export.start.export_details' %></p>
     </div>

+
+    <div  id="export_osm_too_large">
+      <p class="export_heading"><%= t'export.start.too_large.heading' %></p>
+
+      <div class="export_details">
+        <p><%= t'export.start.too_large.body' %></p>
+      </div
+    </div>

   </div>
 
   <div id="export_mapnik">
   </div>
 
   <div id="export_mapnik">


@@ -57,6 +65,7 @@
   
   <div id="export_html">
     <p class="export_heading"><%= t'export.start.options' %></p>
   
   <div id="export_html">
     <p class="export_heading"><%= t'export.start.options' %></p>

+

     <div class="export_details">
       <p><a id="add_marker" href="#"><%= t'export.start.add_marker' %></a></p>
       <p id="marker_inputs" style="display:none">
     <div class="export_details">
       <p><a id="add_marker" href="#"><%= t'export.start.add_marker' %></a></p>
       <p id="marker_inputs" style="display:none">


@@ -66,6 +75,7 @@
     </div>
 
     <p class="export_heading"><%= t'export.start.output' %></p>
     </div>
 
     <p class="export_heading"><%= t'export.start.output' %></p>

+

     <div class="export_details">
       <p><input type="text" id="export_html_text" style="width:95%" /></p>
       <p><%= t'export.start.paste_html' %></p>
     <div class="export_details">
       <p><input type="text" id="export_html_text" style="width:95%" /></p>
       <p><%= t'export.start.paste_html' %></p>

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 3c672204459f5fc0681a69a4e30609ed41658415..d556d8bf9ef0c64c1c5a6eafb7077df260b8e4ca 100644 (file)
--- 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']}) {
     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 {
     } else {

-      $("format_osm").disabled = false;
+      $("export_osm_too_large").style.display = "none";

     }
 
     var max_scale = maxMapnikScale();
 
     }
 
     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;
       $("export_commit").disabled = true;
     } else {
       $("export_commit").disabled = false;

diff --git a/config/locales/en.yml b/config/locales/en.yml
index baff12f9ec79b53e743c120a543eb39d65a92167..64690965d066860504aca76e88b8fdcfe8b77fd6 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -362,6 +362,9 @@ en:
       embeddable_html: "Embeddable HTML"
       licence: "Licence"
       export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
       embeddable_html: "Embeddable HTML"
       licence: "Licence"
       export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'

+      too_large:
+        heading: "Area Too Large"
+        body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area."

       options: "Options"
       format: "Format"
       scale: "Scale"
       options: "Options"
       format: "Format"
       scale: "Scale"