diff --git a/DESCRIPTION b/DESCRIPTION index 4ce48b9..b11f626 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: elevatr Title: Access Elevation Data from Various APIs -Version: 0.4.3 +Version: 0.4.4 Authors@R: c(person("Jeffrey", "Hollister", email = "hollister.jeff@epa.gov", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9254-9740")), person("Tarak","Shah", role = "ctb"), @@ -17,7 +17,7 @@ Description: Several web services are available that provide access to elevation elevation services. Currently, the package supports access to the Amazon Web Services Terrain Tiles , the Open Topography Global Datasets API , - and the USGS Elevation Point Query Service . + and the USGS Elevation Point Query Service . Depends: R (>= 3.5.0) Imports: sp, diff --git a/NEWS.md b/NEWS.md index 75b5eee..2d4d344 100644 --- a/NEWS.md +++ b/NEWS.md @@ -140,7 +140,7 @@ elevatr 0.1.4 (2017-12-28) ========================== ## Bug Fixes - Primary change with this released is fixing a bug with the return file type on the AWS and mapzen APIs. "tif" was changed to "tiff" and the check was stopping processing of the raster images. Details are on . Thanks to the following individuals for catching this: @yipcma, @TomBor, @jslingsby. And thanks to @vividbot for which provided a fix. -- Thanks to @pascalfust for this issue: . Kicked me into gear to send fix to CRAN. +- Thanks to @pascalfust for kicking me into gear to send fix to CRAN. - Fixed NOTE on CRAN: Packages in Imports, not imported. - Removed prettyunits - moved rgdal to suggests diff --git a/README.Rmd b/README.Rmd index 3a62948..6f48903 100644 --- a/README.Rmd +++ b/README.Rmd @@ -12,7 +12,7 @@ coverage](https://codecov.io/gh/jhollist/elevatr/branch/main/graph/badge.svg)](h # elevatr An R package for accessing elevation data from various sources -The `elevatr` package currently provides access to elevation data from AWS Open Data [Terrain Tiles](https://registry.opendata.aws/terrain-tiles/) and the Open Topography [Global datasets API](https://opentopography.org/developers#API) for raster digital elevation models. For point elevation data,the [USGS Elevation Point Query Service](https://nationalmap.gov/epqs/)) may be used or the point elevations may be derived from the AWS Tiles. Additional elevation data sources may be added as they come available. +The `elevatr` package currently provides access to elevation data from AWS Open Data [Terrain Tiles](https://registry.opendata.aws/terrain-tiles/) and the Open Topography [Global datasets API](https://opentopography.org/developers#API) for raster digital elevation models. For point elevation data,the [USGS Elevation Point Query Service](https://apps.nationalmap.gov/epqs/)) may be used or the point elevations may be derived from the AWS Tiles. Additional elevation data sources may be added as they come available. Currently this package includes just two primary functions to access elevation web services: @@ -45,7 +45,7 @@ install_github("jhollist/elevatr") As `elevatr` is getting more widely used, there have been some great contributions, use cases, and additional packages that have come from the user community. If you have one you'd like to share, let me know and I will gladly add it. Here are some of the ones that I have seen. Thank you all! - [Michaela Mulhearn's `rayshader` and `elevatr` cheatsheet](https://github.com/jhollist/elevatr/blob/main/contributions/mulhearn_rayshader_elevatr_cheatsheet.pdf) -- [researchremora on twitter has created some amazing elevation maps](https://mobile.twitter.com/researchremora/status/1415119197441564672) +- [researchremora on twitter has created some amazing elevation maps](https://twitter.com/researchremora) - [Hugh Graham's `rayvista` package uses `rayshader`, `maptiles`, and `elevatr` to create some cool visualizations](https://github.com/h-a-graham/rayvista) - [Spencer Schien has built some fantastic shaded relief visulaizations and provided the code to recreate them](https://github.com/Pecners/rayshader_portraits) diff --git a/README.md b/README.md index 93a6d6a..05f9456 100644 --- a/README.md +++ b/README.md @@ -18,25 +18,25 @@ Tiles](https://registry.opendata.aws/terrain-tiles/) and the Open Topography [Global datasets API](https://opentopography.org/developers#API) for raster digital elevation models. For point elevation data,the [USGS Elevation Point -Query Service](https://nationalmap.gov/epqs/)) may be used or the point -elevations may be derived from the AWS Tiles. Additional elevation data -sources may be added as they come available. +Query Service](https://apps.nationalmap.gov/epqs/)) may be used or the +point elevations may be derived from the AWS Tiles. Additional elevation +data sources may be added as they come available. Currently this package includes just two primary functions to access elevation web services: -- `get_elev_point()`: Get point elevations using the USGS Elevation - Point Query Service (for the US Only) or using the AWS Terrian Tiles - (global). This will accept a data frame of x (long) and y (lat), a - SpatialPoints/SpatialPointsDataFame, or a Simple Features object as - input. A SpatialPointsDataFrame or Simple Features object is - returned, depending on the class of the input locations. -- `get_elev_raster()`: Get elevation data as a raster (e.g. a Digital - Elevation Model) from the AWS Open Data Terrain Tiles. Other sources - may be added later. This will accept a data frame of of x (long) and - y (lat) or any `sp` or `raster` object as input and will return a - `raster` object of the elevation tiles that cover the bounding box - of the input spatial data. +- `get_elev_point()`: Get point elevations using the USGS Elevation + Point Query Service (for the US Only) or using the AWS Terrian Tiles + (global). This will accept a data frame of x (long) and y (lat), a + SpatialPoints/SpatialPointsDataFame, or a Simple Features object as + input. A SpatialPointsDataFrame or Simple Features object is returned, + depending on the class of the input locations. +- `get_elev_raster()`: Get elevation data as a raster (e.g. a Digital + Elevation Model) from the AWS Open Data Terrain Tiles. Other sources + may be added later. This will accept a data frame of of x (long) and y + (lat) or any `sp` or `raster` object as input and will return a + `raster` object of the elevation tiles that cover the bounding box of + the input spatial data. ## Installation @@ -62,16 +62,16 @@ the user community. If you have one you’d like to share, let me know and I will gladly add it. Here are some of the ones that I have seen. Thank you all! -- [Michaela Mulhearn’s `rayshader` and `elevatr` - cheatsheet](https://github.com/jhollist/elevatr/blob/main/contributions/mulhearn_rayshader_elevatr_cheatsheet.pdf) -- [researchremora on twitter has created some amazing elevation - maps](https://mobile.twitter.com/researchremora/status/1415119197441564672) -- [Hugh Graham’s `rayvista` package uses `rayshader`, `maptiles`, and - `elevatr` to create some cool - visualizations](https://github.com/h-a-graham/rayvista) -- [Spencer Schien has built some fantastic shaded relief - visulaizations and provided the code to recreate - them](https://github.com/Pecners/rayshader_portraits) +- [Michaela Mulhearn’s `rayshader` and `elevatr` + cheatsheet](https://github.com/jhollist/elevatr/blob/main/contributions/mulhearn_rayshader_elevatr_cheatsheet.pdf) +- [researchremora on twitter has created some amazing elevation + maps](https://twitter.com/researchremora) +- [Hugh Graham’s `rayvista` package uses `rayshader`, `maptiles`, and + `elevatr` to create some cool + visualizations](https://github.com/h-a-graham/rayvista) +- [Spencer Schien has built some fantastic shaded relief visulaizations + and provided the code to recreate + them](https://github.com/Pecners/rayshader_portraits) ## Attribution diff --git a/cran_comments.md b/cran_comments.md index e3139fb..d45eb92 100644 --- a/cran_comments.md +++ b/cran_comments.md @@ -1,26 +1,29 @@ ## Comments -Several bug and issue fixes, adds API key for OpenTopography. Addresses invalid URL/URI in README and ignored README.html for re-submit (SORRY!) +- 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. ## Test Environments -- Github Actions, Ubuntu 20.04 LTS, R version 4.1.2 -- Github Actions, Ubuntu 20.04 LTS, R version 4.0.5 -- Github Actions, Ubuntu 20.04 LTS, R development -- Github Actions, Microsoft Windows Server 2019, R Version 4.1.2 -- Github Actions, Microsoft Windows Server 2019, R Version 3.6.3 -- Github Actions, Mac OS 10.15, R Version 4.1.2 -- R-hub, Oracle Solaris 10, x86, 32 bit, R version 4.1.2 -- Local, Windows 10, R version 4.1.0 +- 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 +- Github Actions, Microsoft Windows Server 2022, R Version 4.3.0 +- Github Actions, Microsoft Windows Server 2019, R Version 4.2.3 +- Github Actions, Mac OS 12.6.5, R Version 4.3.0 +- Local, Windows 10 x64 (build 19042), R version 4.2.2 ## R CMD check results - No ERRORS or WARNINGS -## Downstream dependencies -There are currently two downstream dependencies +## revdepcheck results -- movecost 1.4 -- sharpshootR 1.8.4 - -We checked both, comparing R CMD check results across CRAN and dev versions of this package. +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 0 packages + * We failed to check 1 packages + +Issues with CRAN packages are summarised below. + +### Failed to check + +* shoredate (NA) diff --git a/revdep/README.md b/revdep/README.md index 4afbabe..3179e7f 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -10,23 +10,23 @@ |collate |English_United States.utf8 | |ctype |English_United States.utf8 | |tz |America/New_York | -|date |2023-05-26 | +|date |2023-05-30 | |rstudio |2022.12.0+353 Elsbeth Geranium (desktop) | |pandoc |NA | # Dependencies -|package |old |new |Δ | -|:-------|:-----|:------|:--| -|elevatr |0.4.2 |0.4.3 |* | -|sf |NA |1.0-13 |* | +|package |old |new |Δ | +|:----------|:-----|:------|:--| +|elevatr |0.4.2 |0.4.3 |* | +|parallelly |NA |1.36.0 |* | +|sf |NA |1.0-13 |* | # Revdeps -## Failed to check (2) +## Failed to check (1) |package |version |error |warning |note | |:---------|:-------|:-----|:-------|:----| -|gwavr |? | | | | |shoredate |1.0.2 |1 | | | diff --git a/revdep/cran.md b/revdep/cran.md index 0fbda65..caff0e3 100644 --- a/revdep/cran.md +++ b/revdep/cran.md @@ -1,6 +1,6 @@ ## revdepcheck results -We checked 9 reverse dependencies (8 from CRAN + 1 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. +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 diff --git a/revdep/failures.md b/revdep/failures.md index 4945cbf..513bc0e 100644 --- a/revdep/failures.md +++ b/revdep/failures.md @@ -1,76 +1,3 @@ -# gwavr - -
- -* Version: -* GitHub: https://github.com/jhollist/elevatr -* Source code: NA -* Number of recursive dependencies: 0 - -
- -## Error before installation - -### Devel - -``` -package 'abind' successfully unpacked and MD5 sums checked -package 'anytime' successfully unpacked and MD5 sums checked -package 'askpass' successfully unpacked and MD5 sums checked -package 'base64enc' successfully unpacked and MD5 sums checked -package 'BH' successfully unpacked and MD5 sums checked -package 'bit' successfully unpacked and MD5 sums checked -package 'bit64' successfully unpacked and MD5 sums checked -package 'bslib' successfully unpacked and MD5 sums checked -package 'cachem' successfully unpacked and MD5 sums checked -package 'class' successfully unpacked and MD5 sums checked -... -package 'viridisLite' successfully unpacked and MD5 sums checked -package 'vroom' successfully unpacked and MD5 sums checked -package 'whitebox' successfully unpacked and MD5 sums checked -package 'withr' successfully unpacked and MD5 sums checked -package 'wk' successfully unpacked and MD5 sums checked -package 'xfun' successfully unpacked and MD5 sums checked -package 'xml2' successfully unpacked and MD5 sums checked -package 'xtable' successfully unpacked and MD5 sums checked -package 'yaml' successfully unpacked and MD5 sums checked -package 'zip' successfully unpacked and MD5 sums checked - - - - - -``` -### CRAN - -``` -package 'abind' successfully unpacked and MD5 sums checked -package 'anytime' successfully unpacked and MD5 sums checked -package 'askpass' successfully unpacked and MD5 sums checked -package 'base64enc' successfully unpacked and MD5 sums checked -package 'BH' successfully unpacked and MD5 sums checked -package 'bit' successfully unpacked and MD5 sums checked -package 'bit64' successfully unpacked and MD5 sums checked -package 'bslib' successfully unpacked and MD5 sums checked -package 'cachem' successfully unpacked and MD5 sums checked -package 'class' successfully unpacked and MD5 sums checked -... -package 'viridisLite' successfully unpacked and MD5 sums checked -package 'vroom' successfully unpacked and MD5 sums checked -package 'whitebox' successfully unpacked and MD5 sums checked -package 'withr' successfully unpacked and MD5 sums checked -package 'wk' successfully unpacked and MD5 sums checked -package 'xfun' successfully unpacked and MD5 sums checked -package 'xml2' successfully unpacked and MD5 sums checked -package 'xtable' successfully unpacked and MD5 sums checked -package 'yaml' successfully unpacked and MD5 sums checked -package 'zip' successfully unpacked and MD5 sums checked - - - - - -``` # shoredate
diff --git a/vignettes/introduction_to_elevatr.Rmd b/vignettes/introduction_to_elevatr.Rmd index 767c955..6ecae55 100644 --- a/vignettes/introduction_to_elevatr.Rmd +++ b/vignettes/introduction_to_elevatr.Rmd @@ -52,7 +52,7 @@ Point elevation is accessed from `get_elev_point()`. This function takes either ## USGS Elevation Point Query Service -The [USGS Elevation Point Query Service](http://ned.usgs.gov/epqs/) is accessible from `elevatr`. It is only available for the United States (including Alaska and Hawaii). Points that fall within the United States but are not on land return a value of zero. Points outside the United States boundaries return a value of -1000000. +The [USGS Elevation Point Query Service](https://apps.nationalmap.gov/epqs/) is accessible from `elevatr`. It is only available for the United States (including Alaska and Hawaii). Points that fall within the United States but are not on land return a value of zero. Points outside the United States boundaries return a value of -1000000. ### Using `get_elev_point()` to Access The USGS Elevation Point Query Service