Merge commit 'fa82e3cab1b0dc638861a7dd6bab797a2dda78a6' into issue/261-popupOptions

Author: bhaskarvk

R/layers.R

@@ -484,6 +484,7 @@ addMarkers = function(
   map, lng = NULL, lat = NULL, layerId = NULL, group = NULL,
   icon = NULL,
   popup = NULL,
+  popupOptions = NULL,
   label = NULL,
   labelOptions = NULL,
   options = markerOptions(),
@@ -518,8 +519,9 @@ addMarkers = function(
 
   pts = derivePoints(data, lng, lat, missing(lng), missing(lat), "addMarkers")
   invokeMethod(
-    map, data, 'addMarkers', pts$lat, pts$lng, icon, layerId, group, options, popup,
-    clusterOptions, clusterId, safeLabel(label, data), labelOptions
+    map, data, 'addMarkers', pts$lat, pts$lng, icon, layerId, group, options,
+    popup, popupOptions, clusterOptions, clusterId,
+    safeLabel(label, data), labelOptions
   ) %>% expandLimits(pts$lat, pts$lng)
 }
 
@@ -802,6 +804,7 @@ addCircleMarkers = function(
   fillOpacity = 0.2,
   dashArray = NULL,
   popup = NULL,
+  popupOptions = NULL,
   label = NULL,
   labelOptions = NULL,
   options = pathOptions(),
@@ -818,7 +821,8 @@ addCircleMarkers = function(
     map$dependencies = c(map$dependencies, markerClusterDependencies())
   pts = derivePoints(data, lng, lat, missing(lng), missing(lat), "addCircleMarkers")
   invokeMethod(map, data, 'addCircleMarkers', pts$lat, pts$lng, radius,
-      layerId, group, options, clusterOptions, clusterId, popup, safeLabel(label, data), labelOptions) %>%
+               layerId, group, options, clusterOptions, clusterId,
+               popup, popupOptions, safeLabel(label, data), labelOptions) %>%
     expandLimits(pts$lat, pts$lng)
 }
 
@@ -891,6 +895,7 @@ addCircles = function(
   fillOpacity = 0.2,
   dashArray = NULL,
   popup = NULL,
+  popupOptions = NULL,
   label = NULL,
   labelOptions = NULL,
   options = pathOptions(),
@@ -902,7 +907,8 @@ addCircles = function(
     dashArray = dashArray
   ))
   pts = derivePoints(data, lng, lat, missing(lng), missing(lat), "addCircles")
-  invokeMethod(map, data, 'addCircles', pts$lat, pts$lng, radius, layerId, group, options, popup, safeLabel(label, data), labelOptions) %>%
+  invokeMethod(map, data, 'addCircles', pts$lat, pts$lng, radius, layerId, group, options,
+               popup, popupOptions, safeLabel(label, data), labelOptions) %>%
     expandLimits(pts$lat, pts$lng)
 }
 
@@ -924,6 +930,7 @@ addPolylines = function(
   smoothFactor = 1.0,
   noClip = FALSE,
   popup = NULL,
+  popupOptions = NULL,
   label = NULL,
   labelOptions = NULL,
   options = pathOptions(),
@@ -935,7 +942,8 @@ addPolylines = function(
     dashArray = dashArray, smoothFactor = smoothFactor, noClip = noClip
   ))
   pgons = derivePolygons(data, lng, lat, missing(lng), missing(lat), "addPolylines")
-  invokeMethod(map, data, 'addPolylines', pgons, layerId, group, options, popup, safeLabel(label, data), labelOptions) %>%
+  invokeMethod(map, data, 'addPolylines', pgons, layerId, group, options,
+               popup, popupOptions, safeLabel(label, data), labelOptions) %>%
     expandLimitsBbox(pgons)
 }
 
