start to remove leaflet-label since now L.tooltip

Author: timelyportfolio

R/layers.R

@@ -497,12 +497,14 @@ 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,
@@ -514,8 +516,13 @@ labelOptions <- function(
   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, ...

inst/errors/errors.Rmd

@@ -16,5 +16,32 @@ fixed but not solved [commit](https://github.com/timelyportfolio/leaflet/commit/
 
 ### controls
 
-leaflet-measure, layersControl, and probably others do not remove
+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]()

inst/htmlwidgets/leaflet.js

@@ -1317,12 +1317,12 @@ function addMarkers(map, df, group, clusterOptions, clusterId, markerFunc) {
           if (label !== null) {
             if (labelOptions !== null) {
               if (labelOptions.noHide) {
-                marker.bindLabel(label, labelOptions).showLabel();
+                marker.bindTooltip(label, labelOptions).showLabel();
               } else {
-                marker.bindLabel(label, labelOptions);
+                marker.bindTooltip(label, labelOptions);
               }
             } else {
-              marker.bindLabel(label);
+              marker.bindTooltip(label);
             }
           }
           marker.on("click", mouseHandler(this.id, thisId, thisGroup, "marker_click", extraInfo), this);
@@ -1462,14 +1462,14 @@ function addLayers(map, category, df, layerFunc) {
               }
             }
           }
-          if (layer.bindLabel) {
+          if (layer.bindTooltip) {
             var label = df.get(i, "label");
             var labelOptions = df.get(i, "labelOptions");
             if (label !== null) {
               if (labelOptions !== null) {
-                layer.bindLabel(label, labelOptions);
+                layer.bindTooltip(label, labelOptions);
               } else {
-                layer.bindLabel(label);
+                layer.bindTooltip(label);
               }
             }
           }

inst/htmlwidgets/leaflet.yaml

@@ -12,11 +12,6 @@ dependencies:
     version: 1.0.0
     src: "htmlwidgets/lib/leafletfix"
     stylesheet: leafletfix.css
-  - name: leaflet-label
-    version: 0.2.2
-    src: "htmlwidgets/lib/Leaflet.label"
-    script: leaflet.label.js
-    stylesheet: leaflet.label.css
   - name: Proj4Leaflet
     version: 0.7.2
     src: "htmlwidgets/plugins/Proj4Leaflet"