Added contributions from Michael, Hugh, and flotsam

Author: jhollist

R/get_elev_raster.R

@@ -121,6 +121,7 @@ get_elev_raster <- function(locations, z, prj = NULL,
                    that the OpenTopography API Limit will likely be exceeded."))
   }
 
+  
   # Pass of locations to APIs to get data as raster
   if(src == "aws") {
     raster_elev <- get_aws_terrain(locations, z, prj = prj, expand = expand, ...)
@@ -193,6 +194,7 @@ get_aws_terrain <- function(locations, z, prj, expand=NULL,
 
   base_url <- "https://s3.amazonaws.com/elevation-tiles-prod/geotiff"
 
+  #tiles <- get_tilexy_coords(locations, z)
   tiles <- get_tilexy(bbx,z)
 
   urls  <-  sprintf("%s/%s/%s/%s.tif", base_url, z, tiles[,1], tiles[,2])

R/internal.R

@@ -2,6 +2,8 @@
 #' rounding to tile occurs in \code{get_tilexy}
 #' @keywords internal
 latlong_to_tilexy <- function(lon_deg, lat_deg, zoom){
+  # Code assumes lon is 180 to 180, so converts to that
+  lon_deg <- ifelse(lon_deg > 180, lon_deg - 360, lon_deg)
   #Code from https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Coordinates_to_tile_numbers_2
   lat_rad <- lat_deg * pi /180
   n <- 2.0 ^ zoom
@@ -13,6 +15,7 @@ latlong_to_tilexy <- function(lon_deg, lat_deg, zoom){
 #' function to get a data.frame of all xyz tiles to download
 #' @keywords internal
 get_tilexy <- function(bbx,z){
+  
   min_tile <- latlong_to_tilexy(bbx[1,1],bbx[2,1],z)
   max_tile <- latlong_to_tilexy(bbx[1,2],bbx[2,2],z)
   x_all <- seq(from = floor(min_tile[1]), to = floor(max_tile[1]))
@@ -26,9 +29,25 @@ get_tilexy <- function(bbx,z){
     y_all <- y_all[y_all<1]
   }
 
+  
   return(expand.grid(x_all,y_all))
 }
 
+#' function to get a data.frame of all xyz tiles to download
+#' @keywords internal
+get_tilexy_coords <- function(locations,z){
+  coords <- sp::coordinates(locations)
+  
+  tiles <- latlong_to_tilexy(coords[,1],coords[,2],z)
+  tiles <- matrix(tiles, nrow = nrow(coords), ncol = 2)
+  tiles <- floor(tiles)
+  tiles <- unique(tiles)
+  
+  tiles
+}
+
+
+
 #' function to check input type and projection.  All input types convert to a
 #' SpatialPointsDataFrame for point elevation and bbx for raster.
 #' @importFrom sp wkt
@@ -149,6 +168,21 @@ loc_check <- function(locations, prj = NULL){
                                                 sp::coordinates(locations)))))
     }
   }
+  
+  #check for long>180
+  lll <- any(grepl("GEOGCRS",st_crs(prj)) |
+               grepl("GEODCRS", st_crs(prj)) |
+               grepl("GEODETICCRS", st_crs(prj)) |
+               grepl("GEOGRAPHICCRS", st_crs(prj)) |
+               grepl("longlat", st_crs(prj)) |
+               grepl("latlong", st_crs(prj)) |
+               grepl("4326", st_crs(prj)))
+  if(lll){
+    if(any(sp::coordinates(locations)[,1]>180)){
+      stop("The elevatr package requires longitude in a range from -180 to 180.")
+    } 
+  }
+  
 locations
 } 
 
@@ -158,12 +192,13 @@ locations
 #' @keywords internal
 proj_expand <- function(locations,prj,expand){
 
-  lll <- grepl("GEOGCRS",prj) |
-    grepl("GEODCRS",prj) |
-    grepl("GEODETICCRS",prj) |
-    grepl("GEOGRAPHICCRS",prj) |
-    grepl("longlat", prj) |
-    grepl("latlong", prj)
+  lll <- any(grepl("GEOGCRS",sf::st_crs(prj)) |
+               grepl("GEODCRS", sf::st_crs(prj)) |
+               grepl("GEODETICCRS", sf::st_crs(prj)) |
+               grepl("GEOGRAPHICCRS", sf::st_crs(prj)) |
+               grepl("longlat", sf::st_crs(prj)) |
+               grepl("latlong", sf::st_crs(prj)) |
+               grepl("4326", sf::st_crs(prj)))
 
   if(is.null(nrow(locations))){
     nfeature <- length(locations) 

README.Rmd

@@ -32,8 +32,16 @@ library(devtools)
 install_github("jhollist/elevatr")
 ```
 
+## Contributions
+
+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](contributions/mulhearn_rayshader_elevatr_cheatsheet.pdf)
+- [[@researchremora on twitter](https://mobile.twitter.com/researchremora) 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)
 
 ## Attribution
+
 Mapzen terrain tiles (which supply the AWS source) contain 3DEP, SRTM, and GMTED2010 content courtesy of the U.S. Geological Survey and ETOPO1 content courtesy of U.S. National Oceanic and Atmospheric Administration. The Open Topography API provide access to the SRTM and the ALOS World 3D datasets.  See <https://opentopography.org/> for details.  
 
 ## Repositories

README.md

@@ -25,13 +25,13 @@ 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
+-   `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
+-   `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
@@ -54,6 +54,24 @@ library(devtools)
 install_github("jhollist/elevatr")
 ```
 
+## Contributions
+
+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](contributions/mulhearn_rayshader_elevatr_cheatsheet.pdf)
+-   [\[@researchremora on
+    twitter\](https://mobile.twitter.com/researchremora) 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)
+
 ## Attribution
 
 Mapzen terrain tiles (which supply the AWS source) contain 3DEP, SRTM,