Upgrade to Leaflet v1.x

DESCRIPTION

@@ -64,5 +64,5 @@ Suggests:
     RJSONIO,
     purrr,
     testthat
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
 LazyData: true

NEWS

@@ -1,3 +1,12 @@
+leaflet 2.0
+--------------------------------------------------------------------------------
+
+* update to leaflet.js v1.0.3
+
+* all plugins updated to their newest versions compatible with leaflet > 1.0
+
+* leaflet-label plugin now L.tooltip in leaflet.js.  labelOptions() now translates old options clickable to interactive and noHide to permanent.
+
 leaflet 1.1.1
 --------------------------------------------------------------------------------
 

R/layers.R

@@ -306,7 +306,7 @@ tileOptions <- function(
   zoomOffset = 0,
   zoomReverse = FALSE,
   opacity = 1.0,
-  zIndex = NULL,
+  zIndex = 1,
   unloadInvisibleTiles = NULL,
   updateWhenIdle = NULL,
   detectRetina = FALSE,
@@ -497,25 +497,32 @@ safeLabel <- function(label, data) {
 
 #' @param
 #' noHide,direction,offset,textsize,textOnly,style
-#' label options; see \url{https://github.com/Leaflet/Leaflet.label#options}
+#' label options; see \url{http://leafletjs.com/reference-1.0.3.html#tooltip-option}
 #' @describeIn map-options Options for labels
 #' @export
 labelOptions <- function(
-  clickable = FALSE,
-  noHide = FALSE,
+  interactive = FALSE,
+  clickable = NULL,
+  noHide = NULL,
+  permanent = FALSE,
   className = '',
   direction = 'right',
   #pane = NULL,
-  offset = c(12,-15),
+  offset = c(0,0),
   opacity = 1,
   textsize = "10px",
   textOnly = FALSE,
   style = NULL,
   zoomAnimation = TRUE,
   ...
 ) {
+  # use old clickable if provided
+  if(!is.null(clickable) && interactive != clickable) interactive <- clickable
+  # use old noHide if provided
+  if(!is.null(noHide) && permanent != noHide) permanent <- noHide
+
   list(
-    clickable = clickable, noHide = noHide, direction = direction,
+    interactive = interactive, permanent = permanent, direction = direction,
     opacity = opacity, offset = offset,
     textsize = textsize, textOnly = textOnly, style = style,
     zoomAnimation = zoomAnimation, className = className, ...
@@ -624,7 +631,7 @@ markerClusterDependencies <- function() {
   list(
     htmltools::htmlDependency(
       'leaflet-markercluster',
-      '0.5.0',
+      '1.0.4',
       system.file('htmlwidgets/plugins/Leaflet.markercluster', package = 'leaflet'),
       script = c('leaflet.markercluster.js', 'leaflet.markercluster.layersupport-src.js', 'leaflet.markercluster.freezable-src.js'),
       stylesheet = c('MarkerCluster.css', 'MarkerCluster.Default.css')

R/plugin-measure.R

@@ -2,7 +2,7 @@ leafletMeasureDependencies <- function() {
   list(
     htmltools::htmlDependency(
       "leaflet-measure",
-      "2.0.2",
+      "2.1.5",
       system.file("htmlwidgets/lib/leaflet-measure", package = "leaflet"),
       script = "leaflet-measure.min.js",
       stylesheet = "leaflet-measure.css"
@@ -54,51 +54,51 @@ leafletMeasureDependencies <- function() {
 #'
 #' # customizing
 #' leaf %>% addMeasure(
-#'    position = "bottomleft"
-#'   , primaryLengthUnit = "meters"
-#'   , primaryAreaUnit = "sqmeters"
-#'   , activeColor = "#3D535D"
-#'   , completedColor = "#7D4479"
-#'   , localization = 'de'
+#'   position = "bottomleft",
+#'   primaryLengthUnit = "meters",
+#'   primaryAreaUnit = "sqmeters",
+#'   activeColor = "#3D535D",
+#'   completedColor = "#7D4479",
+#'   localization = 'de'
 #' )
 #'
 #' @export
 addMeasure <- function(
-  map
-  , position = "topright"
-  , primaryLengthUnit = "feet"
-  , secondaryLengthUnit = NULL
-  , primaryAreaUnit = "acres"
-  , secondaryAreaUnit = NULL
-  , activeColor = "#ABE67E"
-  , completedColor ="#C8F2BE"
-  , popupOptions = list( className =  'leaflet-measure-resultpopup', autoPanPadding =  c(10,10) )
-  , captureZIndex = 10000
-  , localization = 'en'
-  , decPoint = '.'
-  , thousandsSep = ','
+  map,
+  position = "topright",
+  primaryLengthUnit = "feet",
+  secondaryLengthUnit = NULL,
+  primaryAreaUnit = "acres",
+  secondaryAreaUnit = NULL,
+  activeColor = "#ABE67E",
+  completedColor ="#C8F2BE",
+  popupOptions = list( className =  'leaflet-measure-resultpopup', autoPanPadding =  c(10,10) ),
+  captureZIndex = 10000,
+  localization = 'en',
+  decPoint = '.',
+  thousandsSep = ','
 ) {
   map$dependencies <- c(map$dependencies, leafletMeasureDependencies())
   invokeMethod(
-    map
-    , getMapData(map)
-    , 'addMeasure'
-    , Filter(
-        Negate(is.null)
-        ,list(
-          position = position
-          , primaryLengthUnit = primaryLengthUnit
-          , secondaryLengthUnit = secondaryLengthUnit
-          , primaryAreaUnit = primaryAreaUnit
-          , secondaryAreaUnit = secondaryAreaUnit
-          , activeColor = activeColor
-          , completedColor = completedColor
-          , popupOptions = popupOptions
-          , captureZIndex = captureZIndex
-          , localization = localization
-          , decPoint = decPoint
-          , thousandsSep = thousandsSep
-        )
+    map,
+    getMapData(map),
+    'addMeasure',
+    Filter(
+      Negate(is.null),
+      list(
+        position = position,
+        primaryLengthUnit = primaryLengthUnit,
+        secondaryLengthUnit = secondaryLengthUnit,
+        primaryAreaUnit = primaryAreaUnit,
+        secondaryAreaUnit = secondaryAreaUnit,
+        activeColor = activeColor,
+        completedColor = completedColor,
+        popupOptions = popupOptions,
+        captureZIndex = captureZIndex,
+        localization = localization,
+        decPoint = decPoint,
+        thousandsSep = thousandsSep
+      )
     )
   )
 }
@@ -107,8 +107,8 @@ addMeasure <- function(
 #' @rdname remove
 removeMeasure <- function( map ){
   invokeMethod(
-    map
-    , getMapData(map)
-    , 'removeMeasure'
+    map,
+    getMapData(map),
+    'removeMeasure'
   )
 }

inst/errors/errors.Rmd

@@ -0,0 +1,56 @@
+# Errors
+
+### ? leaflet
+
+
+```{r}
+m %>% addMarkers(rand_lng(), rand_lat())
+# html/css/js errors
+# imagesmarker-icon-2x.png Failed to load resource: the server responded with a status of 403 (Forbidden)
+# imagesmarker-shadow.png Failed to load resource: the server responded with a status of 403 (Forbidden)
+```
+
+error was pre-existing and not caused by 1.0.3
+fixed but not solved [commit](https://github.com/timelyportfolio/leaflet/commit/4b841f02c399a206c84642a42e5eb189498f9b65)
+
+
+### controls
+
+leaflet-measure and layersControl do not remove
+
+not an `v1.0.3` issue but fixed [commit](https://github.com/timelyportfolio/leaflet/commit/c6762e313f268954d8c19225177a991129c20a98) and [commit](https://github.com/timelyportfolio/leaflet/commit/55334c10536f6bc0b7250139e64e262f2cb48c51).  However, none of controls use `ControlStore` mechanism, so would be nice to resolve this on a grander scale.
+
+
+### labels/tooltips
+
+https://github.com/Leaflet/Leaflet.label#upgrade-path-to-ltooltip
+
+leaflet-label now in main leaflet as L.tooltip.  How do we handle changed options in `labelOptions`?.  Do we just translate `clickable` to `interactive` and `clickable` to `interactive` in R so old examples still work?
+
+**NOTE: starting with Leaflet 1.0, `L.Label` is added to Leaflet core as `L.Tooltip` and this plugin is deprecrated.**
+
+### Upgrade path to L.Tooltip
+
+- `bindLabel`, `openLabel` and so should be replaced by `bindTooltip`, `openTooltip`, etc.
+- option `clickable` is now named `interactive`
+- option `noHide` is now named `permanent`
+- default `offset` is now [6, -6]
+- default `direction` is now `auto`
+- default `opacity` is now `0.9`
+- the CSS has been fully refactored
+
+- Bonus: L.Tooltip also works for paths: polygons, polylines, etc.
+- Bonus: new directions are supported: `top`, `bottom`, `center`
+- Bonus: new option `sticky` will make the label follow the mouse instead of being displayed at the feature center
+
+
+* removed leaflet-label source and in yaml in [commit]()
+
+
+### tileLayer.canvas no longer available
+
+```
+library(mapview)
+
+leaflet() %>% addRasterImage(poppendorf[[1]])
+```

inst/examples/crosstalk.R

@@ -0,0 +1,34 @@
+# devtools::install_github("rstudio/crosstalk")
+# devtools::install_github("rstudio/leaflet")
+
+library(crosstalk)
+library(leaflet)
+library(htmlwidgets)
+
+rand_lng = function(n = 10) rnorm(n, -93.65, .01)
+rand_lat = function(n = 10) rnorm(n, 42.0285, .01)
+
+pts <- SharedData$new(
+  data.frame(
+    lng = rand_lng(),
+    lat = rand_lat()
+  ),
+  group = "grp1"
+)
+
+
+lf <- leaflet(pts) %>%
+  addTiles() %>%
+  addMarkers()
+
+
+onRender(
+  lf,
+"
+function(el,x) {
+  debugger;
+  var sl = new crosstalk.SelectionHandle('grp1');
+  sl.on('change', function(val){console.log(val);})
+}
+"
+)

inst/examples/crosstalk_shiny.R

@@ -0,0 +1,65 @@
+# devtools::install_github("rstudio/crosstalk")
+# devtools::install_github("rstudio/leaflet")
+
+library(crosstalk)
+library(leaflet)
+library(shiny)
+library(dplyr)
+
+rand_lng = function(n = 10) rnorm(n, -93.65, .01)
+rand_lat = function(n = 10) rnorm(n, 42.0285, .01)
+
+pts <- SharedData$new(
+  data.frame(
+    id = 1:10,
+    lng = rand_lng(),
+    lat = rand_lat()
+  ),
+  key = ~id,
+  group = "grp1"
+)
+
+
+ui <- fluidPage(
+  fluidRow(
+    column(2, filter_select(id="filterselect", label="Points", sharedData=pts, group=~id)),
+    column(6, leafletOutput("leaflet1"))
+  ),
+  h4("Selected points"),
+  verbatimTextOutput("selectedpoints")
+)
+
+server <- function(input, output, session) {
+
+  pts <- SharedData$new(
+    data.frame(
+      id = 1:10,
+      lng = rand_lng(),
+      lat = rand_lat()
+    ),
+    key = ~id,
+    group = "grp1"
+  )
+
+
+  lf <- leaflet(pts) %>%
+    addTiles() %>%
+    addMarkers()
+
+  not_rendered <- TRUE
+
+  output$leaflet1 <- renderLeaflet({
+    if(req(not_rendered,cancelOutput=TRUE)) {
+      not_rendered <- FALSE
+      lf
+    }
+  })
+
+  output$selectedpoints <- renderPrint({
+    df <- pts$data(withSelection = TRUE)
+    cat(nrow(df), "observation(s) selected\n\n")
+    str(dplyr::glimpse(df))
+  })
+}
+
+shinyApp(ui, server)

inst/examples/draw_shiny_deleted.R

@@ -0,0 +1,30 @@
+library(leaflet)
+library(leaflet.extras)
+library(shiny)
+
+#using examples from ?leaflet
+rand_lng = function(n = 10) rnorm(n, -93.65, .01)
+rand_lat = function(n = 10) rnorm(n, 42.0285, .01)
+m = leaflet() %>%
+  addTiles() %>%
+  addPolygons(rand_lng(4), rand_lat(4), group = 'foo') %>%
+  addPolygons(rand_lng(4), rand_lat(4), group = 'foo') %>%
+  addDrawToolbar(targetGroup = "foo", editOptions = editToolbarOptions())
+
+# do this in GlobalEnv only for example purposes
+deleted <- list()
+ui <- leafletOutput("leafmap")
+server <- function(input, output, session) {
+  output$leafmap <- renderLeaflet({m})
+
+  observeEvent(input$leafmap_draw_deleted_features,{
+    str(input$leafmap_draw_deleted_features, max.level=2)
+    deleted <<- c(
+      deleted,
+      input$leafmap_draw_deleted_features
+    )
+  })
+}
+shinyApp(ui, server)
+
+str(deleted, max.level=2)