merge conflicts fixed

Merge branch 'main' into sf_refactor # Conflicts: # DESCRIPTION # NEWS.md # R/zzz.R # vignettes/introduction_to_elevatr.R
jhollist · Jun 15, 2023 · 34ecab3 · 34ecab3
2 parents 49132c5 + db2e190
commit 34ecab3
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 15 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -13,6 +13,13 @@ elevatr 1.0.0 (????-??-??)
 # Other Changes
 - Switched to MIT from CCO
 
+elevatr 0.4.5 (2023-06-12)
+=============
+
+# Startup
+- added startup message warning of switch to sf and terra in future releases.
+
+
 elevatr 0.4.4 (2023-05-30)
 =============
 

diff --git a/R/internal.R b/R/internal.R
@@ -206,7 +206,7 @@ estimate_raster_size <- function(locations, prj, src, z = NULL){
                     1223.0, 611.5, 305.7, 152.9, 76.4, 38.2, 19.1, 9.6, 4.8, 
                     2.4)
   z_res <- data.frame(z = 0:16, res_dd = m_at_equator/111319.9)
-
+ 
   bits <- switch(src,
                  aws = 32,
                  gl3 = 32,

diff --git a/R/zzz.R b/R/zzz.R
@@ -1,5 +1,11 @@
 op <- options()
 
+.onAttach <- function(libname, pkgname) {
+  packageStartupMessage(
+"elevatr v0.4.5 NOTE: This is the last version of 'elevatr' that will use the 
+'sp' and 'raster' packages. The next release will switch to 'sf' and 'terra'.")
+}
+
 .onUnload <- function(libname, pkgname){
   options(op)
   invisible()

diff --git a/cran_comments.md b/cran_comments.md
@@ -1,10 +1,11 @@
 ## Comments
-- Re-submit (SORRY!) with fixed URLS
-- Changed API ERRORS to messages and return NA or NULL.  Would bomb out runs when this would happen only occasionally. Also this should meet CRAN policy on failing gracefully.
-- Switched long lat check to st::sf_is_longlat
-- Fixed EPQS API URL that was poitned out by a user and emails from Uwe Ligges and Brian Ripley on 2023-05-26.
+
+- Added startup message indicating upcoming change to sf and terra in future releases.
+- Next release is scheduled for July, so wanted to get this notification in now.
+
 
 ## Test Environments
+
 - Github Actions, Ubuntu 20.04.6 LTS, R version 4.3.0
 - Github Actions, Ubuntu 20.04.6 LTS, R version 4.2.3
 - Github Actions, Ubuntu 22.04.2 LTS, R development
@@ -14,17 +15,9 @@
 - Local, Windows 10 x64 (build 19042), R version 4.2.2
 
 ## R CMD check results
+
 - No ERRORS or WARNINGS
 
 ## revdepcheck results
 
-We checked 9 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
-
- * We saw 0 new problems
- * We failed to check 1 packages
-
-Issues with CRAN packages are summarised below.
-
-### Failed to check
-
-* shoredate (NA)
+Reverse dependencies were checked with release 0.4.4 on May 31, 2023.  They have not changed since and this release is minor and they were not checked again.
diff --git a/vignettes/introduction_to_elevatr.R b/vignettes/introduction_to_elevatr.R
@@ -2,7 +2,12 @@
 ################################################################################
 #Load packages
 ################################################################################
+<<<<<<< HEAD
 library("terra")
+=======
+library("sp")
+library("raster")
+>>>>>>> main
 library("knitr")
 library("elevatr")
 library("httr")
@@ -24,13 +29,18 @@ 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)
 
@@ -44,18 +54,43 @@ 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
 
@@ -70,16 +105,37 @@ 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------------------------------------------------------------------
@@ -89,11 +145,18 @@ 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)
@@ -103,5 +166,9 @@ 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