X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d3e99bc8bd58533b9432518f8d0573995b8082b9..d1bebd08035434880a5edb92fdae8c9b24d825f9:/app/assets/javascripts/leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index b04216d26..443e47e76 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -120,10 +120,8 @@ L.OSM.layers = function(options) {
       var list = $('<ul>')
         .appendTo(overlaySection);
 
-      function addOverlay(layer, name, minZoom) {
-        var refName = name.split(' ').join('_').toLowerCase();
+      function addOverlay(layer, name, maxArea) {
         var item = $('<li>')
-          .attr('class', refName)
           .tooltip({
             placement: 'top'
           })
@@ -132,15 +130,18 @@ L.OSM.layers = function(options) {
         var label = $('<label>')
           .appendTo(item);
 
+        var checked = map.hasLayer(layer);
+
         var input = $('<input>')
           .attr('type', 'checkbox')
-          .prop('checked', map.hasLayer(layer))
+          .prop('checked', checked)
           .appendTo(label);
 
-        label.append(name);
+        label.append(I18n.t('javascripts.map.layers.' + name));
 
         input.on('change', function() {
-          if (input.is(':checked')) {
+          checked = input.is(':checked');
+          if (checked) {
             map.addLayer(layer);
           } else {
             map.removeLayer(layer);
@@ -153,16 +154,26 @@ L.OSM.layers = function(options) {
         });
 
         map.on('zoomend', function() {
-          var disabled = map.getZoom() < minZoom + 1;
+          var disabled = map.getBounds().getSize() >= maxArea;
           $(input).prop('disabled', disabled);
+
+          if (disabled && $(input).is(':checked')) {
+            $(input).prop('checked', false)
+              .trigger('change');
+            checked = true;
+          } else if (!disabled && !$(input).is(':checked') && checked) {
+            $(input).prop('checked', true)
+              .trigger('change');
+          }
+
           $(item).attr('class', disabled ? 'disabled' : '');
           item.attr('data-original-title', disabled ?
-            I18n.t('javascripts.site.' + refName + '_zoom_in_tooltip') : '');
+            I18n.t('javascripts.site.map_' + name + '_zoom_in_tooltip') : '');
         });
       }
 
-      addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'), 10);
-      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'), 15);
+      addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA);
+      addOverlay(map.dataLayer, 'data', OSM.MAX_REQUEST_AREA);
     }
 
     options.sidebar.addPane($ui);