Add label argument to setStyle

Author: cmcaine

R/methods.R

@@ -48,8 +48,8 @@ setView <- function(map, lng, lat, zoom, options = list()) {
 #'   setStyle("zones", styles)
 #' }
 #' @export
-setStyle = function(map, group, styles) {
-    invokeMethod(map, NULL, "setStyle", group, styles)
+setStyle = function(map, group, styles, label = NULL) {
+    invokeMethod(map, NULL, "setStyle", group, styles, label)
 }
 
 #' @describeIn map-methods Flys to a given location/zoom-level using smooth pan-zoom.

inst/htmlwidgets/leaflet.js

@@ -1284,11 +1284,19 @@ exports.default = methods;
 
 /** Much more performant way to style loaded geometry */
 
-methods.setStyle = function (group, styles) {
+methods.setStyle = function (group, styles, labels) {
   window.map = this;
   var layers = this.layerManager.getLayerGroup(group).getLayers();
-  for (var i = 0; i < styles.length; i++) {
-    layers[i].setStyle(styles[i]);
+
+  if (styles) {
+    for (var i = 0; i < styles.length; i++) {
+      layers[i].setStyle(styles[i]);
+    }
+  }
+  if (labels) {
+    for (var _i = 0; _i < styles.length; _i++) {
+      layers[_i].bindTooltip(labels[_i]);
+    }
   }
 };
 

javascript/src/methods.js

@@ -14,11 +14,19 @@ let methods = {};
 export default methods;
 
 /** Much more performant way to style loaded geometry */
-methods.setStyle = function(group, styles) {
+methods.setStyle = function(group, styles, labels) {
   window.map = this;
   let layers = this.layerManager.getLayerGroup(group).getLayers();
-  for (let i = 0; i < styles.length; i++) {
-    layers[i].setStyle(styles[i]);
+
+  if (styles) {
+    for (let i = 0; i < styles.length; i++) {
+      layers[i].setStyle(styles[i]);
+    }
+  }
+  if (labels) {
+    for (let i = 0; i < styles.length; i++) {
+      layers[i].bindTooltip(labels[i]);
+    }
   }
 };