merge in vignette and new test for serial = FALSE

tests/testthat/test-get_elev_raster.R

@@ -86,3 +86,12 @@ test_that("A bad location file errors",{
   expect_error(suppressWarnings(get_elev_raster(bad_sf, src = "gl3")))
 })
 
+test_that("Parallel processing works",{
+  serial_elev <- get_elev_raster(sf_sm, z = 6, serial = FALSE)
+
+  #class
+  expect_is(serial_elev,"SpatRaster")
+
+  #project
+  expect_equal(st_crs(serial_elev)$wkt,st_crs(ll_prj)$wkt)
+})

vignettes/introduction_to_elevatr.R

@@ -2,12 +2,7 @@
 ################################################################################
 #Load packages
 ################################################################################
-<<<<<<< HEAD
 library("terra")
-=======
-library("sp")
-library("raster")
->>>>>>> main
 library("knitr")
 library("elevatr")
 library("httr")
@@ -29,18 +24,13 @@ knitr::opts_chunk$set(purl = NOT_CRAN,
 set.seed(65.7)
 examp_df <- data.frame(x = runif(3, min = -73, max = -72.5), 
                        y = runif(3, min = 42 , max = 43))
-<<<<<<< HEAD
 crs_dd <- 4326
-=======
-prj_dd <- "EPSG:4326"
->>>>>>> main
 
 # Create and example data.frame with additional columns
 cats <- data.frame(category = c("H", "M", "L"))
 
 examp_df2 <- data.frame(examp_df, cats)
 
-<<<<<<< HEAD
 # Create an example 
 examp_sf <- sf::st_as_sf(examp_df2, coords = c("x", "y"), crs = crs_dd)
 
@@ -54,43 +44,18 @@ sf_elev_epqs
 
 ## -----------------------------------------------------------------------------
 df_elev_aws <- get_elev_point(examp_df, prj = crs_dd, src = "aws")
-=======
-# Create an example SpatialPoints
-examp_sp <- SpatialPoints(examp_df, proj4string = CRS(prj_dd))
-
-# Create an example SpatialPointsDataFrame
-examp_spdf <- SpatialPointsDataFrame(examp_sp, data = cats)
-
-## -----------------------------------------------------------------------------
-df_elev_epqs <- get_elev_point(examp_df, prj = prj_dd, src = "epqs")
-data.frame(df_elev_epqs)
-df2_elev_epqs <- get_elev_point(examp_df2, prj = prj_dd, src = "epqs")
-data.frame(df2_elev_epqs)
-sp_elev_epqs <- get_elev_point(examp_sp, src = "epqs")
-sp_elev_epqs
-spdf_elev_epqs <- get_elev_point(examp_spdf, src = "epqs")
-spdf_elev_epqs
-
-## -----------------------------------------------------------------------------
-df_elev_aws <- get_elev_point(examp_df, prj = prj_dd, src = "aws")
->>>>>>> main
 
 ## -----------------------------------------------------------------------------
 df_elev_aws$elevation
 df_elev_epqs$elevation
 
 ## -----------------------------------------------------------------------------
-<<<<<<< HEAD
 df_elev_aws_z12 <- get_elev_point(examp_df, prj = crs_dd, src = "aws", z = 12)
-=======
-df_elev_aws_z12 <- get_elev_point(examp_df, prj = prj_dd, src = "aws", z = 12)
->>>>>>> main
 df_elev_aws_z12$elevation
 df_elev_epqs$elevation
 
 ## -----------------------------------------------------------------------------
 mt_everest <- data.frame(x = 86.9250, y = 27.9881)
-<<<<<<< HEAD
 everest_aws_elev <- get_elev_point(mt_everest, prj = crs_dd, z = 14, src = "aws")
 everest_aws_elev
 
@@ -105,37 +70,16 @@ plot(st_geometry(lake), add = TRUE, col = "blue")
 elevation_df <- get_elev_raster(examp_df, prj=crs_dd, z = 5)
 plot(elevation_df)
 plot(examp_sf, add = TRUE, col = "black", pch = 19, max.plot = 1)
-=======
-everest_aws_elev <- get_elev_point(mt_everest, prj = prj_dd, z = 14, src = "aws")
-everest_aws_elev
-
-## ----get_raster---------------------------------------------------------------
-# SpatialPolygonsDataFrame example
-data(lake)
-elevation <- get_elev_raster(lake,z = 9)
-plot(elevation)
-plot(lake, add=TRUE)
-
-# data.frame example
-elevation_df <- get_elev_raster(examp_df,prj=prj_dd, z = 5)
-plot(elevation_df)
-plot(examp_sp, add = TRUE)
->>>>>>> main
 
 ## ----expand-------------------------------------------------------------------
 # Bounding box on edge
 elev_edge<-get_elev_raster(lake, z = 10)
 plot(elev_edge)
-<<<<<<< HEAD
 plot(st_geometry(lake), add = TRUE, col = "blue")
-=======
-plot(lake, add = TRUE)
->>>>>>> main
 
 # Use expand to grab additional tiles
 elev_expand<-get_elev_raster(lake, z = 10, expand = 15000)
 plot(elev_expand)
-<<<<<<< HEAD
 plot(st_geometry(lake), add = TRUE, col = "blue")
 
 ## ----clip_it------------------------------------------------------------------
@@ -145,18 +89,11 @@ lake_buffer_elev <- get_elev_raster(lake_buffer, z = 9, clip = "locations")
 plot(lake_buffer_elev)
 plot(st_geometry(lake), add = TRUE, col = "blue")
 plot(st_geometry(lake_buffer), add = TRUE)
-=======
-plot(lake, add = TRUE)
->>>>>>> main
 
 ## ----timeout------------------------------------------------------------------
 library(httr)
 # Increase timeout:
-<<<<<<< HEAD
 get_elev_raster(lake, z = 5, config = timeout(100))
-=======
-get_elev_raster(lake, z = 5, config = timeout(5))
->>>>>>> main
 
 ## ----timeout_verbose----------------------------------------------------------
 library(httr)
@@ -166,9 +103,5 @@ get_elev_raster(lake, z = 5, config = c(verbose(),timeout(5)))
 ## ---- eval=FALSE--------------------------------------------------------------
 #  lake_srtmgl1 <- get_elev_raster(lake, src = "gl1", clip = "bbox", expand = 1000)
 #  plot(lake_srtmgl1)
-<<<<<<< HEAD
 #  plot(st_geometry(lake), add = TRUE, col = "blue")
-=======
-#  plot(lake, add = TRUE)
->>>>>>> main