Skip to content

Commit

Permalink
convert from NE to US, pass checks
Browse files Browse the repository at this point in the history
  • Loading branch information
jsta committed Jan 9, 2020
1 parent 0ddee54 commit 59a8b29
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 25 deletions.
4 changes: 2 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Generated by roxygen2: do not edit by hand

export(gh_file)
export(lagosnegis_get)
export(lagosusgis_path)
export(query_gis)
export(query_gis_)
export(query_lake_poly)
export(query_wbd)
importFrom(LAGOSNE,lagosne_version)
importFrom(LAGOSUS,lagosus_version)
importFrom(base64enc,base64decode)
importFrom(curl,curl_fetch_memory)
importFrom(dplyr,mutate)
Expand Down
2 changes: 1 addition & 1 deletion R/LAGOSNEgis-package.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#' @importFrom rappdirs user_data_dir
#' @importFrom LAGOSNE lagosne_version
#' @importFrom LAGOSUS lagosus_version
#' @keywords internal
"_PACKAGE"

Expand Down
3 changes: 1 addition & 2 deletions R/get.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#'
#' Get data from the GIS module of LAGOSNE
#'
#' @export
#' @importFrom utils unzip download.file
#' @importFrom gdalUtilities ogr2ogr
#' @param dest_folder file.path defaults to lagosnegis_path()
Expand All @@ -17,7 +16,7 @@
#' @examples \dontrun{
#' lagosnegis_get()
#' }
lagosnegis_get <- function(dest_folder = lagosnegis_dir(), overwrite = FALSE){
lagosnegis_get <- function(dest_folder = lagosusgis_dir(), overwrite = FALSE){
# dest_folder <- LAGOSNEgis:::lagosnegis_path()
outpath <- file.path(dest_folder, "lagos-ne_gis.gpkg")
dest_gdb <- file.path(dest_folder, "LAGOS_NE_GIS_Data_v1.0.gdb")
Expand Down
4 changes: 2 additions & 2 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ albers_conic <- function(){
"+proj=aea +lat_1=29.5 +lat_2=45.5 +lat_0=23 +lon_0=-96 +x_0=0 +y_0=0 +datum=NAD83 +units=m +no_defs"
}

#' Get the path to LAGOSNEgis data
#' Get the path to LAGOSUSgis data
#'
#' @export
lagosusgis_path <- function(){
file.path(rappdirs::user_data_dir("LAGOS-GIS"), "LAGOS_US_GIS_Data_v0.6.gdb")
}

lagosnegis_dir <- function(){
lagosusgis_dir <- function(){
rappdirs::user_data_dir("LAGOS-GIS")
}

Expand Down
3 changes: 2 additions & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
}
}

.onLoad <- function(pkgname, libname) {
.onLoad <- function(libname, pkgname) {
query_wbd <<- memoise::memoise(query_wbd)
query_gis <<- memoise::memoise(query_gis)
query_gis_ <<- memoise::memoise(query_gis_)
query_lake_poly <<- memoise::memoise(query_lake_poly)
}
8 changes: 4 additions & 4 deletions data-raw/subset.R
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
library(LAGOSNEgis)
library(LAGOSUSgis)
llid <- 34352

res_iws <- query_gis("IWS", "lagoslakeid", llid)
res_lake <- query_gis("LAGOS_NE_All_Lakes_4ha", "lagoslakeid", llid)
res_pnt <- query_gis("LAGOS_NE_All_Lakes_4ha_POINTS", "lagoslakeid", llid)
res_iws <- query_gis("ws", "lagoslakeid", llid)
res_lake <- query_gis("LAGOS_US_All_Lakes_1ha", "lagoslakeid", llid)
res_pnt <- query_gis("LAGOS_US_All_Lakes_1ha_POINTS", "lagoslakeid", llid)

gis_34352 <- list(res_iws = res_iws, res_lake = res_lake, res_pnt = res_pnt)
use_data(gis_34352, overwrite = TRUE)
Binary file modified data/gis_34352.rda
Binary file not shown.
2 changes: 1 addition & 1 deletion man/lagosnegis_get.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/lagosusgis_path.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/query_gis.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions man/query_lake_poly.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/query_wbd.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
title: "Using LAGOSNEgis"
title: "Using LAGOSUSgis"
author: "Joseph Stachelek"
date: "`r Sys.Date()`"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Using LAGOSNEgis}
%\VignetteIndexEntry{Using LAGOSUSgis}
%\VignetteEngine{knitr::rmarkdown}
%\VignetteEncoding{UTF-8}
---
Expand All @@ -17,13 +17,13 @@ knitr::opts_chunk$set(
```

```{r message=FALSE, warning=FALSE, eval=FALSE}
library(LAGOSNEgis)
library(LAGOSUSgis)
library(sf)
library(ggplot2)
res_iws <- query_gis("IWS", "lagoslakeid", c(34352))
res_lake <- query_gis("LAGOS_NE_All_Lakes_4ha", "lagoslakeid", 34352)
res_pnt <- query_gis("LAGOS_NE_All_Lakes_4ha_POINTS", "lagoslakeid", 34352)
res_iws <- query_gis("ws", "lagoslakeid", c(34352))
res_lake <- query_gis("LAGOS_US_All_Lakes_1ha", "lagoslakeid", 34352)
res_pnt <- query_gis("LAGOS_US_All_Lakes_1ha_POINTS", "lagoslakeid", 34352)
ggplot() +
geom_sf(data = res_iws, color = "darkgreen") +
Expand All @@ -32,7 +32,7 @@ ggplot() +
```

```{r echo=FALSE, message=FALSE, warning=FALSE}
library(LAGOSNEgis)
library(LAGOSUSgis)
library(sf)
library(ggplot2)
Expand Down

0 comments on commit 59a8b29

Please sign in to comment.