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 49d19f1235f5cff00ab9c90ce9dc1390f8e5d0c2..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,6 +101,8 @@ 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));


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

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

         .appendTo(overlaySection);
 
       var addOverlay = function (layer, name, maxArea) {
         .appendTo(overlaySection);
 
       var addOverlay = function (layer, name, maxArea) {


@@ -125,7 +127,7 @@ L.OSM.layers = function(options) {
           .tooltip({
             placement: 'top'
           })
           .tooltip({
             placement: 'top'
           })

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

 
         var label = $('<label>')
           .appendTo(item);
 
         var label = $('<label>')
           .appendTo(item);


@@ -174,6 +176,7 @@ L.OSM.layers = function(options) {
 
       addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA);
       addOverlay(map.dataLayer, '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);
     }
 
     options.sidebar.addPane($ui);