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

[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 4842fff0ca4c081b154e4e79845db2ba0113c3cf..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({


@@ -14,11 +14,9 @@ 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();
   }
 


@@ -29,6 +27,7 @@ OSM.Export = function(map) {
 
     locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();
 
     locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();

+    validateControls();

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


@@ -37,11 +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));
     $("#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() {
   }
 
   function validateControls() {


@@ -49,34 +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");
-    $("#sidebar_content").load(path, function(a, b, xhr) {
-      if (xhr.getResponseHeader('X-Page-Title')) {
-        document.title = xhr.getResponseHeader('X-Page-Title');
-      }
-      page.load();
-    });
+  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);
     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();
 
     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;