Skip to content

Added the "method" variable to addRasterImage #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Added the "method" variable to addRasterImage #229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7029341
Two key changes to address issues #224 and #219:
SimonGoring Jan 15, 2016
64c0274
Removed the `if` comparison, it's not so simply to compare the projec…
SimonGoring Jan 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions R/layers.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ epsg3857 <- "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y
#' coordinates
#' @param maxBytes the maximum number of bytes to allow for the projected image
#' (before base64 encoding); defaults to 4MB.
#' @param method the method used to interpolate to the leaflet web Mercator
#' projection. Default is 'bilinear'. 'ngd' (nearest neighbor) is better for
#' categorical variables.
#'
#' @examples
#' library(raster)
Expand All @@ -183,12 +186,13 @@ addRasterImage = function(
layerId = NULL,
group = NULL,
project = TRUE,
maxBytes = 4*1024*1024
maxBytes = 4*1024*1024,
method = "bilinear"
) {
stopifnot(inherits(x, "RasterLayer"))

if (project) {
projected <- projectRasterForLeaflet(x)
projected <- projectRasterForLeaflet(x, method)
} else {
projected <- x
}
Expand Down Expand Up @@ -218,8 +222,8 @@ addRasterImage = function(

#' @rdname addRasterImage
#' @export
projectRasterForLeaflet <- function(x) {
raster::projectRaster(x, raster::projectExtent(x, crs = sp::CRS(epsg3857)))
projectRasterForLeaflet <- function(x, method) {
raster::projectRaster(x, raster::projectExtent(x, crs = sp::CRS(epsg3857), method = method))
}

#' @rdname remove
Expand Down