marker cluster upgraded to latest version + support for freezing and layers.

Author: bhaskarvk

R/layers.R

@@ -550,9 +550,9 @@ markerClusterDependencies = function() {
   list(
     htmltools::htmlDependency(
       'leaflet-markercluster',
-      '0.4.0',
+      '0.5.0',
       system.file('htmlwidgets/plugins/Leaflet.markercluster', package = 'leaflet'),
-      script = 'leaflet.markercluster.js',
+      script = c('leaflet.markercluster.js', 'leaflet.markercluster.layersupport-src.js', 'leaflet.markercluster.freezable-src.js'),
       stylesheet = c('MarkerCluster.css', 'MarkerCluster.Default.css')
     )
   )
@@ -747,17 +747,26 @@ markerOptions = function(
 #'   spiderfy it so you can see all of its markers
 #' @param removeOutsideVisibleBounds clusters and markers too far from the
 #'   viewport are removed from the map for performance
+#' @param spiderLegPolylineOptions Allows you to specify PolylineOptions (\url{http://leafletjs.com/reference.html#polyline-options}) to style spider legs. By default, they are { weight: 1.5, color: '#222', opacity: 0.5 }
+#' @param freezeAtZoom Allows you to freeze cluster expansion to a zoom level.
+#' Can be a zoom level e.g. 10, 12 or 'max' or 'maxKeepSpiderify'
+#' See \url{https://github.com/ghybs/Leaflet.MarkerCluster.Freezable#api-reference}
 #' @describeIn map-options Options for marker clusters
 #' @export
 markerClusterOptions = function(
   showCoverageOnHover = TRUE, zoomToBoundsOnClick = TRUE,
-  spiderfyOnMaxZoom = TRUE, removeOutsideVisibleBounds = TRUE, ...
+  spiderfyOnMaxZoom = TRUE, removeOutsideVisibleBounds = TRUE,
+  spiderLegPolylineOptions = list(weight= 1.5, color= '#222', opacity= 0.5),
+  freezeAtZoom = FALSE,
+  ...
 ) {
   list(
     showCoverageOnHover = showCoverageOnHover,
     zoomToBoundsOnClick = zoomToBoundsOnClick,
     spiderfyOnMaxZoom = spiderfyOnMaxZoom,
-    removeOutsideVisibleBounds = removeOutsideVisibleBounds, ...
+    removeOutsideVisibleBounds = removeOutsideVisibleBounds,
+    spiderLegPolylineOptions =  spiderLegPolylineOptions,
+    freezeAtZoom = freezeAtZoom, ...
   )
 }
 

R/plugin-minimap.R

@@ -29,7 +29,7 @@ leafletMiniMapDependencies <- function() {
 #' @param zoomLevelFixed  Overrides the offset to apply a fixed zoom level to
 #'    the minimap regardless of the main map zoom.
 #'    Set it to any valid zoom level, if unset zoomLevelOffset is used instead.
-#' @param centerFixed: Applies a fixed position to the minimap regardless of
+#' @param centerFixed Applies a fixed position to the minimap regardless of
 #'    the main map's view / position. Prevents panning the minimap, but does
 #'    allow zooming (both in the minimap and the main map).
 #'    If the minimap is zoomed, it will always zoom around the centerFixed point.

inst/examples/marker-clustering.R

@@ -0,0 +1,64 @@
+library(leaflet)
+
+#' Add a Level factor to quakes
+quakes <- quakes %>%
+  dplyr::mutate(mag.level = cut(mag,c(3,4,5,6),
+                                labels = c('>3 & <=4', '>4 & <=5', '>5 & <=6')))
+
+l <- leaflet() %>% addTiles()
+
+#' <br/><br/>
+#' Default Clustering
+l %>%
+  addMarkers(data=quakes, clusterOptions = markerClusterOptions())
+
+#' <br/><br/>
+#' Clustering Frozen at level 5
+l %>%
+  addMarkers(data=quakes, clusterOptions = markerClusterOptions(freezeAtZoom=6))
+
+#' <br/><br/>
+#' Clustering of Label Only Clusters
+l %>%
+  addLabelOnlyMarkers(data=quakes,
+                      lng=~long, lat=~lat,
+                      label=~as.character(mag),
+                      clusterOptions = markerClusterOptions(),
+                      labelOptions = labelOptions(noHide = T,
+                                                  direction = 'auto'))
+#' <br/><br/>
+#' Clustering + Layers
+quakes.df <- split(quakes, quakes$mag.level)
+
+l2 <- l
+names(quakes.df) %>%
+  purrr::walk( function(df) {
+    l2 <<- l2 %>%
+      addMarkers(data=quakes.df[[df]],
+                          lng=~long, lat=~lat,
+                          label=~as.character(mag),
+                          popup=~as.character(mag),
+                          group = df,
+                          clusterOptions = markerClusterOptions(removeOutsideVisibleBounds = F),
+                          labelOptions = labelOptions(noHide = T,
+                                                       direction = 'auto'))
+  })
+
+l2 %>%
+  addLayersControl(
+    overlayGroups = names(quakes.df),
+    options = layersControlOptions(collapsed = FALSE)
+  )
+
+#' <br/><br/>
+#' Clustering with custom iconCreateFunction
+leaflet(quakes) %>% addTiles() %>%
+  addMarkers(clusterOptions =
+               markerClusterOptions(iconCreateFunction =
+                                      JS("
+                                          function(cluster) {
+                                             return new L.DivIcon({
+                                               html: '<div style=\"background-color:rgba(77,77,77,0.5)\"><span>' + cluster.getChildCount() + '</div><span>',
+                                               className: 'marker-cluster'
+                                             });
+                                           }")))

inst/htmlwidgets/leaflet.js

@@ -986,7 +986,13 @@ function addMarkers(map, df, group, clusterOptions, clusterId, markerFunc) {
     var clusterGroup = this.layerManager.getLayer("cluster", clusterId),
         cluster = clusterOptions !== null;
     if (cluster && !clusterGroup) {
-      clusterGroup = _leaflet2.default.markerClusterGroup(clusterOptions);
+      //clusterGroup = L.markerClusterGroup(clusterOptions);
+      clusterGroup = _leaflet2.default.markerClusterGroup.layerSupport(clusterOptions);
+      if (clusterOptions.freezeAtZoom) {
+        var freezeAtZoom = clusterOptions.freezeAtZoom;
+        delete clusterOptions.freezeAtZoom;
+        clusterGroup.freezeAtZoom(freezeAtZoom);
+      }
       clusterGroup.clusterLayerStore = new _clusterLayerStore2.default(clusterGroup);
     }
     var extraInfo = cluster ? { clusterId: clusterId } : {};
@@ -1846,7 +1852,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);

inst/htmlwidgets/lib/Leaflet.label/leaflet.label-src.js

@@ -606,13 +606,15 @@ L.FeatureGroup.include({
 	},
 
 	unbindLabel: function () {
-		return this.invoke('unbindLabel');
+        //return this.invoke('unbindLabel');
+		return this.invoke('hideLabel');
 	},
 
 	updateLabelContent: function (content) {
 		this.invoke('updateLabelContent', content);
 	}
 });
 
+
 	return LeafletLabel;
 }, window));

inst/htmlwidgets/lib/Leaflet.label/leaflet.label.js

@@ -3,4 +3,12 @@
 	-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
 	-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
 	transition: transform 0.3s ease-out, opacity 0.3s ease-in;
-	}
+}
+
+.leaflet-cluster-spider-leg {
+	/* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */
+	-webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in;
+	-moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in;
+	-o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in;
+	transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in;
+}