X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/44629832dd0207d7b0f50b93f1d00b4373dd4d49..7a0766a5e6dc3ab85f71a27fef8b049e56ef03b8:/app/assets/javascripts/leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 7703529b8..eedf718d3 100644
--- 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);
 
-    list = $('<ul>')
+    var baseLayers = $('<ul>')
       .appendTo(baseSection);
 
     layers.forEach(function(layer) {
       var item = $('<li>')
-        .appendTo(list);
+        .appendTo(baseLayers);
 
       if (map.hasLayer(layer)) {
         item.addClass('active');
@@ -50,7 +50,7 @@ L.OSM.layers = function(options) {
 
       map.whenReady(function() {
         var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})
-          .addLayer(new layer.constructor());
+          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
@@ -101,13 +101,15 @@ L.OSM.layers = function(options) {
         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));
       });
     });
 
-    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);
@@ -117,30 +119,31 @@ L.OSM.layers = function(options) {
         .attr("class", "deemphasize")
         .appendTo(overlaySection);
 
-      var list = $('<ul>')
+      var overlays = $('<ul>')
         .appendTo(overlaySection);
 
-      function addOverlay(layer, name, maxArea) {
-        var refName = name.split(' ').join('_').toLowerCase();
+      var addOverlay = function (layer, name, maxArea) {
         var item = $('<li>')
-          .attr('class', refName)
           .tooltip({
             placement: 'top'
           })
-          .appendTo(list);
+          .appendTo(overlays);
 
         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);
@@ -155,14 +158,25 @@ L.OSM.layers = function(options) {
         map.on('zoomend', function() {
           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'), OSM.MAX_NOTE_REQUEST_AREA);
-      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'), OSM.MAX_REQUEST_AREA);
+      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);