Merge branch 'master' into moderation

[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 2d28c256cac10042927dfcdcb6f6c889bfd86ad5..a465e144993d8470a82c31f740fb09b273d8f5b2 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -34,12 +34,12 @@ L.OSM.layers = function(options) {
       .attr('class', 'section base-layers')
       .appendTo($ui);
 
       .attr('class', 'section base-layers')
       .appendTo($ui);
 

-    list = $('<ul>')
+    var baseLayers = $('<ul>')

       .appendTo(baseSection);
 
     layers.forEach(function(layer) {
       var item = $('<li>')
       .appendTo(baseSection);
 
     layers.forEach(function(layer) {
       var item = $('<li>')

-        .appendTo(list);
+        .appendTo(baseLayers);

 
       if (map.hasLayer(layer)) {
         item.addClass('active');
 
       if (map.hasLayer(layer)) {
         item.addClass('active');


@@ -49,8 +49,8 @@ L.OSM.layers = function(options) {
         .appendTo(item);
 
       map.whenReady(function() {
         .appendTo(item);
 
       map.whenReady(function() {

-        var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})
-          .addLayer(new layer.constructor());
+        var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false, keyboard: false})
+          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));

 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();


@@ -101,13 +101,15 @@ L.OSM.layers = function(options) {
         map.fire('baselayerchange', {layer: layer});
       });
 
         map.fire('baselayerchange', {layer: layer});
       });
 

+      item.on('dblclick', toggle);
+

       map.on('layeradd layerremove', function() {
         item.toggleClass('active', map.hasLayer(layer));
         input.prop('checked', map.hasLayer(layer));
       });
     });
 
       map.on('layeradd layerremove', function() {
         item.toggleClass('active', map.hasLayer(layer));
         input.prop('checked', map.hasLayer(layer));
       });
     });
 

-    if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {

       var overlaySection = $('<div>')
         .attr('class', 'section overlay-layers')
         .appendTo($ui);
       var overlaySection = $('<div>')
         .attr('class', 'section overlay-layers')
         .appendTo($ui);


@@ -117,30 +119,31 @@ L.OSM.layers = function(options) {
         .attr("class", "deemphasize")
         .appendTo(overlaySection);
 
         .attr("class", "deemphasize")
         .appendTo(overlaySection);
 

-      var list = $('<ul>')
+      var overlays = $('<ul>')

         .appendTo(overlaySection);
 
         .appendTo(overlaySection);
 

-      function addOverlay(layer, name, minZoom) {
-        var refName = name.split(' ').join('_').toLowerCase();
+      var addOverlay = function (layer, name, maxArea) {

         var item = $('<li>')
         var item = $('<li>')

-          .attr('class', refName)

           .tooltip({
             placement: 'top'
           })
           .tooltip({
             placement: 'top'
           })

-          .appendTo(list);
+          .appendTo(overlays);

 
         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);
 
           .appendTo(label);
 

-        label.append(name);
+        label.append(I18n.t('javascripts.map.layers.' + name));

 
         input.on('change', function() {
 
         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,27 @@ 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);

-          disabled ? $(item).attr('class', 'disabled') : $(item).attr('class', '');
+
+          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 ?
           item.attr('data-original-title', disabled ?

-            'Zoom in to see ' + name.toLowerCase() : '');
+            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);
+      addOverlay(map.gpsLayer, 'gps', Number.POSITIVE_INFINITY);

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


@@ -171,6 +185,7 @@ L.OSM.layers = function(options) {
       e.stopPropagation();
       e.preventDefault();
       options.sidebar.togglePane($ui, button);
       e.stopPropagation();
       e.preventDefault();
       options.sidebar.togglePane($ui, button);

+      $('.leaflet-control .control-button').tooltip('hide');

     }
 
     return $container[0];
     }
 
     return $container[0];