X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32645dd8565e7bbad75ab4a03a6b25c4f14e4bda..bc70cae711fb6947233d6a750cb33f115aa7a01b:/app/assets/javascripts/index/export.js?ds=sidebyside

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 51ad1e3e2..a953920f8 100644
--- 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({
@@ -14,21 +14,20 @@ OSM.Export = function(map) {
 
   function boundsChanged() {
     var bounds = getBounds();
-
     map.fitBounds(bounds);
     locationFilter.setBounds(bounds);
-
-    enableFilter();
+    locationFilter.enable();
     validateControls();
   }
 
-  function enableFilter() {
-    if (!locationFilter.getBounds().isValid()) {
-      locationFilter.setBounds(map.getBounds().pad(-0.2));
-    }
+  function enableFilter(e) {
+    e.preventDefault();
 
     $("#drag_box").hide();
+
+    locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();
+    validateControls();
   }
 
   function update() {
@@ -37,41 +36,48 @@ OSM.Export = function(map) {
   }
 
   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",
+                               "https://overpass-api.de/api/map?bbox=" +
+                               $("#minlon").val() + "," + $("#minlat").val() + "," +
+                               $("#maxlon").val() + "," + $("#maxlat").val());
   }
 
   function validateControls() {
     $("#export_osm_too_large").toggle(getBounds().getSize() > OSM.MAX_REQUEST_AREA);
+    $("#export_commit").toggle(getBounds().getSize() < OSM.MAX_REQUEST_AREA);
+  }
+
+  function checkSubmit(e) {
+    if (getBounds().getSize() > OSM.MAX_REQUEST_AREA) e.preventDefault();
   }
 
-  page.pushstate = page.popstate = function(path) {
-    $("#export_tab").addClass("current");
-    $("#sidebar").removeClass("minimized");
-    map.invalidateSize();
-    $('#sidebar_content').load(path, page.load);
+  page.pushstate = page.popstate = function (path) {
+    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);
+    $(".export_form").on("submit", checkSubmit);
 
     update();
+    return map.getState();
   };
 
-  page.unload = function() {
+  page.unload = function () {
     map
       .removeLayer(locationFilter)
       .off("moveend", update);
-
-    $("#export_tab").removeClass("current");
   };
 
   return page;