From 1085c6f826e759f219270ed18ed8fd9ba299ca5a Mon Sep 17 00:00:00 2001
From: Bhaskar Karambelkar <bhaskarvk@gmail.com>
Date: Fri, 3 Feb 2017 13:43:02 -0500
Subject: [PATCH] Support for Leaflet.heat plugin. Fixes #1. Also fixed
 gradient in webgl heatmap.

---
 NAMESPACE                                     |   7 +
 R/heatmap.R                                   | 220 ++++++++++++++++++
 R/webGLHeatmap.R                              |  13 +-
 inst/examples/heatmaps.R                      |  41 ++--
 inst/examples/webglHeatmaps.R                 | 104 +++++++++
 inst/htmlwidgets/lib/heat/LICENSE             |  22 ++
 inst/htmlwidgets/lib/heat/heat-bindings.js    | 181 ++++++++++++++
 inst/htmlwidgets/lib/heat/leaflet-heat.js     |   1 +
 inst/htmlwidgets/lib/heat/leaflet-heat2.js    |   1 +
 inst/htmlwidgets/lib/heat/package.json        |  54 +++++
 .../lib/webgl-heatmap/deep-sea-gradient.png   | Bin 0 -> 3403 bytes
 .../lib/webgl-heatmap/skyline-gradient.png    | Bin 0 -> 3452 bytes
 .../webgl-heatmap/webgl-heatmap-bindings.js   |  35 ++-
 man/heatmap.Rd                                | 115 ++++++++-
 14 files changed, 759 insertions(+), 35 deletions(-)
 create mode 100644 R/heatmap.R
 create mode 100644 inst/examples/webglHeatmaps.R
 create mode 100644 inst/htmlwidgets/lib/heat/LICENSE
 create mode 100644 inst/htmlwidgets/lib/heat/heat-bindings.js
 create mode 100644 inst/htmlwidgets/lib/heat/leaflet-heat.js
 create mode 100644 inst/htmlwidgets/lib/heat/leaflet-heat2.js
 create mode 100644 inst/htmlwidgets/lib/heat/package.json
 create mode 100644 inst/htmlwidgets/lib/webgl-heatmap/deep-sea-gradient.png
 create mode 100644 inst/htmlwidgets/lib/webgl-heatmap/skyline-gradient.png

diff --git a/NAMESPACE b/NAMESPACE
index 5082c824..df9b14b2 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -6,17 +6,22 @@ export(activateGPS)
 export(addAwesomeMarkersDependencies)
 export(addBootstrapDependency)
 export(addCSV)
+export(addCSVHeatmap)
 export(addControlGPS)
 export(addDrawToolbar)
 export(addFullscreenControl)
 export(addGPX)
+export(addGPXHeatmap)
 export(addGeoJSONChoropleth)
+export(addGeoJSONHeatmap)
 export(addGeoJSONv2)
 export(addGeodesicPolylines)
 export(addGreatCircles)
 export(addHash)
+export(addHeatmap)
 export(addKML)
 export(addKMLChoropleth)
+export(addKMLHeatmap)
 export(addMeasurePathToolbar)
 export(addPulseMarkers)
 export(addSearchMarker)
@@ -29,6 +34,7 @@ export(addWebGLGPXHeatmap)
 export(addWebGLGeoJSONHeatmap)
 export(addWebGLHeatmap)
 export(addWebGLKMLHeatmap)
+export(clearHeatmap)
 export(clearWebGLHeatmap)
 export(csvParserOptions)
 export(deactivateGPS)
@@ -53,6 +59,7 @@ export(pulseIconList)
 export(pulseIcons)
 export(removeControlGPS)
 export(removeDrawToolbar)
+export(removeHeatmap)
 export(removeStyleEditor)
 export(removeWebGLHeatmap)
 export(searchMarkersOptions)
