From a09f8dbed048f454b80f54538642dacf8bba7c06 Mon Sep 17 00:00:00 2001 From: Jeff Hollister Date: Fri, 20 Nov 2020 15:16:54 -0500 Subject: [PATCH] new URL for epqs --- R/get_elev_point.R | 3 ++- cran_comments.md | 10 ++++++---- man/get_elev_point.Rd | 6 +++--- man/get_elev_raster.Rd | 17 ++++++++--------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/R/get_elev_point.R b/R/get_elev_point.R index fb292f3..d59b20a 100644 --- a/R/get_elev_point.R +++ b/R/get_elev_point.R @@ -113,7 +113,8 @@ get_elev_point <- function(locations, prj = NULL, src = c("epqs", "aws"), ...){ #' @export #' @keywords internal get_epqs <- function(locations, units = c("meters","feet")){ - base_url <- "http://ned.usgs.gov/epqs/pqs.php?" + + base_url <- "https://nationalmap.gov/epqs/pqs.php?" if(match.arg(units) == "meters"){ units <- "Meters" } else if(match.arg(units) == "feet"){ diff --git a/cran_comments.md b/cran_comments.md index efb8515..47080d9 100644 --- a/cran_comments.md +++ b/cran_comments.md @@ -1,10 +1,12 @@ ## Comments -Fixes incorrect URL in vigenette from initial v 0.2.0 submission per 2018-11-28 email from Uwe Ligges. Additionally, this submission adds some new functionality to the package, fully deprecates the mapzen source, and updates tests. The new functionalities are allowing for clipping of the output DEMs as well as providing an alternative, global, source for point elevations. Additin +Added new elevation data sources available via Open Topography. Includes several bug fixes. ## Test Environments -- Travis-CI, Ubuntu 14.04.5 LTS, R version 3.4.4 (2017-01-27) -- Travis-CI, Ubuntu 14.04.5 LTS, R version 3.5.1 (2017-01-27) -- Travis-CI, Ubuntu 14.04.5 LTS, R Under development (unstable) (2018-11-28 r75712) +- Github Actions, Ubuntu 14.04.5 LTS, R version 3.4.4 (2017-01-27) +- Github Actions, Ubuntu 14.04.5 LTS, R version 3.5.1 (2017-01-27) +- Github Actions, Ubuntu 14.04.5 LTS, R Under development (unstable) (2018-11-28 r75712) +- Github Actions, Microsoft Windows Server 2019 +- Github Actions, Mac OS X - Local, Windows 10, R version 3.5.1 (2018-07-02) ## R CMD check results diff --git a/man/get_elev_point.Rd b/man/get_elev_point.Rd index 7b54454..03a70fe 100644 --- a/man/get_elev_point.Rd +++ b/man/get_elev_point.Rd @@ -39,9 +39,9 @@ Function returns a \code{SpatialPointsDataFrame} or \code{sf} object in the projection specified by the \code{prj} argument. } \description{ -Several web services provide access to point elevations. This function -provides access to one of those. Currently it uses the USGS Elevation Point -Query Service (US Only). The function accepts a \code{data.frame} of x +This function provides access to point elevations using either the USGS +Elevation Point Query Service (US Only) or by extracting point elevations +from the AWS Terrain Tiles. The function accepts a \code{data.frame} of x (long) and y (lat) or a \code{SpatialPoints}/\code{SpatialPointsDataFame} as input. A SpatialPointsDataFrame is returned with elevation as an added \code{data.frame}. diff --git a/man/get_elev_raster.Rd b/man/get_elev_raster.Rd index 2d3d493..991d599 100644 --- a/man/get_elev_raster.Rd +++ b/man/get_elev_raster.Rd @@ -73,20 +73,19 @@ Function returns a \code{SpatialPointsDataFrame} in the projection } \description{ Several web services provide access to raster elevation. Currently, this -function provides access to the Mapzen Terrain Service The function -accepts a \code{data.frame} of x (long) and y (lat), an -\code{sp}, or \code{raster} object as input. A \code{raster} object is -returned. +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 +\code{raster} object is returned. } \details{ -Currently, the \code{get_elev_raster} utilizes only the +Currently, the \code{get_elev_raster} function utilizes the Amazon Web Services (\url{https://registry.opendata.aws/terrain-tiles/}) terrain - tiles. Versions of \code{elevatr} 0.1.4 or earlier had options for - the Mapzen terrain tiles. Mapzen data is no longer available. - Support for the replacment Nextzen tiles is not currently available + tiles and the Open Topography Global Datasets API + (\url{https://opentopography.org/developers}). - The terrain data is provided via x, y, and z tiles (see + The AWS Terrain Tiles data is provided via x, y, and z tiles (see \url{http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames} for details.) The x and y are determined from the bounding box of the object submitted for \code{locations} argument, and the z argument