Code review feedback

Run setupShowHideGroupsOnZoom lazily

Author: jcheng5

inst/htmlwidgets/leaflet.js

@@ -496,30 +496,6 @@ function preventUnintendedZoomOnScroll(map) {
   });
 }
 
-function setupShowHideGroupsOnZoom(map) {
-  function setVisibility(layer, visible) {
-    if (visible !== map.hasLayer(layer)) {
-      if (visible) map.addLayer(layer);else map.removeLayer(layer);
-    }
-  }
-
-  function showHideGroupsOnZoom() {
-    if (!map.layerManager) return;
-
-    var zoom = map.getZoom();
-    map.layerManager.getAllGroupNames().forEach(function (group) {
-      var layer = map.layerManager.getLayerGroup(group, false);
-      if (layer && typeof layer.zoomLevels !== "undefined") {
-        setVisibility(layer, layer.zoomLevels === true || layer.zoomLevels.indexOf(zoom) >= 0);
-      }
-    });
-  }
-
-  map.showHideGroupsOnZoom = showHideGroupsOnZoom;
-  map.on("zoomend", showHideGroupsOnZoom);
-  showHideGroupsOnZoom();
-}
-
 _htmlwidgets2.default.widget({
 
   name: "leaflet",
@@ -558,7 +534,6 @@ _htmlwidgets2.default.widget({
         }
 
         preventUnintendedZoomOnScroll(map);
-        setupShowHideGroupsOnZoom(map);
 
         // Store some state in the map object
         map.leafletr = {
@@ -1964,6 +1939,34 @@ methods.showGroup = function (group) {
   });
 };
 
+function setupShowHideGroupsOnZoom(map) {
+  if (map.leafletr._hasInitializedShowHideGroups) {
+    return;
+  }
+  map.leafletr._hasInitializedShowHideGroups = true;
+
+  function setVisibility(layer, visible) {
+    if (visible !== map.hasLayer(layer)) {
+      if (visible) map.addLayer(layer);else map.removeLayer(layer);
+    }
+  }
+
+  function showHideGroupsOnZoom() {
+    if (!map.layerManager) return;
+
+    var zoom = map.getZoom();
+    map.layerManager.getAllGroupNames().forEach(function (group) {
+      var layer = map.layerManager.getLayerGroup(group, false);
+      if (layer && typeof layer.zoomLevels !== "undefined") {
+        setVisibility(layer, layer.zoomLevels === true || layer.zoomLevels.indexOf(zoom) >= 0);
+      }
+    });
+  }
+
+  map.showHideGroupsOnZoom = showHideGroupsOnZoom;
+  map.on("zoomend", showHideGroupsOnZoom);
+}
+
 methods.setGroupOptions = function (group, options) {
   var _this8 = this;
 
@@ -1974,6 +1977,8 @@ methods.setGroupOptions = function (group, options) {
       layer.zoomLevels = (0, _util.asArray)(options.zoomLevels);
     }
   });
+
+  setupShowHideGroupsOnZoom(this);
   this.showHideGroupsOnZoom();
 };
 

javascript/src/index.js

@@ -79,35 +79,6 @@ function preventUnintendedZoomOnScroll(map) {
   });
 }
 
-function setupShowHideGroupsOnZoom(map) {
-  function setVisibility(layer, visible) {
-    if (visible !== map.hasLayer(layer)) {
-      if (visible)
-        map.addLayer(layer);
-      else
-        map.removeLayer(layer);
-    }
-  }
-
-  function showHideGroupsOnZoom() {
-    if (!map.layerManager)
-      return;
-
-    let zoom = map.getZoom();
-    map.layerManager.getAllGroupNames().forEach(group => {
-      let layer = map.layerManager.getLayerGroup(group, false);
-      if (layer && typeof(layer.zoomLevels) !== "undefined") {
-        setVisibility(layer,
-          layer.zoomLevels === true || layer.zoomLevels.indexOf(zoom) >= 0);
-      }
-    });
-  }
-
-  map.showHideGroupsOnZoom = showHideGroupsOnZoom;
-  map.on("zoomend", showHideGroupsOnZoom);
-  showHideGroupsOnZoom();
-}
-
 HTMLWidgets.widget({
 
   name: "leaflet",
@@ -144,7 +115,6 @@ HTMLWidgets.widget({
         }
 
         preventUnintendedZoomOnScroll(map);
-        setupShowHideGroupsOnZoom(map);
 
         // Store some state in the map object
         map.leafletr = {

javascript/src/methods.js

@@ -871,6 +871,39 @@ methods.showGroup = function(group) {
   });
 };
 
+function setupShowHideGroupsOnZoom(map) {
+  if (map.leafletr._hasInitializedShowHideGroups) {
+    return;
+  }
+  map.leafletr._hasInitializedShowHideGroups = true;
+
+  function setVisibility(layer, visible) {
+    if (visible !== map.hasLayer(layer)) {
+      if (visible)
+        map.addLayer(layer);
+      else
+        map.removeLayer(layer);
+    }
+  }
+
+  function showHideGroupsOnZoom() {
+    if (!map.layerManager)
+      return;
+
+    let zoom = map.getZoom();
+    map.layerManager.getAllGroupNames().forEach(group => {
+      let layer = map.layerManager.getLayerGroup(group, false);
+      if (layer && typeof(layer.zoomLevels) !== "undefined") {
+        setVisibility(layer,
+          layer.zoomLevels === true || layer.zoomLevels.indexOf(zoom) >= 0);
+      }
+    });
+  }
+
+  map.showHideGroupsOnZoom = showHideGroupsOnZoom;
+  map.on("zoomend", showHideGroupsOnZoom);
+}
+
 methods.setGroupOptions = function(group, options) {
   $.each(asArray(group), (i, g) => {
     let layer = this.layerManager.getLayerGroup(g, true);
@@ -879,6 +912,8 @@ methods.setGroupOptions = function(group, options) {
       layer.zoomLevels = asArray(options.zoomLevels);
     }
   });
+
+  setupShowHideGroupsOnZoom(this);
   this.showHideGroupsOnZoom();
 };