fix addPolygon with sf names (#613)

* sanitise names

* added news item for fixing 595

* roxygen version updated

* roxygen caused update to .Rd

* move sanitization of sf st_geometries into a helper method

* document expr directly

Author: schloerke

DESCRIPTION

@@ -63,6 +63,6 @@ Suggests:
     RJSONIO,
     purrr,
     testthat
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
 Encoding: UTF-8
 LazyData: true

NEWS

@@ -4,6 +4,7 @@ leaflet 2.0.3
 BUG FIXES and IMPROVEMENTS
 * Fixed [rstudio/crosstalk#58](https://github.com/rstudio/crosstalk/issues/58), which caused Leaflet maps that used Crosstalk shared data in Shiny apps, to be redrawn at incorrect times.
 * Upgrade leaflet-provider to 1.4.0, enable more map variants such as CartoDB.Voyager (#567)
+* `sf` objects with `names` attributes in the `st_geometry` now visualise correctly (#595)
 
 
 

R/normalize-sf.R

@@ -6,10 +6,16 @@ metaData.sf <- function(obj) {
 }
 
 # pointsData --------------------------------------------------------------
+sanitize_sf <- function(obj) {
+  sanitized_sf <- sf::st_geometry(obj)
+  attr(sanitized_sf, "names") <- NULL
+  sanitized_sf
+}
+
 
 #' @export
 pointData.sf <- function(obj) {
-  pointData(sf::st_geometry(obj))
+  pointData(sanitize_sf(obj))
 }
 
 #' @export
@@ -67,7 +73,7 @@ pointData.sfc_GEOMETRY <- function(obj) {
 
 #' @export
 polygonData.sf <- function(obj) {
-  polygonData(sf::st_geometry(obj))
+  polygonData(sanitize_sf(obj))
 }
 
 #' @export

R/shiny.R

@@ -22,6 +22,9 @@ leafletOutput <- function(outputId, width = "100%", height = 400) {
   htmlwidgets::shinyWidgetOutput(outputId, "leaflet", width, height, "leaflet")
 }
 
+# use expr description from htmlwidgets to avoid bad inherit params code
+#' @param expr An expression that generates an HTML widget (or a
+#'   \href{https://rstudio.github.io/promises/}{promise} of an HTML widget).
 #' @rdname map-shiny
 #' @export
 renderLeaflet <- function(expr, env = parent.frame(), quoted = FALSE) {