diff --git a/R/heatmap.R b/R/heatmap.R
new file mode 100644
index 00000000..46283d55
--- /dev/null
+++ b/R/heatmap.R
@@ -0,0 +1,220 @@
+
+# Source https://github.com/Leaflet/Leaflet.heat
+heatmapDependency <- function() {
+  list(
+    htmltools::htmlDependency(
+      "Leaflet.heat",version = "0.1.0",
+      system.file("htmlwidgets/lib/heat", package = "leaflet.extras"),
+      script = c("leaflet-heat.js", "heat-bindings.js")
+    )
+  )
+}
+
+#' Add a heatmap
+#' @param map the map widget.
+#' @param lng a numeric vector of longitudes, or a one-sided formula of the form
+#'   \code{~x} where \code{x} is a variable in \code{data}; by default (if not
+#'   explicitly provided), it will be automatically inferred from \code{data} by
+#'   looking for a column named \code{lng}, \code{long}, or \code{longitude}
+#'   (case-insensitively)
+#' @param lat a vector of latitudes or a formula (similar to the \code{lng}
+#'   argument; the names \code{lat} and \code{latitude} are used when guessing
+#'   the latitude column from \code{data})
+#' @param intensity intensity of the heat. A vector of numeric values or a formula.
+#' @param minOpacity minimum opacity at which the heat will start
+#' @param max  maximum point intensity. The default is \code{1.0}
+#' @param radius radius of each "point" of the heatmap.  The default is
+#'          \code{25}.
+#' @param blur amount of blur to apply.  The default is \code{15}.
+#'          \code{blur=1} means no blur.
+#' @param gradient palette name from \code{RColorBrewer} or an array of
+#'          of colors to be provided to \code{\link{colorNumeric}}, or
+#'          a color mapping function returned from \code{colorNumeric}
+#' @param cellSize  the cell size in the grid. Points which are closer
+#'          than this may be merged. Defaults to `radius / 2`.s
+#'          Set to `1` to do almost no merging.
+#' @param layerId the layer id
+#' @param group the name of the group the newly created layers should belong to
+#'   (for \code{\link{clearGroup}} and \code{\link{addLayersControl}} purposes).
+#'   Human-friendly group names are permitted--they need not be short,
+#'   identifier-style names. Any number of layers and even different types of
+#'   layers (e.g. markers and polygons) can share the same group name.
+#' @param data the data object from which the argument values are derived; by
+#'   default, it is the \code{data} object provided to \code{leaflet()}
+#'   initially, but can be overridden
+#' @rdname heatmap
+#' @export
+addHeatmap = function(
+  map, lng = NULL, lat = NULL, intensity = NULL, layerId = NULL, group = NULL,
+  minOpacity = 0.05,
+  max = 1.0, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL,
+  data = leaflet::getMapData(map)
+) {
+  map$dependencies <- c(map$dependencies,
+                        heatmapDependency())
+  
+  #convert gradient to expected format from leaflet
+  if (!is.null(gradient) && !is.function(gradient)) {
+      gradient <- colorNumeric( gradient, 0:1 )
+      gradient <- as.list(gradient(0:20 / 20))
+      names(gradient) <- as.character(0:20 / 20)
+  }
+
+  pts = leaflet::derivePoints(
+    data, lng, lat, missing(lng), missing(lat), "addHeatmap")
+
+  if(is.null(intensity)) {
+    points <- cbind(pts$lat, pts$lng)
+  } else {
+    if(inherits(intensity,'formula')) {
+      intensity <- eval(intensity[[2]], data, environment(intensity))
+    }
+    points <- cbind(pts$lat, pts$lng, intensity)
+  }
+
+  leaflet::invokeMethod(
+    map, data, 'addHeatmap', points,
+    layerId, group,
+    leaflet::filterNULL(list(
+      minOpacity = minOpacity,
+      max = max,
+      radius = radius,
+      blur = blur,
+      gradient = gradient,
+      cellSize = cellSize
+    ))
+  ) %>% leaflet::expandLimits(pts$lat, pts$lng)
+}
+
+#' Adds a heatmap with data from a GeoJSON/TopoJSON file/url
+#' @param geojson The geojson or topojson url or contents as string.
+#' @param intensityProperty The property to use for determining the intensity at a point.
+#' Can be a 'string' or a JS function, or NULL.
+#' @rdname heatmap
+#' @export
+addGeoJSONHeatmap = function(
+  map, geojson, layerId = NULL, group = NULL,
+  intensityProperty = NULL,
+  minOpacity = 0.05,
+  max = 1.0, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL
+  ) {
+  map$dependencies <- c(map$dependencies, omnivoreDependencies())
+  map$dependencies <- c(map$dependencies, heatmapDependency())
+
+  leaflet::invokeMethod(
+    map, leaflet::getMapData(map),
+    'addGeoJSONHeatmap', geojson, intensityProperty,
+    layerId, group,
+    leaflet::filterNULL(list(
+      minOpacity = minOpacity,
+      max = max,
+      radius = radius,
+      blur = blur,
+      gradient = gradient,
+      cellSize = cellSize
+    )))
+}
+
+#' Adds a heatmap with data from a KML file/url
+#' @param kml The KML url or contents as string.
+#' @rdname heatmap
+#' @export
+addKMLHeatmap = function(
+  map, kml, layerId = NULL, group = NULL,
+  intensityProperty = NULL,
+  minOpacity = 0.05,
+  max = 1.0, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL
+  ) {
+  map$dependencies <- c(map$dependencies, omnivoreDependencies())
+  map$dependencies <- c(map$dependencies, heatmapDependency())
+
+  leaflet::invokeMethod(
+    map, leaflet::getMapData(map),
+    'addKMLHeatmap', kml, intensityProperty,
+    layerId, group,
+    leaflet::filterNULL(list(
+      minOpacity = minOpacity,
+      max = max,
+      radius = radius,
+      blur = blur,
+      gradient = gradient,
+      cellSize = cellSize
+    )))
+}
+
+#' Adds a heatmap with data from a CSV file/url
+#' @param csv The CSV url or contents as string.
+#' @param csvParserOptions options for parsing the CSV.
+#' Use \code{\link{csvParserOptions}}() to supply csv parser options.
+#' @rdname heatmap
+#' @export
+addCSVHeatmap = function(
+  map, csv, csvParserOptions, layerId = NULL, group = NULL,
+  intensityProperty = NULL,
+  minOpacity = 0.05,
+  max = 1.0, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL
+  ) {
+  map$dependencies <- c(map$dependencies, omnivoreDependencies())
+  map$dependencies <- c(map$dependencies, heatmapDependency())
+
+  leaflet::invokeMethod(
+    map, leaflet::getMapData(map),
+    'addCSVHeatmap', csv, intensityProperty,
+    layerId, group,
+    leaflet::filterNULL(list(
+      minOpacity = minOpacity,
+      max = max,
+      radius = radius,
+      blur = blur,
+      gradient = gradient,
+      cellSize = cellSize
+    )),
+    csvParserOptions)
+}
+
+#' Adds a heatmap with data from a GPX file/url
+#' @param gpx The GPX url or contents as string.
+#' @rdname heatmap
+#' @export
+addGPXHeatmap = function(
+  map, gpx, layerId = NULL, group = NULL,
+  intensityProperty = NULL,
+  minOpacity = 0.05,
+  max = 1.0, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL
+  ) {
+  map$dependencies <- c(map$dependencies, omnivoreDependencies())
+  map$dependencies <- c(map$dependencies, heatmapDependency())
+
+  leaflet::invokeMethod(
+    map, leaflet::getMapData(map),
+    'addGPXHeatmap', gpx, intensityProperty,
+    layerId, group,
+    leaflet::filterNULL(list(
+      minOpacity = minOpacity,
+      max = max,
+      radius = radius,
+      blur = blur,
+      gradient = gradient,
+      cellSize = cellSize
+    )))
+}
+
+
+#' removes the heatmap
+#' @rdname heatmap
+#' @export
+removeHeatmap = function(map, layerId) {
+    leaflet::invokeMethod(map, leaflet::getMapData(map), 'removeHeatmap', layerId)
+}
+
+#' clears the heatmap
+#' @rdname heatmap
+#' @export
+clearHeatmap = function(map) {
+    leaflet::invokeMethod(map, NULL, 'clearHeatmap')
+}
diff --git a/R/webGLHeatmap.R b/R/webGLHeatmap.R
index c9e4ca2e..28ce3335 100644
--- a/R/webGLHeatmap.R
+++ b/R/webGLHeatmap.R
@@ -5,7 +5,10 @@ webGLHeatmapDependency <- function() {
     htmltools::htmlDependency(
       "webgl-heatmap",version = "0.1.0",
       system.file("htmlwidgets/lib/webgl-heatmap", package = "leaflet.extras"),
-      script = c("webgl-heatmap.js", "webgl-heatmap-leaflet.js", "webgl-heatmap-bindings.js")
+      script = c("webgl-heatmap.js", "webgl-heatmap-leaflet.js",
+                 "webgl-heatmap-bindings.js"),
+      attachment = c("skyline" = "skyline-gradient.png",
+                     "deep-sea" = "deep-sea-gradient.png")
     )
   )
 }