@@ -956,6 +964,7 @@ addRectangles = function(
   smoothFactor = 1.0,
   noClip = FALSE,
   popup = NULL,
+  popupOptions = NULL,
   label = NULL,
   labelOptions = NULL,
   options = pathOptions(),
@@ -970,7 +979,7 @@ addRectangles = function(
   lat1 = resolveFormula(lat1, data)
   lng2 = resolveFormula(lng2, data)
   lat2 = resolveFormula(lat2, data)
-  invokeMethod(map, data, 'addRectangles',lat1, lng1, lat2, lng2, layerId, group, options, popup, safeLabel(label, data), labelOptions) %>%
+  invokeMethod(map, data, 'addRectangles',lat1, lng1, lat2, lng2, layerId, group, options, popup, popupOptions, safeLabel(label, data), labelOptions) %>%
     expandLimits(c(lat1, lat2), c(lng1, lng2))
 }
 
@@ -989,6 +998,7 @@ addPolygons = function(
   smoothFactor = 1.0,
   noClip = FALSE,
   popup = NULL,
+  popupOptions = NULL,
   label = NULL,
   labelOptions = NULL,
   options = pathOptions(),
@@ -1000,7 +1010,7 @@ addPolygons = function(
     dashArray = dashArray, smoothFactor = smoothFactor, noClip = noClip
   ))
   pgons = derivePolygons(data, lng, lat, missing(lng), missing(lat), "addPolygons")
-  invokeMethod(map, data, 'addPolygons', pgons, layerId, group, options, popup, safeLabel(label, data), labelOptions) %>%
+  invokeMethod(map, data, 'addPolygons', pgons, layerId, group, options, popup, popupOptions, safeLabel(label, data), labelOptions) %>%
     expandLimitsBbox(pgons)
 }
 

javascript/src/methods.js

@@ -149,7 +149,14 @@ function addMarkers(map, df, group, clusterOptions, clusterId, markerFunc) {
           this.layerManager.addLayer(marker, "marker", thisId, thisGroup);
         }
         let popup = df.get(i, "popup");
-        if (popup !== null) marker.bindPopup(popup);
+        let popupOptions = df.get(i, 'popupOptions');
+        if (popup !== null) {
+          if (popupOptions !== null){
+            marker.bindPopup(popup, popupOptions);
+          } else {
+            marker.bindPopup(popup);
+          }
+        }
         let label = df.get(i, "label");
         let labelOptions = df.get(i, "labelOptions");
         if (label !== null) {
@@ -175,7 +182,7 @@ function addMarkers(map, df, group, clusterOptions, clusterId, markerFunc) {
   }).call(map);
 }
 
