#86 ggRGB now with fill delivered, and fixed some test bugs

Author: KonstiDE

R/ggRGB.R

@@ -167,9 +167,9 @@ ggRGB <- function(img, r = 3, g = 2, b = 1, scale, maxpixels = 500000, stretch =
                 p <- ggplot() + p + geom_blank(data = df, aes(x = x,y = y))
             }
         } else {
-            p <- geom_raster(data = df_raster, aes(x = x, y = y, fill = fill), alpha = alpha)  
+            p <- list(geom_raster(data = df_raster, aes(x = x, y = y, fill = fill), alpha = alpha), scale_fill_identity())
             if(!ggLayer) {
-                p <- ggplot() + p + scale_fill_identity() 
+                p <- ggplot() + p
             }
         }   
 

tests/testthat/test-ggplot.R

@@ -57,7 +57,7 @@ test_that("ggR works with single valued rasters", {
 })
 
 
-test_that("ggRGB returns proper ggplot2 classes or data.frames", {
+test_that("ggRGB returns proper ggplot2 classes or data.frames or lists of protos", {
 
   tests  <- expand.grid(anno = c(TRUE, FALSE), ggLayer = c(TRUE, FALSE), ggObj = c(TRUE,FALSE), stretch=c("sqrt", "hist", "log", "lin"))
   builds <- lapply(seq_len(nrow(tests)), function(i) ggRGB(rlogo, ggObj = tests$ggObj[i], geom_raster = !tests$anno[i], ggLayer = tests$ggLayer[i], stretch = tests$stretch[i] ))
@@ -70,12 +70,12 @@ test_that("ggRGB returns proper ggplot2 classes or data.frames", {
   if(!inherits(builds[[which(with(tests, ggObj & ggLayer))[1]]], "ggproto")){
     ## Current ggplot2 release version
     for(s in which(with(tests, ggObj & ggLayer))) expect_is(builds[[s]], "proto", info = tinfo[s])
-    for(s in which(with(tests, ggObj & ggLayer & anno)))  expect_equal(builds[[s]]$geom$objname, "raster_ann", info = tinfo[s])
+    for(s in which(with(tests, ggObj & ggLayer & anno))) expect_equal(builds[[s]]$geom$objname, "raster_ann", info = tinfo[s])
     for(s in which(with(tests, ggObj & ggLayer & !anno))) expect_equal(builds[[s]]$geom$objname, "raster", info = tinfo[s])
   } else {
     ## Upcoming ggplot2 version (>=1.0.1.9002)
-    for(s in which(with(tests, ggObj & ggLayer & anno)))  expect_is(builds[[s]]$geom, "GeomRasterAnn", info = tinfo[s])
-    for(s in which(with(tests, ggObj & ggLayer & !anno))) expect_is(builds[[s]]$geom, "GeomRaster", info = tinfo[s])
+    for(s in which(with(tests, ggObj & ggLayer & anno))) expect_is(builds[[s]]$geom, "GeomRasterAnn", info = tinfo[s])
+    for(s in which(with(tests, ggObj & ggLayer & !anno))) expect_is(builds[[s]], "list", info = tinfo[s])
   }
 
   ## Data.frames

tests/testthat/test-spectralIndices.R

@@ -19,7 +19,6 @@ r <- rast(r)
 ml <- rast(ml)
 test_that("errors and warnings are emitted", {
   expect_error(spectralIndices(r, red = 1, indices = "NDVI"), "you must specify \\*all\\* required bands")
-  expect_error(spectralIndices(r, red = 1), "you must specify \\*all\\* required bands")
   expect_warning(spectralIndices(r, red = 1, nir = 2, indices = c("NDVI", "EVI")), "not specified: blue")
   expect_warning(spectralIndices(r, red = 1, nir = 2, blue = 1, index = c("NDVI", "EVI")), "Skipping EVI")
   expect_warning(spectralIndices(r, red = 1, nir = 2, blue = 1, index = "EVI", skipRefCheck = TRUE), "raster has no values")
@@ -82,6 +81,8 @@ cdb <- c(
 rsOpts(idxdb = cdb)
 
 test_that("custom spectral index",{
+  expect_is(spectralIndices(lsat, red = 3, indices = "CUSTOM"), "SpatRaster")
+  expect_is(spectralIndices(lsat, swir1 = 5, indices = "CUSTOM2"), "SpatRaster")
   expect_equal(
     unique(values(spectralIndices(lsat, red = 3, indices = "CUSTOM"))),
     as.matrix(data.frame(CUSTOM=0)))