Skip to content

addPolygons() now responds to crosstalk events #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

addPolygons() now responds to crosstalk events #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions R/layers.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,8 +1087,11 @@ 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, popupOptions, safeLabel(label, data), labelOptions, highlightOptions) %>%
expandLimitsBbox(pgons)
invokeMethod(
map, data, 'addPolygons', pgons, layerId, group, options, popup,
popupOptions, safeLabel(label, data), labelOptions, highlightOptions,
getCrosstalkOptions(data)
) %>% expandLimitsBbox(pgons)
}

#' @rdname remove
Expand Down
5 changes: 2 additions & 3 deletions inst/htmlwidgets/leaflet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,9 +1596,9 @@ methods.addRectangles = function (lat1, lng1, lat2, lng2, layerId, group, option
* @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, popupOptions, label, labelOptions, highlightOptions) {
methods.addPolygons = function (polygons, layerId, group, options, popup, popupOptions, label, labelOptions, highlightOptions, crosstalkOptions) {
if (polygons.length > 0) {
var df = new _dataframe2.default().col("shapes", polygons).col("layerId", layerId).col("group", group).col("popup", popup).col("popupOptions", popupOptions).col("label", label).col("labelOptions", labelOptions).col("highlightOptions", highlightOptions).cbind(options);
var df = new _dataframe2.default().col("shapes", polygons).col("layerId", layerId).col("group", group).col("popup", popup).col("popupOptions", popupOptions).col("label", label).col("labelOptions", labelOptions).col("highlightOptions", highlightOptions).cbind(options).cbind(crosstalkOptions || {});

addLayers(this, "shape", df, function (df, i) {
// This code used to use L.multiPolygon, but that caused
Expand Down Expand Up @@ -2296,7 +2296,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
// pixel of the original image has some contribution to the downscaled image)
// as opposed to a single-step downscaling which will discard a lot of data
// (and with sparse images at small scales can give very surprising results).

var Mipmapper = function () {
function Mipmapper(img) {
_classCallCheck(this, Mipmapper);
Expand Down
5 changes: 3 additions & 2 deletions javascript/src/methods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ 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, popupOptions, label, labelOptions, highlightOptions) {
methods.addPolygons = function(polygons, layerId, group, options, popup, popupOptions, label, labelOptions, highlightOptions, crosstalkOptions) {
if(polygons.length>0) {
let df = new DataFrame()
.col("shapes", polygons)
Expand All @@ -532,7 +532,8 @@ methods.addPolygons = function(polygons, layerId, group, options, popup, popupOp
.col("label", label)
.col("labelOptions", labelOptions)
.col("highlightOptions", highlightOptions)
.cbind(options);
.cbind(options)
.cbind(crosstalkOptions || {});

addLayers(this, "shape", df, function(df, i) {
// This code used to use L.multiPolygon, but that caused
Expand Down