-methods.addMarkers = function(lat, lng, icon, layerId, group, options, popup,
+methods.addMarkers = function(lat, lng, icon, layerId, group, options, popup, popupOptions,
                               clusterOptions, clusterId, label, labelOptions) {
   let icondf;
   let getIcon;
@@ -227,6 +234,7 @@ methods.addMarkers = function(lat, lng, icon, layerId, group, options, popup,
     .col("layerId", layerId)
     .col("group", group)
     .col("popup", popup)
+    .col("popupOptions", popupOptions)
     .col("label", label)
     .col("labelOptions", labelOptions)
     .cbind(options);
@@ -240,7 +248,7 @@ methods.addMarkers = function(lat, lng, icon, layerId, group, options, popup,
   });
 };
 
-methods.addAwesomeMarkers = function(lat, lng, icon, layerId, group, options, popup,
+methods.addAwesomeMarkers = function(lat, lng, icon, layerId, group, options, popup, popupOptions,
 clusterOptions, clusterId, label, labelOptions) {
   let icondf;
   let getIcon;
@@ -267,6 +275,7 @@ clusterOptions, clusterId, label, labelOptions) {
     .col("layerId", layerId)
     .col("group", group)
     .col("popup", popup)
+    .col("popupOptions", popupOptions)
     .col("label", label)
     .col("labelOptions", labelOptions)
     .cbind(options);
@@ -289,7 +298,14 @@ function addLayers(map, category, df, layerFunc) {
       this.layerManager.addLayer(layer, category, thisId, thisGroup);
       if (layer.bindPopup) {
         let popup = df.get(i, "popup");
-        if (popup !== null) layer.bindPopup(popup);
+        let popupOptions = df.get(i, 'popupOptions');
+        if (popup !== null) {
+          if (popupOptions !== null){
+            layer.bindPopup(popup, popupOptions);
+          } else {
+            layer.bindPopup(popup);
+          }
+        }
       }
       if (layer.bindLabel) {
         let label = df.get(i, "label");
@@ -309,14 +325,15 @@ function addLayers(map, category, df, layerFunc) {
   }
 }
 
-methods.addCircles = function(lat, lng, radius, layerId, group, options, popup, label, labelOptions) {
+methods.addCircles = function(lat, lng, radius, layerId, group, options, popup, popupOptions, label, labelOptions) {
   let df = new DataFrame()
     .col("lat", lat)
     .col("lng", lng)
     .col("radius", radius)
     .col("layerId", layerId)
     .col("group", group)
     .col("popup", popup)
+    .col("popupOptions", popupOptions)
     .col("label", label)
     .col("labelOptions", labelOptions)
     .cbind(options);
@@ -326,14 +343,15 @@ methods.addCircles = function(lat, lng, radius, layerId, group, options, popup,
   });
 };
 
-methods.addCircleMarkers = function(lat, lng, radius, layerId, group, options, clusterOptions, clusterId, popup, label, labelOptions) {
+methods.addCircleMarkers = function(lat, lng, radius, layerId, group, options, clusterOptions, clusterId, popup, popupOptions, label, labelOptions) {
   let df = new DataFrame()
     .col("lat", lat)
     .col("lng", lng)
     .col("radius", radius)
     .col("layerId", layerId)
     .col("group", group)
     .col("popup", popup)
+    .col("popupOptions", popupOptions)
     .col("label", label)
     .col("labelOptions", labelOptions)
     .cbind(options);
@@ -347,12 +365,13 @@ methods.addCircleMarkers = function(lat, lng, radius, layerId, group, options, c
  * @param lat Array of arrays of latitude coordinates for polylines
  * @param lng Array of arrays of longitude coordinates for polylines
  */
-methods.addPolylines = function(polygons, layerId, group, options, popup, label, labelOptions) {
+methods.addPolylines = function(polygons, layerId, group, options, popup, popupOptions, label, labelOptions) {
   let df = new DataFrame()
     .col("shapes", polygons)
     .col("layerId", layerId)
     .col("group", group)
     .col("popup", popup)
+    .col("popupOptions", popupOptions)
     .col("label", label)
     .col("labelOptions", labelOptions)
     .cbind(options);
@@ -394,7 +413,7 @@ methods.clearShapes = function() {
   this.layerManager.clearLayers("shape");
 };
 
-methods.addRectangles = function(lat1, lng1, lat2, lng2, layerId, group, options, popup, label, labelOptions) {
+methods.addRectangles = function(lat1, lng1, lat2, lng2, layerId, group, options, popup, popupOptions, label, labelOptions) {
   let df = new DataFrame()
     .col("lat1", lat1)
     .col("lng1", lng1)
@@ -403,6 +422,7 @@ methods.addRectangles = function(lat1, lng1, lat2, lng2, layerId, group, options
     .col("layerId", layerId)
     .col("group", group)
     .col("popup", popup)
+    .col("popupOptions", popupOptions)
     .col("label", label)
     .col("labelOptions", labelOptions)
     .cbind(options);
@@ -421,12 +441,13 @@ methods.addRectangles = function(lat1, lng1, lat2, lng2, layerId, group, options
  * @param lat Array of arrays of latitude coordinates for polygons
  * @param lng Array of arrays of longitude coordinates for polygons
  */
-methods.addPolygons = function(polygons, layerId, group, options, popup, label, labelOptions) {
+methods.addPolygons = function(polygons, layerId, group, options, popup, popupOptions, label, labelOptions) {
   let df = new DataFrame()
     .col("shapes", polygons)
     .col("layerId", layerId)
     .col("group", group)
     .col("popup", popup)
+    .col("popupOptions", popupOptions)
     .col("label", label)
     .col("labelOptions", labelOptions)
     .cbind(options);