Skip to content

Commit

Permalink
update description to roll back version to 0.99 - rgdal etc changes b…
Browse files Browse the repository at this point in the history
…ut still return raster layer.
  • Loading branch information
jhollist committed Sep 7, 2023
1 parent f39dc33 commit e404e20
Show file tree
Hide file tree
Showing 12 changed files with 97 additions and 106 deletions.
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Package: elevatr
Title: Access Elevation Data from Various APIs
Version: 1.0.0
Version: 0.99.0
Authors@R: c(person("Jeffrey", "Hollister", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9254-9740")),
person("Tarak", "Shah", role = "ctb"),
person("Jakub", "Nowosad", role = "ctb", comment = c(ORCID = "0000-0002-1057-3721")),
person("Alec L.", "Robitaille", role = "ctb", comment = c(ORCID = "0000-0002-4706-1762")),
person("Marcus W.", "Beck", role = "rev", comment = c(ORCID = "0000-0002-4996-0059")),
person("Mike", "Johnson", role = "ctb", comment = c(ORCID = "0000-0002-5288-8350")))
Expand All @@ -15,7 +16,7 @@ Description: Several web services are available that provide access to elevation
returns elevation data either as a simple features POINT/MULTIPOINT
from point elevation services or as a raster RasterLayer from raster
elevation services. In future versions, elevatr will drop
support for raster Raster Layers and will instead return terra
support for raster RasterLayers and will instead return terra
SpatRaster objects. Currently, the package supports access to the
Amazon Web Services Terrain Tiles <https://registry.opendata.aws/terrain-tiles/>,
the Open Topography Global Datasets API <https://opentopography.org/developers/>,
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elevatr 1.0.0 (2023-08-17)
elevatr 0.99.0 (2023-08-17)
=============

# Major refactor
Expand All @@ -13,6 +13,7 @@ elevatr 1.0.0 (2023-08-17)

# Other Changes
- Switched to MIT from CCO
- clean up: typos, update citations for new CRAN req, hide one test (thanks @Nowosad)

elevatr 0.4.5 (2023-06-12)
=============
Expand Down
7 changes: 4 additions & 3 deletions R/get_elev_raster.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
#' Several web services provide access to raster elevation. Currently, this
#' function provides access to the Amazon Web Services Terrian Tiles and the
#' Open Topography global datasets API. The function accepts a \code{data.frame}
#' of x (long) and y (lat), an \code{sp}, or \code{raster} object as input. A
#' of x (long) and y (lat), an \code{sf}, or \code{terra} object as input. A
#' \code{raster} object is returned.
#'
#' @param locations Either a \code{data.frame} of x (long) and y (lat), an
#' \code{sp}, \code{sf}, or \code{raster} object as input.
#' \code{sf}, or \code{terra} object as input.
#' @param z The zoom level to return. The zoom ranges from 1 to 14. Resolution
#' of the resultant raster is determined by the zoom and latitude. For
#' details on zoom and resolution see the documentation from Mapzen at
Expand Down Expand Up @@ -164,7 +164,8 @@ get_elev_raster <- function(locations, z, prj = NULL,
#' courtesy of U.S. National Oceanic and Atmospheric Administration.
#' \url{https://github.com/tilezen/joerd/tree/master/docs}
#'
#' @param bbx a \code{sf::st_bbox} object that is used to select x,y,z tiles.
#' @param locations Either a \code{data.frame} of x (long) and y (lat), an
#' \code{sp}, \code{sf}, or \code{raster} object as input.
#' @param z The zoom level to return. The zoom ranges from 1 to 14. Resolution
#' of the resultant raster is determined by the zoom and latitude. For
#' details on zoom and resolution see the documentation from Mapzen at
Expand Down
2 changes: 1 addition & 1 deletion R/internal.R
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ clip_it <- function(rast, loc, expand, clip){

#' Assumes geographic projection
#' sf bbox to poly
#' @param bbx an sf bbox object
#' @param bbox an sf bbox object
#' @param prj defaults to "EPSG:4326"
#' @keywords internal
bbox_to_sf <- function(bbox, prj = 4326) {
Expand Down
8 changes: 4 additions & 4 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ op <- options()

.onAttach <- function(libname, pkgname) {
packageStartupMessage(
"elevatr v1+ NOTE: Version 1.0+ of 'elevatr' use 'sf' and 'terra'.
Support for the 'sp' and 'raster' packages is being deprecated; however,
get_elev_raster continues to return a RasterLayer. This will be dropped in
future versions, so please plan accordingly.")
"elevatr v0.99.0 NOTE: Version 0.99.0 of 'elevatr' uses 'sf' and 'terra'.
Support for the 'sp', 'raster' (and underlying 'rgdal') packages is being
deprecated; however, get_elev_raster continues to return a RasterLayer.
This will be dropped in future versions, so please plan accordingly.")
}

.onUnload <- function(libname, pkgname){
Expand Down
28 changes: 23 additions & 5 deletions cran_comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

## Test Environments

- Github Actions, Ubuntu 20.04.6 LTS, R version 4.3.0
- Github Actions, Ubuntu 20.04.6 LTS, R version 4.3.1
- 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
- Github Actions, Microsoft Windows Server 2022, R Version 4.3.1
- Github Actions, Microsoft Windows Server 2022, R Version 4.2.3
- Github Actions, Mac OS 12.6.7, R Version 4.3.1
- Local, Windows 10 x64 (build 22000), R version 4.2.2 (2022-10-31 ucrt)

## R CMD check results
Expand All @@ -18,4 +18,22 @@

## revdepcheck results

Reverse dependencies were checked with release 1.0.0 on Aug 17, 2023.
Reverse dependencies were checked with release 1.0.0 on Aug 17, 2023. I have emailed and posted issues about the changes to elevatr for each of these reverse dependencies.

## revdepcheck results

We checked 10 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.

* We saw 1 new problems
* We failed to check 0 packages

Issues with CRAN packages are summarised below.

### New problems
(This reports the first line of each new failure)

* shoredate
checking tests ...

test failure for change in returned elevation - difference of 2.71 millimeters.
Issue submitted on package repository.
5 changes: 3 additions & 2 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ bibentry(bibtype = "Manual",
author = c(person("Jeffrey", "Hollister", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9254-9740")),
person("Tarak","Shah", role = "ctb"),
person("Jakub", "Nowosad", role = "ctb", comment = c(ORCID = "0000-0002-1057-3721")),
person("Alec L.", "Robitaille", role = "ctb", comment = c(ORCID = "0000-0002-4706-1762")),
person("Marcus W.", "Beck", role = "rev", comment = c(ORCID = "0000-0002-4996-0059")),
person("Mike", "Johnson", role = "ctb", comment = c(ORCID = "0000-0002-5288-8350"))),
title = "elevatr: Access Elevation Data from Various APIs",
year = "2023",
note = "R package version 1.0.0",
note = "R package version 0.99.0",
doi = "10.5281/zenodo.5809645",
url = "https://github.com/jhollist/elevatr/",
textVersion = "Hollister, J.W. (2023). elevatr: Access Elevation Data from Various APIs. R package version 1.0.0. https://CRAN.R-project.org/package=elevatr/"
textVersion = "Hollister, J.W. (2023). elevatr: Access Elevation Data from Various APIs. R package version 0.99.0. https://CRAN.R-project.org/package=elevatr/"
)
54 changes: 29 additions & 25 deletions revdep/README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
# Platform

|field |value |
|:--------|:----------------------------------------|
|version |R version 4.2.2 (2022-10-31 ucrt) |
|os |Windows 10 x64 (build 19042) |
|system |x86_64, mingw32 |
|ui |RStudio |
|language |(EN) |
|collate |English_United States.utf8 |
|ctype |English_United States.utf8 |
|tz |America/New_York |
|date |2023-06-16 |
|rstudio |2022.12.0+353 Elsbeth Geranium (desktop) |
|pandoc |NA |
|field |value |
|:--------|:-------------------------------------------------------------------------------------|
|version |R version 4.2.2 (2022-10-31 ucrt) |
|os |Windows 10 x64 (build 22000) |
|system |x86_64, mingw32 |
|ui |RStudio |
|language |(EN) |
|collate |English_United States.utf8 |
|ctype |English_United States.utf8 |
|tz |America/New_York |
|date |2023-08-17 |
|rstudio |2022.12.0+353 Elsbeth Geranium (desktop) |
|pandoc |2.19.2 @ C:/Program Files/RStudio/resources/app/bin/quarto/bin/tools/ (via rmarkdown) |

# Dependencies

|package |old |new |Δ |
|:--------|:-----|:----------|:--|
|elevatr |0.4.5 |1.0.0.9999 |* |
|curl |NA |5.0.1 |* |
|jsonlite |NA |1.8.5 |* |
|sf |NA |1.0-13 |* |
|sp |NA |1.6-1 |* |
|vctrs |NA |0.6.3 |* |
|package |old |new |Δ |
|:---------|:-----|:------|:--|
|elevatr |0.4.5 |1.0.0 |* |
|curl |NA |5.0.2 |* |
|digest |NA |0.6.33 |* |
|httr |NA |1.4.7 |* |
|progressr |NA |0.14.0 |* |
|purrr |NA |1.0.2 |* |
|raster |NA |3.6-23 |* |
|Rcpp |NA |1.0.11 |* |
|sf |NA |1.0-14 |* |
|units |NA |0.8-3 |* |

# Revdeps

## Failed to check (1)
## New problems (1)

|package |version |error |warning |note |
|:---------|:-------|:--------|:-------|:----|
|[shoredate](failures.md#shoredate)|1.1.0 |1 __+1__ | | |
|package |version |error |warning |note |
|:---------|:-------|:------|:-------|:----|
|[shoredate](problems.md#shoredate)|1.1.0 |__+1__ | | |

11 changes: 7 additions & 4 deletions revdep/cran.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

We checked 10 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
* We saw 1 new problems
* We failed to check 0 packages

Issues with CRAN packages are summarised below.

### Failed to check
### New problems
(This reports the first line of each new failure)

* shoredate
checking tests ...

* shoredate (NA)
10 changes: 10 additions & 0 deletions revdep/emails.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Luca Carraro <[email protected]>;
Alban de Lavenne <[email protected]>;
Isak Roalkvam <[email protected]>;
Dylan Beaudette <[email protected]>;
Tyler Morgan-Wall <[email protected]>;
Luca Carraro <[email protected]>;
Gianmarco Alberti <[email protected]>;
Alexandre Courtiol <[email protected]>;
Joshua Erickson <[email protected]>;
Peter Li <[email protected]>
45 changes: 1 addition & 44 deletions revdep/failures.md
Original file line number Diff line number Diff line change
@@ -1,44 +1 @@
# shoredate

<details>

* Version: 1.1.0
* GitHub: https://github.com/isakro/shoredate
* Source code: https://github.com/cran/shoredate
* Date/Publication: 2023-06-02 23:40:02 UTC
* Number of recursive dependencies: 116

Run `revdepcheck::revdep_details(, "shoredate")` for more info

</details>

## Newly broken

* checking tests ...
```
Running 'testthat.R'
ERROR
Running the tests in 'tests/testthat.R' failed.
Last 13 lines of output:
1. └─elevatr::get_elev_raster(target_wgs84, z = 14, src = "aws") at test-shoreline_date.R:111:2
2. └─elevatr:::loc_check(locations, prj)
3. ├─sf::st_coordinates(locations)
4. └─sf:::st_coordinates.sfc(locations)
5. └─base::matrix(...)
══ Failed tests ════════════════════════════════════════════════════════════════
── Error ('test-shoreline_date.R:113:3'): finding site elevation from a raster works ──
`shoreline_date(target_point, elevation = elev_raster)` threw an unexpected error.
Message: [extract] raster has no values
Class: simpleError/error/condition
[ FAIL 1 | WARN 1 | SKIP 1 | PASS 112 ]
Error: Test failures
Execution halted
```

## In both

* R CMD check timed out


*Wow, no problems at all. :)*
25 changes: 10 additions & 15 deletions revdep/problems.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,20 @@ Run `revdepcheck::revdep_details(, "shoredate")` for more info
ERROR
Running the tests in 'tests/testthat.R' failed.
Last 13 lines of output:
1. └─elevatr::get_elev_raster(target_wgs84, z = 14, src = "aws") at test-shoreline_date.R:111:2
2. └─elevatr:::loc_check(locations, prj)
3. ├─sf::st_coordinates(locations)
4. └─sf:::st_coordinates.sfc(locations)
5. └─base::matrix(...)
old | new
[3] Output | Output [3]
[4] =============== | =============== [4]
[5] Site: 1 | Site: 1 [5]
[6] Elevation: 59.96235 - Elevation: 59.96506 [6]
[7] | [7]
[8] 95% HDR: | 95% HDR: [8]
[9] 7010 BCE-4880 BCE | 7010 BCE-4880 BCE [9]
══ Failed tests ════════════════════════════════════════════════════════════════
── Error ('test-shoreline_date.R:113:3'): finding site elevation from a raster works ──
`shoreline_date(target_point, elevation = elev_raster)` threw an unexpected error.
Message: [extract] raster has no values
Class: simpleError/error/condition
* Run `testthat::snapshot_accept('shoreline_date')` to accept the change.
* Run `testthat::snapshot_review('shoreline_date')` to interactively review the change.
[ FAIL 1 | WARN 1 | SKIP 1 | PASS 112 ]
Error: Test failures
Execution halted
```

## In both

* R CMD check timed out


0 comments on commit e404e20

Please sign in to comment.