Use baselayerchange/overlaylayerchange instead of layeradd/layerremove for speed...

[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 dc692a4a5d500f0ffbba724a8309769431e7efe8..3f577b532d3ba707dbf487277ce17d2bb1592883 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -29,7 +29,7 @@ L.OSM.layers = function (options) {
 
       map.whenReady(function () {
         var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
 
       map.whenReady(function () {
         var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })

-          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
+          .addLayer(new layer.constructor(layer.options));

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


@@ -61,18 +61,16 @@ L.OSM.layers = function (options) {
 
       input.on("click", function () {
         layers.forEach(function (other) {
 
       input.on("click", function () {
         layers.forEach(function (other) {

-          if (other === layer) {
-            map.addLayer(other);
-          } else {
+          if (other !== layer) {

             map.removeLayer(other);
           }
         });
             map.removeLayer(other);
           }
         });

-        map.fire("baselayerchange", { layer: layer });
+        map.addLayer(layer);

       });
 
       item.on("dblclick", toggle);
 
       });
 
       item.on("dblclick", toggle);
 

-      map.on("layeradd layerremove", function () {
+      map.on("baselayerchange", function () {

         input.prop("checked", map.hasLayer(layer));
       });
     });
         input.prop("checked", map.hasLayer(layer));
       });
     });


@@ -121,10 +119,9 @@ L.OSM.layers = function (options) {
           } else {
             map.removeLayer(layer);
           }
           } else {
             map.removeLayer(layer);
           }

-          map.fire("overlaylayerchange", { layer: layer });

         });
 
         });
 

-        map.on("layeradd layerremove", function () {
+        map.on("overlayadd overlayremove", function () {

           input.prop("checked", map.hasLayer(layer));
         });
 
           input.prop("checked", map.hasLayer(layer));
         });