Remove some repeated-query funkiness

[rails.git] / app / assets / javascripts / leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index b04216d2696f126a928e5b220d3e9a74e3063a77..bb00f716c8c28d969c3f90c05db97970b4f1aabb 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -120,7 +120,7 @@ L.OSM.layers = function(options) {
       var list = $('<ul>')
         .appendTo(overlaySection);
 
       var list = $('<ul>')
         .appendTo(overlaySection);
 

-      function addOverlay(layer, name, minZoom) {
+      function addOverlay(layer, name, maxArea) {

         var refName = name.split(' ').join('_').toLowerCase();
         var item = $('<li>')
           .attr('class', refName)
         var refName = name.split(' ').join('_').toLowerCase();
         var item = $('<li>')
           .attr('class', refName)


@@ -132,15 +132,18 @@ L.OSM.layers = function(options) {
         var label = $('<label>')
           .appendTo(item);
 
         var label = $('<label>')
           .appendTo(item);
 

+        var checked = map.hasLayer(layer);
+

         var input = $('<input>')
           .attr('type', 'checkbox')
         var input = $('<input>')
           .attr('type', 'checkbox')

-          .prop('checked', map.hasLayer(layer))
+          .prop('checked', checked)

           .appendTo(label);
 
         label.append(name);
 
         input.on('change', function() {
           .appendTo(label);
 
         label.append(name);
 
         input.on('change', function() {

-          if (input.is(':checked')) {
+          checked = input.is(':checked');
+          if (checked) {

             map.addLayer(layer);
           } else {
             map.removeLayer(layer);
             map.addLayer(layer);
           } else {
             map.removeLayer(layer);


@@ -153,16 +156,26 @@ L.OSM.layers = function(options) {
         });
 
         map.on('zoomend', function() {
         });
 
         map.on('zoomend', function() {

-          var disabled = map.getZoom() < minZoom + 1;
+          var disabled = map.getBounds().getSize() >= maxArea;

           $(input).prop('disabled', disabled);
           $(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') : '');
         });
       }
 
           $(item).attr('class', disabled ? 'disabled' : '');
           item.attr('data-original-title', disabled ?
             I18n.t('javascripts.site.' + refName + '_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, I18n.t('javascripts.map.layers.notes'), OSM.MAX_NOTE_REQUEST_AREA);
+      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'), OSM.MAX_REQUEST_AREA);

     }
 
     options.sidebar.addPane($ui);
     }
 
     options.sidebar.addPane($ui);