Merge branch 'master' into v1.0

Author: jcheng5

.Rbuildignore

@@ -12,5 +12,4 @@
 ^javascript$
 ^package\.json$
 ^node_modules$
-
 ^data-raw$

NAMESPACE

@@ -2,14 +2,14 @@
 
 S3method("[",leaflet_awesome_icon_set)
 S3method("[",leaflet_icon_set)
+S3method(metaData,SharedData)
 S3method(metaData,SpatialLinesDataFrame)
 S3method(metaData,SpatialPointsDataFrame)
 S3method(metaData,SpatialPolygonsDataFrame)
 S3method(metaData,data.frame)
 S3method(metaData,list)
 S3method(metaData,map)
 S3method(metaData,sf)
-S3method(metaData,sharedData)
 S3method(pointData,POINT)
 S3method(pointData,SharedData)
 S3method(pointData,SpatialPoints)

NEWS

@@ -13,6 +13,11 @@ leaflet 1.1.1
 * Add `groupOptions` parameter, currently the only option is letting you specify
   zoom levels at which a group should be visible.
 
+* Fix bug with accessing columns in formulas when the data source is a Crosstalk
+  SharedData object wrapping a spatial data frame or sf object.
+
+* Fix incorrect opacity on NA entry in legend. (PR #425)
+
 leaflet 1.1.0
 --------------------------------------------------------------------------------
 

R/layers.R

@@ -478,7 +478,7 @@ clearPopups <- function(map) {
 #'
 #' @param label A vector or list of plain characters or HTML (marked by
 #'   \code{\link[htmltools]{HTML}}), or a formula that resolves to such a value.
-#' @param data A data frame over which the formua is evaluated.
+#' @param data A data frame over which the formula is evaluated.
 #'
 #' @keywords internal
 #' @export
@@ -734,7 +734,7 @@ makeIcon <- function(iconUrl = NULL, iconRetinaUrl = NULL, iconWidth = NULL, ico
 #' @param iconWidth,iconHeight size of the icon image in pixels
 #' @param iconAnchorX,iconAnchorY the coordinates of the "tip" of the icon
 #'   (relative to its top left corner, i.e. the top left corner means
-#'   \code{iconAnchorX = 0} and \code{iconAnchorY = 0)}, and the icon will be
+#'   \code{iconAnchorX = 0} and \code{iconAnchorY = 0}), and the icon will be
 #'   aligned so that this point is at the marker's geographical location
 #' @param shadowUrl the URL or file path to the icon shadow image
 #' @param shadowRetinaUrl the URL or file path to the retina sized version of

R/legend.R

@@ -49,13 +49,19 @@
 #' @param layerId the ID of the legend; subsequent calls to \code{addLegend}
 #'   or \code{addControl} with the same \code{layerId} will replace this
 #'   legend. The ID can also be used with \code{removeControl}.
+#' @param group \code{group} name of a leaflet layer group.
+#'   Supplying this value will tie the legend to the leaflet layer group
+#'   with this name and will auto add/remove the legend as the
+#'   group is added/removed, for example via layerControl.
+#'   You will need to set the \code{group} when you add a layer
+#'   (e.g. \code{\link{addPolygons}}) and supply the same name here.
 #' @example inst/examples/legend.R
 #' @export
 addLegend <- function(
   map, position = c('topright', 'bottomright', 'bottomleft', 'topleft'),
-  pal, values, na.label = 'NA', bins = 7, colors, opacity = 0.5, labels,
+  pal, values, na.label = 'NA', bins = 7, colors, opacity = 0.5, labels = NULL,
   labFormat = labelFormat(), title = NULL, className = "info legend",
-  layerId = NULL
+  layerId = NULL, group = NULL
 ) {
   position = match.arg(position)
   type = 'unknown'; na.color = NULL
@@ -147,7 +153,7 @@ addLegend <- function(
     colors = I(unname(colors)), labels = I(unname(labels)),
     na_color = na.color, na_label = na.label, opacity = opacity,
     position = position, type = type, title = title, extra = extra,
-    layerId = layerId, className = className
+    layerId = layerId, className = className, group = group
   )
   invokeMethod(map, getMapData(map), "addLegend", legend)
 }

R/normalize-SharedData.R

@@ -1,6 +1,6 @@
 #' @export
-metaData.sharedData <- function(obj) {
-  obj$data(withSelection = TRUE, withFilter = FALSE, withKey = TRUE)
+metaData.SharedData <- function(obj) {
+  metaData(obj$data(withSelection = TRUE, withFilter = FALSE, withKey = TRUE))
 }
 
 #' @export

R/plugin-awesomeMarkers.R

@@ -175,7 +175,7 @@ makeAwesomeIcon <- function(
 #'   = 'fa'})
 #' @param extraClasses Additional css classes to include on the icon.
 #' @return A list of awesome-icon data that can be passed to the \code{icon}
-#' @param squareMarker Whether to use a sqare marker.
+#' @param squareMarker Whether to use a square marker.
 #' @param iconRotate Rotate the icon by a given angle.
 #' @param fontFamily Used when \code{text} option is specified.
 #' @param text Use this text string instead of an icon.

R/plugin-measure.R

@@ -26,7 +26,7 @@ leafletMeasureDependencies <- function() {
 #' @param completedColor base color to use for features generated
 #'           from a completed measurement.
 #'           Value should be a color represented as a hexadecimal string.
-#' @param popupOptions \code{list} of ptions applied to the popup
+#' @param popupOptions \code{list} of options applied to the popup
 #'           of the resulting measure feature.
 #'           Properties may be any \href{http://leafletjs.com/reference.html#popup-options}{standard Leaflet popup options}.
 #' @param captureZIndex Z-index of the marker used to capture measure clicks.

R/utils.R

@@ -152,7 +152,7 @@ leafletProxy <- function(mapId, session = shiny::getDefaultReactiveDomain(),
   # This won't be necessary in future versions of Shiny, as session$ns (and
   # other forms of ns()) will be smart enough to only namespace un-namespaced
   # IDs.
-  if (!is.null(session$ns) && nzchar(session$ns(NULL)) && !startsWith(mapId, session$ns(""))) {
+  if (!is.null(session$ns) && nzchar(session$ns(NULL)) && substring(mapId, 1, nchar(session$ns(""))) != session$ns("")) {
     mapId <- session$ns(mapId)
   }
 

inst/examples/groupOptions.R

@@ -0,0 +1,31 @@
+library(leaflet)
+pal <- colorQuantile("YlOrRd", quakes$mag)
+
+leaflet(quakes) %>%
+  addProviderTiles(providers$Esri.OceanBasemap, group = "basic") %>%
+  addCircleMarkers(group = "detail", fillOpacity = 0.5,
+  radius = ~mag * 5, color = ~pal(mag), stroke = FALSE) %>%
+  addLegend(pal = pal, values = ~mag, group='detail', position='bottomleft')
+
+l <- leaflet(quakes) %>%
+  addProviderTiles(providers$Esri.OceanBasemap, group = "basic") %>%
+  addMarkers(data = quakes, group = "basic") %>%
+  addCircleMarkers(group = "detail", fillOpacity = 0.5,
+  radius = ~mag * 5, color = ~pal(mag), stroke = FALSE) %>%
+  addLegend(pal = pal, values = ~mag, group='detail', position='bottomleft')  %>%
+  groupOptions("detail", zoomLevels = 7:18) %>%
+  addControl(htmltools::HTML("Zoom Level"), position = "topright",
+             layerId = "zoom_display")
+
+# Just to show the zoom level
+htmlwidgets::onRender(l, jsCode = htmlwidgets::JS(
+  "function(el, x) {
+    debugger;
+    var map = this;
+    detailsControl = document.getElementById('zoom_display');
+    detailsControl.innerHTML = '<div>Zoom Level:'+map.getZoom()+'</div>';
+    map.on('zoomend', function(e) {
+       detailsControl = document.getElementById('zoom_display');
+       detailsControl.innerHTML = '<div>Zoom Level:'+map.getZoom()+'</div>';
+    });
+  }"))