From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 9 Nov 2012 20:58:47 +0000 (-0800)
Subject: Don't zoom map when enabling location filter
X-Git-Tag: live~5247^2~16
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5b42c683f5e5b401a935182a9ea2e30f1a03c22e

Don't zoom map when enabling location filter
---

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 61ac51f69..6371f559b 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -83,6 +83,7 @@ $(document).ready(function () {
 
     function enableFilter() {
       $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
+      locationFilter.setBounds(map.getBounds().pad(-0.2));
       locationFilter.enable();
       getData();
     }
diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 04c6b6ff7..61a333007 100644
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -15,7 +15,7 @@ $(document).ready(function () {
 
     var locationFilter = new L.LocationFilter({
       enableButton: false,
-      adjustButton: false,
+      adjustButton: false
     }).addTo(map);
 
     locationFilter.on("change", filterChanged);
@@ -83,15 +83,18 @@ $(document).ready(function () {
       var bounds = getBounds();
 
       map.fitBounds(bounds);
-
-      enableFilter();
       locationFilter.setBounds(bounds);
 
+      enableFilter();
       validateControls();
       mapnikSizeChanged();
     }
 
     function enableFilter() {
+      if (!locationFilter.getBounds().isValid()) {
+        locationFilter.setBounds(map.getBounds().pad(-0.2));
+      }
+
       $("#drag_box").hide();
       locationFilter.enable();
     }