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

[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 51ad1e3e2e55456ef1358d1f45c3fd88605cf43a..48e950b2137870f88e4aac912781cf3b94d17a70 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -14,21 +14,20 @@ OSM.Export = function(map) {
 
   function boundsChanged() {
     var bounds = getBounds();
 
   function boundsChanged() {
     var bounds = getBounds();

-

     map.fitBounds(bounds);
     locationFilter.setBounds(bounds);
     map.fitBounds(bounds);
     locationFilter.setBounds(bounds);

-
-    enableFilter();
+    locationFilter.enable();

     validateControls();
   }
 
     validateControls();
   }
 

-  function enableFilter() {
-    if (!locationFilter.getBounds().isValid()) {
-      locationFilter.setBounds(map.getBounds().pad(-0.2));
-    }
+  function enableFilter(e) {
+    e.preventDefault();

 
     $("#drag_box").hide();
 
     $("#drag_box").hide();

+
+    locationFilter.setBounds(map.getBounds().pad(-0.2));

     locationFilter.enable();
     locationFilter.enable();

+    validateControls();

   }
 
   function update() {
   }
 
   function update() {


@@ -37,22 +36,30 @@ 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));
     $("#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);
   }
 
   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");
   }
 
   page.pushstate = page.popstate = function(path) {
     $("#export_tab").addClass("current");

-    $("#sidebar").removeClass("minimized");
-    map.invalidateSize();
-    $('#sidebar_content').load(path, page.load);
+    OSM.loadSidebarContent(path, page.load);

   };
 
   page.load = function() {
   };
 
   page.load = function() {


@@ -62,8 +69,10 @@ OSM.Export = function(map) {
 
     $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged);
     $("#drag_box").click(enableFilter);
 
     $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged);
     $("#drag_box").click(enableFilter);

+    $(".export_form").on("submit", checkSubmit);

 
     update();
 
     update();

+    return map.getState();

   };
 
   page.unload = function() {
   };
 
   page.unload = function() {