X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/853dc286b9c9093d0c1ad2082671111316703e4f..2de26d54ef22c5653f830d0ce4938df78d0ca0fd:/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 851dbb9ae..05d90381b 100644
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -1,7 +1,7 @@
-OSM.Export = function(map) {
-  var page = {};
+OSM.Export = function (map) {
+  const page = {};
 
-  var locationFilter = new L.LocationFilter({
+  const locationFilter = new L.LocationFilter({
     enableButton: false,
     adjustButton: false
   }).on("change", update);
@@ -13,12 +13,10 @@ OSM.Export = function(map) {
   }
 
   function boundsChanged() {
-    var bounds = getBounds();
-
+    const bounds = getBounds();
     map.fitBounds(bounds);
     locationFilter.setBounds(bounds);
-
-    enableFilter();
+    locationFilter.enable();
     validateControls();
   }
 
@@ -29,6 +27,7 @@ OSM.Export = function(map) {
 
     locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();
+    validateControls();
   }
 
   function update() {
@@ -37,11 +36,16 @@ OSM.Export = function(map) {
   }
 
   function setBounds(bounds) {
-    var precision = 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));
+    const truncated = [bounds.getSouthWest(), bounds.getNorthEast()]
+      .map(c => OSM.cropLocation(c, map.getZoom()));
+    $("#minlon").val(truncated[0][1]);
+    $("#minlat").val(truncated[0][0]);
+    $("#maxlon").val(truncated[1][1]);
+    $("#maxlat").val(truncated[1][0]);
+
+    $("#export_overpass").attr("href",
+                               "https://overpass-api.de/api/map?bbox=" +
+                               truncated.map(p => p.reverse()).join());
   }
 
   function validateControls() {
@@ -49,29 +53,31 @@ OSM.Export = function(map) {
     $("#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);
   };
 
-  page.load = function() {
+  page.load = function () {
     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();
   };
 
-  page.unload = function() {
+  page.unload = function () {
     map
       .removeLayer(locationFilter)
       .off("moveend", update);
-
-    $("#export_tab").removeClass("current");
   };
 
   return page;