@@ -30,7 +33,8 @@ webGLHeatmapDependency <- function() {
 #' @param size in meters or pixels
 #' @param units either 'm' or 'px'
 #' @param opacity for the canvas element
-#' @param gradientTexture image url or image
+#' @param gradientTexture Alternative colors for heatmap.
+#'    allowed values are "skyline", "deep-sea"
 #' @param alphaRange adjust transparency by changing to value between 0 and 1
 #' @param data the data object from which the argument values are derived; by
 #'   default, it is the \code{data} object provided to \code{leaflet()}
@@ -49,6 +53,11 @@ addWebGLHeatmap = function(
   map$dependencies <- c(map$dependencies,
                         webGLHeatmapDependency())
 
+  if(!is.null(gradientTexture) &&
+     !gradientTexture %in% c("skyline", "deep-sea")) {
+    stop("Only allowed values for gradientTexture are 'skyline' and 'deep-sea'")
+  }
+
   pts = leaflet::derivePoints(
     data, lng, lat, missing(lng), missing(lat), "addWebGLHeatmap")
 
diff --git a/inst/examples/heatmaps.R b/inst/examples/heatmaps.R
index e9c37efd..2bf50e43 100644
--- a/inst/examples/heatmaps.R
+++ b/inst/examples/heatmaps.R
@@ -1,18 +1,13 @@
 library(leaflet.extras)
 library(magrittr)
 
-#' Just by number of quakes
+#' Quakes
 #'
 #'
 leaflet(quakes) %>% addProviderTiles(providers$CartoDB.DarkMatter) %>%
-  addWebGLHeatmap(lng=~long, lat=~lat, size = 60000)
-
-
-#' <br/><br/>By magnitude
-#'
-#'
-leaflet(quakes) %>% addProviderTiles(providers$CartoDB.DarkMatter) %>%
-  addWebGLHeatmap(lng=~long, lat=~lat, intensity = ~mag, size=60000)
+  setView( 178, -20, 5 ) %>%
+  addHeatmap(lng = ~long, lat = ~lat, intensity = ~mag,
+             blur = 20, max = 0.05, radius = 15)
 
 #' <br/><br/>
 #' Roughly 1500 points dataset
@@ -24,19 +19,17 @@ v8$source(jsURL)
 geoJson <- geojsonio::as.json(v8$get('pubsGeoJSON'))
 spdf <- geojsonio::geojson_sp(geoJson)
 
-#' <br/><br/>Size in meters
 #'
 #'
 leaflet(spdf) %>%
   addProviderTiles(providers$Thunderforest.TransportDark) %>%
-  addWebGLHeatmap(size=60000)
+  addHeatmap(blur = 20, max = 0.05, radius = 15)
 
-#' <br/><br/>Size in Pixels
 #'
 #'
 leaflet(spdf) %>%
-  addProviderTiles(providers$Thunderforest.TransportDark) %>%
-  addWebGLHeatmap(size=25,units='px')
+  addProviderTiles(providers$Thunderforest.Transport) %>%
+  addHeatmap(blur = 20, max = 0.05, radius = 15, gradient = 'Greys')
 
 #' <br/><br/>10,000 points
 #'
@@ -46,7 +39,7 @@ v8 <- V8::v8()
 v8$source(jsURL)
 
 df <- data.frame(v8$get('addressPoints'), stringsAsFactors = F) %>%
-  set_colnames(c('lat', 'lng', 'intensity')) %>%
+  magrittr::set_colnames(c('lat', 'lng', 'intensity')) %>%
   dplyr::mutate(
     lat = as.numeric(lat),
     lng = as.numeric(lng)
@@ -57,14 +50,8 @@ df <- data.frame(v8$get('addressPoints'), stringsAsFactors = F) %>%
 #'
 leaflet(df) %>%
   addProviderTiles(providers$CartoDB.Positron) %>%
-  addWebGLHeatmap(lng=~lng, lat=~lat,size=1000)
-
-#' <br/><br/>Size in Pixels
-#'
-#'
-leaflet(df) %>%
-  addProviderTiles(providers$CartoDB.Positron) %>%
-  addWebGLHeatmap(lng=~lng, lat=~lat,size=20,units='px')
+  addHeatmap(lng=~lng, lat=~lat,
+             blur = 20, max = 0.05, radius = 15 )
 
 #' <br/><br/>
 
@@ -77,7 +64,7 @@ london.crimes <- suppressMessages(
     ~readr::read_csv(.) %>%
       dplyr::select(Latitude, Longitude) %>%
       dplyr::filter(!is.na(Latitude))) %>%
-  set_names(basename(Sys.glob(
+  magrittr::set_names(basename(Sys.glob(
     paste0(system.file('examples/data/London-Crimes', package='leaflet.extras'),
            '/2016*')))))
 
@@ -88,11 +75,11 @@ purrr::walk(
   names(london.crimes),
   function(month) {
     leaf <<- leaf %>%
-      addWebGLHeatmap(
+      addHeatmap(
         data = london.crimes[[month]],
         layerId = month, group = month,
-        lng=~Longitude, lat=~Latitude,size=40,units='px'
-        )
+        lng=~Longitude, lat=~Latitude,
+        blur = 20, max = 0.05, radius = 15)
   })
 
 leaf %>%
diff --git a/inst/examples/webglHeatmaps.R b/inst/examples/webglHeatmaps.R
new file mode 100644
index 00000000..ea9dc950
--- /dev/null
+++ b/inst/examples/webglHeatmaps.R
@@ -0,0 +1,104 @@
+library(leaflet.extras)
+library(magrittr)
+
+#' Just by number of quakes
+#'
+#'
+leaflet(quakes) %>% addProviderTiles(providers$CartoDB.DarkMatter) %>%
+  addWebGLHeatmap(lng=~long, lat=~lat, size = 60000)
+
+
+#' <br/><br/>By magnitude
+#'
+#'
+leaflet(quakes) %>% addProviderTiles(providers$CartoDB.DarkMatter) %>%
+  addWebGLHeatmap(lng=~long, lat=~lat, intensity = ~mag, size=60000)
+
+#' <br/><br/>
+#' Roughly 1500 points dataset
+#'
+library(sp)
+jsURL <- 'https://rawgit.com/Norkart/Leaflet-MiniMap/master/example/local_pubs_restaurant_norway.js'
+v8 <- V8::v8()
+v8$source(jsURL)
+geoJson <- geojsonio::as.json(v8$get('pubsGeoJSON'))
+spdf <- geojsonio::geojson_sp(geoJson)
+
+#' <br/><br/>Size in meters
+#'
+#'
+leaflet(spdf) %>%
+  addProviderTiles(providers$Thunderforest.TransportDark) %>%
+  addWebGLHeatmap(size=60000)
+
+#' <br/><br/>Size in Pixels
+#'
+#'
+leaflet(spdf) %>%
+  addProviderTiles(providers$Thunderforest.TransportDark) %>%
+  addWebGLHeatmap(size=25,units='px')
+
+#' <br/><br/>10,000 points
+#'
+#'
+jsURL <- 'http://leaflet.github.io/Leaflet.markercluster/example/realworld.10000.js'
+v8 <- V8::v8()
+v8$source(jsURL)
+
+df <- data.frame(v8$get('addressPoints'), stringsAsFactors = F) %>%
+  set_colnames(c('lat', 'lng', 'intensity')) %>%
+  dplyr::mutate(
+    lat = as.numeric(lat),
+    lng = as.numeric(lng)
+  )
+
+#' <br/><br/>Size in Meters
+#'
+#'
+leaflet(df) %>%
+  addProviderTiles(providers$CartoDB.Positron) %>%
+  addWebGLHeatmap(lng=~lng, lat=~lat,size=1000)
+
+#' <br/><br/>Size in Pixels
+#'
+#'
+leaflet(df) %>%
+  addProviderTiles(providers$CartoDB.Positron) %>%
+  addWebGLHeatmap(lng=~lng, lat=~lat,size=20,units='px')
+
+#' <br/><br/>
+
+london.crimes.files <- Sys.glob(
+  paste0(system.file('examples/data/London-Crimes', package='leaflet.extras'),
+         '/*/*-city-of-london-street.csv.zip'))
+london.crimes <- suppressMessages(
+  purrr::map(
+    london.crimes.files,
+    ~readr::read_csv(.) %>%
+      dplyr::select(Latitude, Longitude) %>%
+      dplyr::filter(!is.na(Latitude))) %>%
+  set_names(basename(Sys.glob(
+    paste0(system.file('examples/data/London-Crimes', package='leaflet.extras'),
+           '/2016*')))))
+
+leaf <- leaflet() %>%
+  addProviderTiles(providers$CartoDB.Positron)
+
+purrr::walk(
+  names(london.crimes),
+  function(month) {
+    leaf <<- leaf %>%
+      addWebGLHeatmap(
+        data = london.crimes[[month]],
+        layerId = month, group = month,
+        lng=~Longitude, lat=~Latitude,size=40,units='px',
+        gradientTexture = 'skyline'
+        )
+  })
+
+leaf %>%
+  setView(-0.094106, 51.515, 14) %>%
+  addLayersControl(
+    baseGroups = names(london.crimes),
+    options = layersControlOptions(collapsed = FALSE)
+  )
diff --git a/inst/htmlwidgets/lib/heat/LICENSE b/inst/htmlwidgets/lib/heat/LICENSE
new file mode 100644
index 00000000..91a7b5ed
--- /dev/null
+++ b/inst/htmlwidgets/lib/heat/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2014, Vladimir Agafonkin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/inst/htmlwidgets/lib/heat/heat-bindings.js b/inst/htmlwidgets/lib/heat/heat-bindings.js
new file mode 100644
index 00000000..b77bede3
--- /dev/null
+++ b/inst/htmlwidgets/lib/heat/heat-bindings.js
@@ -0,0 +1,181 @@
+/* global LeafletWidget, $, L, topojson, csv2geojson, toGeoJSON */
+LeafletWidget.methods.addHeatmap = function(points, layerId, group, options) {
+
+  if(!$.isEmptyObject(points)) {
+    var heatmapLayer = L.heatLayer(points, options);
+    this.layerManager.addLayer(heatmapLayer, 'heatmap', layerId, group);
+  }
+};
+
+function getHeatmapIntensity(feature, intensityProperty) {
+  var intensity = null;
+  if(feature) {
+    if(typeof intensityProperty === 'string') {
+      intensity = feature.properties[intensityProperty];
+    } else if(typeof intensityProperty === 'function') {
+      intensity = intensityProperty(feature);
+    }
+  }
+  return intensity;
+}
+
+function getHeatmapCoords(geojson, intensityProperty) {
+
+  var latlngs = [];
+  if(typeof geojson === 'undefined' || geojson === null) {
+    return latlngs;
+  }
+
+  if(typeof geojson === 'string') {
+    geojson = JSON.parse(geojson);
+  }
+
+  // if input is a TopoJSON
+  // iterate over each of its objects and add their coords
+  if (geojson.type === 'Topology') {
+    var topoJsonFeatures = [];
+    for (var key in geojson.objects) {
+      var topoToGeo = topojson.feature(geojson, geojson.objects[key]);
+      if(L.Util.isArray(topoToGeo)) {
+        topoJsonFeatures = topoJsonFeatures.concat(topoToGeo);
+      } else if('features' in topoToGeo ) {
+        topoJsonFeatures = topoJsonFeatures.concat(topoToGeo.features);
+      } else {
+        topoJsonFeatures.push(topoToGeo);
+      }
+    }
+    return getHeatmapCoords(topoJsonFeatures, intensityProperty);
+  }
+
+  var features = L.Util.isArray(geojson) ?  geojson : geojson.features;
+
+  if(features) {  // either a FeatureCollection or an Array of Features
+    $.each(features, function(index, feature) {
+
+      var lat = null, lng = null;
+
+      // We're only interested in Points and Multipoints
+      // every other geometry is a shape
+      if(feature.geometry.type === 'Point') {
+        lat = parseFloat(feature.geometry.coordinates[1]);
+        lng = parseFloat(feature.geometry.coordinates[0]);
+
+        if(lat && lng) {
+          if(intensityProperty) {
+            latlngs.push([lat, lng,
+              getHeatmapIntensity(feature, intensityProperty)]);
+          } else {
+            latlngs.push([lat, lng]);
+          }
+        }
+      } else if(feature.geometry.type === 'MultiPoint') {
+        latlngs = latlngs.concat(
+          getHeatmapCoords(feature, intensityProperty));
+      }
+    });
+  } else if(geojson.type === 'Feature') { // Single GeoJSON Feature with MultiPoint dataset
+    $.each(geojson.geometry.coordinates, function(index, coordinate){
+      var lat = null, lng = null;
+      lat = parseFloat(coordinate[1]);
+      lng = parseFloat(coordinate[0]);
+      if(lat && lng) {
+        if(intensityProperty) {
+          latlngs.push([lat, lng,
+            getHeatmapIntensity(geojson, intensityProperty)]);
+        } else {
+          latlngs.push([lat, lng]);
+        }
+      }
+    });
+  }
+
+  return latlngs;
+}
+
+function addGenericGeoJSONHeatmap( widget, geojson, intensityProperty, layerId, group, options) {
+  var heatmapCoords = getHeatmapCoords(geojson, intensityProperty);
+
+  if(!$.isEmptyObject(heatmapCoords)) {
+    var heatmapLayer = L.heatLayer(heatmapCoords, options);
+    widget.layerManager.addLayer(
+      heatmapLayer, 'heatmap', layerId, group);
+  }
+}
+
+LeafletWidget.methods.addGeoJSONHeatmap = function(geojson, intensityProperty, layerId, group, options) {
+  var self = this;
+  if(LeafletWidget.utils.isURL(geojson)) {
+    $.getJSON(geojson, function(geojsondata){
+      addGenericGeoJSONHeatmap(self,
+        geojsondata, intensityProperty, layerId, group, options);
+    });
+  } else {
+    addGenericGeoJSONHeatmap(self,
+      geojson, intensityProperty, layerId, group, options);
+  }
+};
+
+LeafletWidget.methods.addKMLHeatmap = function(kml, intensityProperty, layerId, group, options) {
+  var self = this;
+  if(LeafletWidget.utils.isURL(kml)) {
+    $.getJSON(kml, function(data){
+      var geojsondata = toGeoJSON.kml(
+        LeafletWidget.utils.parseXML(data));
+      addGenericGeoJSONHeatmap(self,
+        geojsondata, intensityProperty, layerId, group, options);
+    });
+  } else {
+    var geojsondata = toGeoJSON.kml(
+      LeafletWidget.utils.parseXML(kml));
+    addGenericGeoJSONHeatmap(self,
+      geojsondata, intensityProperty, layerId, group, options);
+  }
+};
+
+LeafletWidget.methods.addCSVHeatmap = function(csv, intensityProperty, layerId, group, options, parserOptions) {
+  var self = this;
+  if(LeafletWidget.utils.isURL(csv)) {
+    $.getJSON(csv, function(data){
+      csv2geojson.csv2geojson(
+        data, parserOptions || {},
+        function(err, geojsondata) {
+          addGenericGeoJSONHeatmap(self,
+            geojsondata, intensityProperty, layerId, group, options);
+        }
+      );
+    });
+  } else {
+    csv2geojson.csv2geojson(
+      csv, parserOptions || {},
+      function(err, geojsondata) {
+        addGenericGeoJSONHeatmap(self,
+          geojsondata, intensityProperty, layerId, group, options);
+      }
+    );
+  }
+};
+
+LeafletWidget.methods.addGPXHeatmap = function(gpx, intensityProperty, layerId, group, options) {
+  var self = this;
+  if(LeafletWidget.utils.isURL(gpx)) {
+    $.getJSON(gpx, function(data){
+      var geojsondata = toGeoJSON.gpx(
+        LeafletWidget.utils.parseXML(data));
+      addGenericGeoJSONHeatmap(self,
+        geojsondata, intensityProperty, layerId, group, options);
+    });
+  } else {
+    var geojsondata = toGeoJSON.gpx(
+      LeafletWidget.utils.parseXML(gpx));
+    addGenericGeoJSONHeatmap(self,
+      geojsondata, intensityProperty, layerId, group, options);
+  }
+};
+
+LeafletWidget.methods.removeHeatmap = function(layerId) {
+  this.layerManager.removeLayer('heatmap', layerId);
+};
+
+LeafletWidget.methods.clearHeatmap = function() {
+  this.layerManager.clearLayers('heatmap');
+};
diff --git a/inst/htmlwidgets/lib/heat/leaflet-heat.js b/inst/htmlwidgets/lib/heat/leaflet-heat.js
new file mode 100644
index 00000000..0f33c6ee
--- /dev/null
+++ b/inst/htmlwidgets/lib/heat/leaflet-heat.js
@@ -0,0 +1 @@
+"use strict";!function(){function t(i){return this instanceof t?(this._canvas=i="string"==typeof i?document.getElementById(i):i,this._ctx=i.getContext("2d"),this._width=i.width,this._height=i.height,this._max=1,void this.clear()):new t(i)}t.prototype={defaultRadius:25,defaultGradient:{.4:"blue",.6:"cyan",.7:"lime",.8:"yellow",1:"red"},data:function(t,i){return this._data=t,this},max:function(t){return this._max=t,this},add:function(t){return this._data.push(t),this},clear:function(){return this._data=[],this},radius:function(t,i){i=i||15;var a=this._circle=document.createElement("canvas"),s=a.getContext("2d"),e=this._r=t+i;return a.width=a.height=2*e,s.shadowOffsetX=s.shadowOffsetY=200,s.shadowBlur=i,s.shadowColor="black",s.beginPath(),s.arc(e-200,e-200,t,0,2*Math.PI,!0),s.closePath(),s.fill(),this},gradient:function(t){var i=document.createElement("canvas"),a=i.getContext("2d"),s=a.createLinearGradient(0,0,0,256);i.width=1,i.height=256;for(var e in t)s.addColorStop(e,t[e]);return a.fillStyle=s,a.fillRect(0,0,1,256),this._grad=a.getImageData(0,0,1,256).data,this},draw:function(t){this._circle||this.radius(this.defaultRadius),this._grad||this.gradient(this.defaultGradient);var i=this._ctx;i.clearRect(0,0,this._width,this._height);for(var a,s=0,e=this._data.length;s<e;s++)a=this._data[s],i.globalAlpha=Math.max(a[2]/this._max,t||.05),i.drawImage(this._circle,a[0]-this._r,a[1]-this._r);var n=i.getImageData(0,0,this._width,this._height);return this._colorize(n.data,this._grad),i.putImageData(n,0,0),this},_colorize:function(t,i){for(var a,s=3,e=t.length;s<e;s+=4)a=4*t[s],a&&(t[s-3]=i[a],t[s-2]=i[a+1],t[s-1]=i[a+2])}},window.simpleheat=t}(),L.HeatLayer=(L.Layer?L.Layer:L.Class).extend({initialize:function(t,i){this._latlngs=t,L.setOptions(this,i)},setLatLngs:function(t){return this._latlngs=t,this.redraw()},addLatLng:function(t){return this._latlngs.push(t),this.redraw()},setOptions:function(t){return L.setOptions(this,t),this._heat&&this._updateOptions(),this.redraw()},redraw:function(){return this._heat&&!this._frame&&this._map&&!this._map._animating&&(this._frame=L.Util.requestAnimFrame(this._redraw,this)),this},onAdd:function(t){this._map=t,this._canvas||this._initCanvas(),this.options.pane?this.getPane().appendChild(this._canvas):t._panes.overlayPane.appendChild(this._canvas),t.on("moveend",this._reset,this),t.options.zoomAnimation&&L.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){this.options.pane?this.getPane().removeChild(this._canvas):t.getPanes().overlayPane.removeChild(this._canvas),t.off("moveend",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},_initCanvas:function(){var t=this._canvas=L.DomUtil.create("canvas","leaflet-heatmap-layer leaflet-layer"),i=L.DomUtil.testProp(["transformOrigin","WebkitTransformOrigin","msTransformOrigin"]);t.style[i]="50% 50%";var a=this._map.getSize();t.width=a.x,t.height=a.y;var s=this._map.options.zoomAnimation&&L.Browser.any3d;L.DomUtil.addClass(t,"leaflet-zoom-"+(s?"animated":"hide")),this._heat=simpleheat(t),this._updateOptions()},_updateOptions:function(){this._heat.radius(this.options.radius||this._heat.defaultRadius,this.options.blur),this.options.gradient&&this._heat.gradient(this.options.gradient),this.options.max&&this._heat.max(this.options.max)},_reset:function(){var t=this._map.containerPointToLayerPoint([0,0]);L.DomUtil.setPosition(this._canvas,t);var i=this._map.getSize();this._heat._width!==i.x&&(this._canvas.width=this._heat._width=i.x),this._heat._height!==i.y&&(this._canvas.height=this._heat._height=i.y),this._redraw()},_redraw:function(){if(this._map){var t,i,a,s,e,n,h,o,r,d=[],l=this._heat._r,_=this._map.getSize(),m=new L.Bounds(L.point([-l,-l]),_.add([l,l])),c=void 0===this.options.max?1:this.options.max,u=1,f=void 0===this.options.cellSize?l/2:this.options.cellSize,g=[],p=this._map._getMapPanePos(),v=p.x%f,w=p.y%f;for(t=0,i=this._latlngs.length;t<i;t++)if(a=this._map.latLngToContainerPoint(this._latlngs[t]),m.contains(a)){e=Math.floor((a.x-v)/f)+2,n=Math.floor((a.y-w)/f)+2;var y=void 0!==this._latlngs[t].alt?this._latlngs[t].alt:void 0!==this._latlngs[t][2]?+this._latlngs[t][2]:1;r=y*u,g[n]=g[n]||[],s=g[n][e],s?(s[0]=(s[0]*s[2]+a.x*r)/(s[2]+r),s[1]=(s[1]*s[2]+a.y*r)/(s[2]+r),s[2]=s[2]*(1-r/c)+r):g[n][e]=[a.x,a.y,r]}for(t=0,i=g.length;t<i;t++)if(g[t])for(h=0,o=g[t].length;h<o;h++)s=g[t][h],s&&d.push([Math.round(s[0]),Math.round(s[1]),Math.min(s[2],c)]);this._heat.data(d).draw(this.options.minOpacity),this._frame=null}},_animateZoom:function(t){var i=this._map.getZoomScale(t.zoom),a=this._map._getCenterOffset(t.center)._multiplyBy(-i).subtract(this._map._getMapPanePos());L.DomUtil.setTransform?L.DomUtil.setTransform(this._canvas,a,i):this._canvas.style[L.DomUtil.TRANSFORM]=L.DomUtil.getTranslateString(a)+" scale("+i+")"}}),L.heatLayer=function(t,i){return new L.HeatLayer(t,i)};
\ No newline at end of file
diff --git a/inst/htmlwidgets/lib/heat/leaflet-heat2.js b/inst/htmlwidgets/lib/heat/leaflet-heat2.js
new file mode 100644
index 00000000..86119aad
--- /dev/null
+++ b/inst/htmlwidgets/lib/heat/leaflet-heat2.js
@@ -0,0 +1 @@
+"use strict";!function(){function t(i){return this instanceof t?(this._canvas=i="string"==typeof i?document.getElementById(i):i,this._ctx=i.getContext("2d"),this._width=i.width,this._height=i.height,this._max=1,void this.clear()):new t(i)}t.prototype={defaultRadius:25,defaultGradient:{.4:"blue",.6:"cyan",.7:"lime",.8:"yellow",1:"red"},data:function(t,i){return this._data=t,this},max:function(t){return this._max=t,this},add:function(t){return this._data.push(t),this},clear:function(){return this._data=[],this},radius:function(t,i){i=i||15;var a=this._circle=document.createElement("canvas"),s=a.getContext("2d"),e=this._r=t+i;return a.width=a.height=2*e,s.shadowOffsetX=s.shadowOffsetY=200,s.shadowBlur=i,s.shadowColor="black",s.beginPath(),s.arc(e-200,e-200,t,0,2*Math.PI,!0),s.closePath(),s.fill(),this},gradient:function(t){var i=document.createElement("canvas"),a=i.getContext("2d"),s=a.createLinearGradient(0,0,0,256);i.width=1,i.height=256;for(var e in t)s.addColorStop(e,t[e]);return a.fillStyle=s,a.fillRect(0,0,1,256),this._grad=a.getImageData(0,0,1,256).data,this},draw:function(t){this._circle||this.radius(this.defaultRadius),this._grad||this.gradient(this.defaultGradient);var i=this._ctx;i.clearRect(0,0,this._width,this._height);for(var a,s=0,e=this._data.length;s<e;s++)a=this._data[s],i.globalAlpha=Math.max(a[2]/this._max,t||.05),i.drawImage(this._circle,a[0]-this._r,a[1]-this._r);var n=i.getImageData(0,0,this._width,this._height);return this._colorize(n.data,this._grad),i.putImageData(n,0,0),this},_colorize:function(t,i){for(var a,s=3,e=t.length;s<e;s+=4)a=4*t[s],a&&(t[s-3]=i[a],t[s-2]=i[a+1],t[s-1]=i[a+2])}},window.simpleheat=t}(),L.HeatLayer=(L.Layer?L.Layer:L.Class).extend({initialize:function(t,i){this._latlngs=t,L.setOptions(this,i)},setLatLngs:function(t){return this._latlngs=t,this.redraw()},addLatLng:function(t){return this._latlngs.push(t),this.redraw()},setOptions:function(t){return L.setOptions(this,t),this._heat&&this._updateOptions(),this.redraw()},redraw:function(){return this._heat&&!this._frame&&this._map&&!this._map._animating&&(this._frame=L.Util.requestAnimFrame(this._redraw,this)),this},onAdd:function(t){this._map=t,this._canvas||this._initCanvas(),this.options.pane?this.getPane().appendChild(this._canvas):t._panes.overlayPane.appendChild(this._canvas),t.on("moveend",this._reset,this),t.options.zoomAnimation&&L.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){this.options.pane?this.getPane().removeChild(this._canvas):t.getPanes().overlayPane.removeChild(this._canvas),t.off("moveend",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},_initCanvas:function(){var t=this._canvas=L.DomUtil.create("canvas","leaflet-heatmap-layer leaflet-layer"),i=L.DomUtil.testProp(["transformOrigin","WebkitTransformOrigin","msTransformOrigin"]);t.style[i]="50% 50%";var a=this._map.getSize();t.width=a.x,t.height=a.y;var s=this._map.options.zoomAnimation&&L.Browser.any3d;L.DomUtil.addClass(t,"leaflet-zoom-"+(s?"animated":"hide")),this._heat=simpleheat(t),this._updateOptions()},_updateOptions:function(){this._heat.radius(this.options.radius||this._heat.defaultRadius,this.options.blur),this.options.gradient&&this._heat.gradient(this.options.gradient)},_reset:function(){var t=this._map.containerPointToLayerPoint([0,0]);L.DomUtil.setPosition(this._canvas,t);var i=this._map.getSize();this._heat._width!==i.x&&(this._canvas.width=this._heat._width=i.x),this._heat._height!==i.y&&(this._canvas.height=this._heat._height=i.y),this._redraw()},_redraw:function(){if(this._map){var t,i,a,s,e,n,h,o,r=[],_=this._heat._r,l=this._map.getSize(),d=new L.Bounds(L.point([-_,-_]),l.add([_,_])),m=void 0===this.options.cellSize?_/2:this.options.cellSize,c=[],u=this._map._getMapPanePos(),f=u.x%m,g=u.y%m;for(this._max=1,t=0,i=this._latlngs.length;t<i;t++){a=this._map.latLngToContainerPoint(this._latlngs[t]),e=Math.floor((a.x-f)/m)+2,n=Math.floor((a.y-g)/m)+2;var p=void 0!==this._latlngs[t].alt?this._latlngs[t].alt:void 0!==this._latlngs[t][2]?+this._latlngs[t][2]:1;c[n]=c[n]||[],s=c[n][e],s?(s[0]=(s[0]*s[2]+a.x*p)/(s[2]+p),s[1]=(s[1]*s[2]+a.y*p)/(s[2]+p),s[2]+=p):(s=c[n][e]=[a.x,a.y,p],s.p=a),s[2]>this._max&&(this._max=s[2])}for(this._heat.max(this._max),t=0,i=c.length;t<i;t++)if(c[t])for(h=0,o=c[t].length;h<o;h++)s=c[t][h],s&&d.contains(s.p)&&r.push([Math.round(s[0]),Math.round(s[1]),Math.min(s[2],this._max)]);this._heat.data(r).draw(this.options.minOpacity),this._frame=null}},_animateZoom:function(t){var i=this._map.getZoomScale(t.zoom),a=this._map._getCenterOffset(t.center)._multiplyBy(-i).subtract(this._map._getMapPanePos());L.DomUtil.setTransform?L.DomUtil.setTransform(this._canvas,a,i):this._canvas.style[L.DomUtil.TRANSFORM]=L.DomUtil.getTranslateString(a)+" scale("+i+")"}}),L.heatLayer=function(t,i){return new L.HeatLayer(t,i)};
\ No newline at end of file
diff --git a/inst/htmlwidgets/lib/heat/package.json b/inst/htmlwidgets/lib/heat/package.json
new file mode 100644
index 00000000..7ab9e344
--- /dev/null
+++ b/inst/htmlwidgets/lib/heat/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "leaflet.heat",
+  "version": "0.2.1",
+  "description": "A tiny and fast Leaflet heatmap plugin.",
+  "homepage": "https://github.com/Leaflet/Leaflet.heat",
+  "keywords": [
+    "heatmap",
+    "canvas",
+    "visualization",
+    "gis",
+    "leaflet",
+    "plugin"
+  ],
+  "author": "Vladimir Agafonkin",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/Leaflet/Leaflet.heat.git"
+  },
+  "main": "dist/leaflet-heat.js",
+  "devDependencies": {
+    "eslint": "^1.7.3",
+    "eslint-config-mourner": "^1.0.1",
+    "simpleheat": "~0.2.0",
+    "uglify-js": "^2.5.0"
+  },
+  "eslintConfig": {
+    "extends": "mourner",
+    "globals": {
+      "L": false,
+      "simpleheat": false
+    }
+  },
+  "scripts": {
+    "test": "eslint src",
+    "prepublish": "uglifyjs node_modules/simpleheat/simpleheat.js src/HeatLayer.js -c -m -o dist/leaflet-heat.js"
+  },
+  "license": "BSD-2-Clause",
+  "jshintConfig": {
+    "quotmark": "single",
+    "globals": {
+      "L": true,
+      "simpleheat": true
+    },
+    "trailing": true,
+    "camelcase": true,
+    "curly": true,
+    "eqeqeq": true,
+    "noempty": true,
+    "nonbsp": true,
+    "undef": true,
+    "unused": true,
+    "browser": true
+  }
+}
diff --git a/inst/htmlwidgets/lib/webgl-heatmap/deep-sea-gradient.png b/inst/htmlwidgets/lib/webgl-heatmap/deep-sea-gradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfb8f3fce597496af0f4ebf3f9c0d1d2117a46d5
GIT binary patch
literal 3403
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

literal 0
HcmV?d00001

diff --git a/inst/htmlwidgets/lib/webgl-heatmap/skyline-gradient.png b/inst/htmlwidgets/lib/webgl-heatmap/skyline-gradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e046dadc7b8705034081ff66adc212fc43ac4e2
GIT binary patch
literal 3452
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

literal 0
HcmV?d00001

diff --git a/inst/htmlwidgets/lib/webgl-heatmap/webgl-heatmap-bindings.js b/inst/htmlwidgets/lib/webgl-heatmap/webgl-heatmap-bindings.js
index d926177c..d549c055 100644
--- a/inst/htmlwidgets/lib/webgl-heatmap/webgl-heatmap-bindings.js
+++ b/inst/htmlwidgets/lib/webgl-heatmap/webgl-heatmap-bindings.js
@@ -1,10 +1,27 @@
 /* global LeafletWidget, $, L, topojson, csv2geojson, toGeoJSON */
 LeafletWidget.methods.addWebGLHeatmap = function(points, layerId, group, options) {
 
+  var map = this;
+
   if(!$.isEmptyObject(points)) {
+
+    if(options.gradientTexture) {
+      var attachment =
+        document.getElementById("webgl-heatmap-"+options.gradientTexture+"-attachment")
+        if(!$.isEmptyObject(attachment)) {
+          options.gradientTexture = attachment.href;
+        } else {
+          delete options.gradientTexture;
+        }
+    }
+
     var heatmapLayer = L.webGLHeatmap(options);
     heatmapLayer.setData(points);
-    this.layerManager.addLayer(heatmapLayer, 'webGLHeatmap', layerId, group);
+    map.layerManager.addLayer(heatmapLayer, 'webGLHeatmap', layerId, group);
+    if(options.gradientTexture) { // hack to trigger proper loading of the gradient
+      map.zoomOut();
+      setTimeout(function() {map.zoomIn();}, 500);
+    }
   }
 };
 
@@ -97,10 +114,26 @@ function addGenericWebGLGeoJSONHeatmap( widget, geojson, intensityProperty, laye
   var heatmapCoords = getHeatmapCoords(geojson, intensityProperty);
 
   if(!$.isEmptyObject(heatmapCoords)) {
+
+    if(options.gradientTexture) {
+      var attachment =
+        document.getElementById("webgl-heatmap-"+options.gradientTexture+"-attachment")
+        if(!$.isEmptyObject(attachment)) {
+          options.gradientTexture = attachment.href;
+        } else {
+          delete options.gradientTexture;
+        }
+    }
+
     var heatmapLayer = L.webGLHeatmap(options);
     heatmapLayer.setData(heatmapCoords);
     widget.layerManager.addLayer(
       heatmapLayer, 'webGLHeatmap', layerId, group);
+    if(options.gradientTexture) {
+      // hack to trigger proper loading of the gradient
+      widget.zoomOut();
+      setTimeout(function() {widget.zoomIn();}, 500);
+    }
   }
 }
 
diff --git a/man/heatmap.Rd b/man/heatmap.Rd
index 169ca908..0069db4e 100644
--- a/man/heatmap.Rd
+++ b/man/heatmap.Rd
@@ -1,6 +1,13 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/webGLHeatmap.R
-\name{addWebGLHeatmap}
+% Please edit documentation in R/heatmap.R, R/webGLHeatmap.R
+\name{addHeatmap}
+\alias{addHeatmap}
+\alias{addGeoJSONHeatmap}
+\alias{addKMLHeatmap}
+\alias{addCSVHeatmap}
+\alias{addGPXHeatmap}
+\alias{removeHeatmap}
+\alias{clearHeatmap}
 \alias{addWebGLHeatmap}
 \alias{addWebGLGeoJSONHeatmap}
 \alias{addWebGLKMLHeatmap}
@@ -8,8 +15,33 @@
 \alias{addWebGLGPXHeatmap}
 \alias{removeWebGLHeatmap}
 \alias{clearWebGLHeatmap}
-\title{Add a webgl heatmap}
+\title{Add a heatmap}
 \usage{
+addHeatmap(map, lng = NULL, lat = NULL, intensity = NULL,
+  layerId = NULL, group = NULL, minOpacity = 0.05, max = 1,
+  radius = 25, blur = 15, gradient = NULL, cellSize = NULL,
+  data = leaflet::getMapData(map))
+
+addGeoJSONHeatmap(map, geojson, layerId = NULL, group = NULL,
+  intensityProperty = NULL, minOpacity = 0.05, max = 1, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL)
+
+addKMLHeatmap(map, kml, layerId = NULL, group = NULL,
+  intensityProperty = NULL, minOpacity = 0.05, max = 1, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL)
+
+addCSVHeatmap(map, csv, csvParserOptions, layerId = NULL, group = NULL,
+  intensityProperty = NULL, minOpacity = 0.05, max = 1, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL)
+
+addGPXHeatmap(map, gpx, layerId = NULL, group = NULL,
+  intensityProperty = NULL, minOpacity = 0.05, max = 1, radius = 25,
+  blur = 15, gradient = NULL, cellSize = NULL)
+
+removeHeatmap(map, layerId)
+
+clearHeatmap(map)
+
 addWebGLHeatmap(map, lng = NULL, lat = NULL, intensity = NULL,
   layerId = NULL, group = NULL, size = "30000", units = "m",
   opacity = 1, gradientTexture = NULL, alphaRange = 1,
@@ -36,7 +68,7 @@ removeWebGLHeatmap(map, layerId)
 clearWebGLHeatmap(map)
 }
 \arguments{
-\item{map}{the map to add pulse Markers to.}
+\item{map}{the map widget.}
 
 \item{lng}{a numeric vector of longitudes, or a one-sided formula of the form
 \code{~x} where \code{x} is a variable in \code{data}; by default (if not
@@ -58,16 +90,75 @@ Human-friendly group names are permitted--they need not be short,
 identifier-style names. Any number of layers and even different types of
 layers (e.g. markers and polygons) can share the same group name.}
 
+\item{minOpacity}{minimum opacity at which the heat will start}
+
+\item{max}{maximum point intensity. The default is \code{1.0}}
+
+\item{radius}{radius of each "point" of the heatmap.  The default is
+\code{25}.}
+
+\item{blur}{amount of blur to apply.  The default is \code{15}.
+\code{blur=1} means no blur.}
+
+\item{gradient}{palette name from \code{RColorBrewer} or an array of
+of colors to be provided to \code{\link{colorNumeric}}, or
+a color mapping function returned from \code{colorNumeric}}
+
+\item{cellSize}{the cell size in the grid. Points which are closer
+than this may be merged. Defaults to `radius / 2`.s
+Set to `1` to do almost no merging.}
+
+\item{data}{the data object from which the argument values are derived; by
+default, it is the \code{data} object provided to \code{leaflet()}
+initially, but can be overridden}
+
+\item{geojson}{The geojson or topojson url or contents as string.}
+
+\item{intensityProperty}{The property to use for determining the intensity at a point.
+Can be a 'string' or a JS function, or NULL.}
+
+\item{kml}{The KML url or contents as string.}
+
+\item{csv}{The CSV url or contents as string.}
+
+\item{csvParserOptions}{options for parsing the CSV.
+Use \code{\link{csvParserOptions}}() to supply csv parser options.}
+
+\item{gpx}{The GPX url or contents as string.}
+
 \item{size}{in meters or pixels}
 
 \item{units}{either 'm' or 'px'}
 
 \item{opacity}{for the canvas element}
 
-\item{gradientTexture}{image url or image}
+\item{gradientTexture}{Alternative colors for heatmap.
+allowed values are "skyline", "deep-sea"}
 
 \item{alphaRange}{adjust transparency by changing to value between 0 and 1}
 
+\item{map}{the map to add pulse Markers to.}
+
+\item{lng}{a numeric vector of longitudes, or a one-sided formula of the form
+\code{~x} where \code{x} is a variable in \code{data}; by default (if not
+explicitly provided), it will be automatically inferred from \code{data} by
+looking for a column named \code{lng}, \code{long}, or \code{longitude}
+(case-insensitively)}
+
+\item{lat}{a vector of latitudes or a formula (similar to the \code{lng}
+argument; the names \code{lat} and \code{latitude} are used when guessing
+the latitude column from \code{data})}
+
+\item{intensity}{intensity of the heat. A vector of numeric values or a formula.}
+
+\item{layerId}{the layer id}
+
+\item{group}{the name of the group the newly created layers should belong to
+(for \code{\link{clearGroup}} and \code{\link{addLayersControl}} purposes).
+Human-friendly group names are permitted--they need not be short,
+identifier-style names. Any number of layers and even different types of
+layers (e.g. markers and polygons) can share the same group name.}
+
 \item{data}{the data object from which the argument values are derived; by
 default, it is the \code{data} object provided to \code{leaflet()}
 initially, but can be overridden}
@@ -87,6 +178,20 @@ Use \code{\link{csvParserOptions}}() to supply csv parser options.}
 \item{gpx}{The GPX url or contents as string.}
 }
 \description{
+Add a heatmap
+
+Adds a heatmap with data from a GeoJSON/TopoJSON file/url
+
+Adds a heatmap with data from a KML file/url
+
+Adds a heatmap with data from a CSV file/url
+
+Adds a heatmap with data from a GPX file/url
+
+removes the heatmap
+
+clears the heatmap
+
 Add a webgl heatmap
 
 Adds a heatmap with data from a GeoJSON/TopoJSON file/url