Merge remote-tracking branch 'upstream/pull/5138'

[rails.git] / app / assets / javascripts / index / export.js

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index fd658c53236922e1125ce55cdc6af2901acd8651..a953920f895d8fe62cefafdd3927f90f040ea62d 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -1,4 +1,4 @@
-OSM.Export = function(map) {
+OSM.Export = function (map) {

   var page = {};
 
   var locationFilter = new L.LocationFilter({
   var page = {};
 
   var locationFilter = new L.LocationFilter({


@@ -36,16 +36,16 @@ OSM.Export = function(map) {
   }
 
   function setBounds(bounds) {
   }
 
   function setBounds(bounds) {

-    var precision = zoomPrecision(map.getZoom());
+    var precision = OSM.zoomPrecision(map.getZoom());

     $("#minlon").val(bounds.getWest().toFixed(precision));
     $("#minlat").val(bounds.getSouth().toFixed(precision));
     $("#maxlon").val(bounds.getEast().toFixed(precision));
     $("#maxlat").val(bounds.getNorth().toFixed(precision));
 
     $("#export_overpass").attr("href",
     $("#minlon").val(bounds.getWest().toFixed(precision));
     $("#minlat").val(bounds.getSouth().toFixed(precision));
     $("#maxlon").val(bounds.getEast().toFixed(precision));
     $("#maxlat").val(bounds.getNorth().toFixed(precision));
 
     $("#export_overpass").attr("href",

-        "http://overpass-api.de/api/map?bbox=" +
-        $("#minlon").val() + "," + $("#minlat").val() + "," +
-        $("#maxlon").val() + "," + $("#maxlat").val());
+                               "https://overpass-api.de/api/map?bbox=" +
+                               $("#minlon").val() + "," + $("#minlat").val() + "," +
+                               $("#maxlon").val() + "," + $("#maxlat").val());

   }
 
   function validateControls() {
   }
 
   function validateControls() {


@@ -53,30 +53,31 @@ OSM.Export = function(map) {
     $("#export_commit").toggle(getBounds().getSize() < OSM.MAX_REQUEST_AREA);
   }
 
     $("#export_commit").toggle(getBounds().getSize() < OSM.MAX_REQUEST_AREA);
   }
 

-  page.pushstate = page.popstate = function(path) {
-    $("#export_tab").addClass("current");
+  function checkSubmit(e) {
+    if (getBounds().getSize() > OSM.MAX_REQUEST_AREA) e.preventDefault();
+  }
+
+  page.pushstate = page.popstate = function (path) {

     OSM.loadSidebarContent(path, page.load);
   };
 
     OSM.loadSidebarContent(path, page.load);
   };
 

-  page.load = function() {
+  page.load = function () {

     map
       .addLayer(locationFilter)
       .on("moveend", update);
 
     $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged);
     $("#drag_box").click(enableFilter);
     map
       .addLayer(locationFilter)
       .on("moveend", update);
 
     $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged);
     $("#drag_box").click(enableFilter);

-    $("#sidebar_content .close").on("click", page.minimizeSidebar);
+    $(".export_form").on("submit", checkSubmit);

 
     update();
     return map.getState();
   };
 
 
     update();
     return map.getState();
   };
 

-  page.unload = function() {
+  page.unload = function () {

     map
       .removeLayer(locationFilter)
       .off("moveend", update);
     map
       .removeLayer(locationFilter)
       .off("moveend", update);

-
-    $("#export_tab").removeClass("current");

   };
 
   return page;
   };
 
   return page;