X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32645dd8565e7bbad75ab4a03a6b25c4f14e4bda..560763d224c7b4020c04c9f04553277d92b80dc2:/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..053f5169f 100644 --- 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(); - 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() { @@ -46,13 +45,12 @@ OSM.Export = function(map) { function validateControls() { $("#export_osm_too_large").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").removeClass("minimized"); - map.invalidateSize(); - $('#sidebar_content').load(path, page.load); + OSM.loadSidebarContent(path, page.load); }; page.load = function() { @@ -62,8 +60,10 @@ OSM.Export = function(map) { $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged); $("#drag_box").click(enableFilter); + $("#sidebar_content .close").on("click", page.minimizeSidebar); update(); + return map.getState(); }; page.unload = function() {