Skip to content

Commit

Permalink
v0.2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
RichDeto committed Aug 22, 2023
1 parent 09a1ebf commit 43c720d
Show file tree
Hide file tree
Showing 10 changed files with 424 additions and 49 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
^inst/tutorials/intro_geouy/intro_geouy\.Rmd$
^\.github$
^CRAN-SUBMISSION$
^dev
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ packrat/lib*/
inst/doc
doc
Meta
CRAN-RELEASE
CRAN-RELEASE
dev
/doc/
/Meta/
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.2.7
Date: 2023-05-17 16:40:26 UTC
SHA: 3209bdf07e1630f870e9241d6576a661cb7d2a9a
94 changes: 49 additions & 45 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,55 +1,59 @@
Package: geouy
Type: Package
Package: geouy
Title: Geographic Information of Uruguay
Version: 0.2.7
Version: 0.2.8
Authors@R: c(
person(given = "Richard",
family = "Detomasi",
email = "richard.detomasi@gmail.com",
role = c("aut", "cre", "cph"),
comment = c(ORCID = "0000-0002-6725-0261")),
person(family = "Ministerio de Desarrollo Social, Uruguay (MIDES)", role = "dtc"),
person(family = "Infraestrutura de Datos Espaciales, Uruguay (IDE)", role = "dtc"),
person(family = "Servicio Geográfico Militar, Uruguay (SGM)", role = "dtc"),
person(family = "Ministerio de Transporte y Obras Públicas, Uruguay (MTOP)", role = "dtc"),
person(family = "Instituto Nacional de Estadística, Uruguay (INE)", role = "dtc"),
person(family = "Instituto Geográfico Militar, Uruguay (IGM)", role = "dtc"),
person(family = "Ministerio de Vivienda, Ordenamiento Territorial y Medio Ambiente, Uruguay (MVOTMA)", role = "dtc")
)
person("Richard", "Detomasi", , "richard.detomasi@gmail.com", role = c("aut", "cre", "cph"),
comment = c(ORCID = "0000-0002-6725-0261")),
person(, "Ministerio de Desarrollo Social, Uruguay (MIDES)", role = "dtc"),
person(, "Infraestrutura de Datos Espaciales, Uruguay (IDE)", role = "dtc"),
person(, "Servicio Geográfico Militar, Uruguay (SGM)", role = "dtc"),
person(, "Ministerio de Transporte y Obras Públicas, Uruguay (MTOP)", role = "dtc"),
person(, "Instituto Nacional de Estadística, Uruguay (INE)", role = "dtc"),
person(, "Instituto Geográfico Militar, Uruguay (IGM)", role = "dtc"),
person(, "Ministerio de Vivienda, Ordenamiento Territorial y Medio Ambiente, Uruguay (MVOTMA)", role = "dtc")
)
Maintainer: Richard Detomasi <richard.detomasi@gmail.com>
Description: The toolbox have functions to load and process geographic information for Uruguay.
And extra-function to get address coordinates and orthophotos through the uruguayan 'IDE' API <https://www.gub.uy/infraestructura-datos-espaciales/tramites-y-servicios/servicios/sistema-unico-direcciones-geograficas>.
BugReports: https://github.com/RichDeto/geouy/issues
Description: The toolbox have functions to load and process geographic
information for Uruguay. And extra-function to get address
coordinates and orthophotos through the uruguayan 'IDE' API
<https://www.gub.uy/infraestructura-datos-espaciales/tramites-y-servicios/servicios/sistema-unico-direcciones-geograficas>.
License: GPL-3
Depends: R (>= 3.4.0)
Language: en, es
BugReports: https://github.com/RichDeto/geouy/issues
Depends:
R (>= 3.4.0)
Imports:
assertthat,
curl,
dplyr,
fs,
ggplot2,
ggspatial,
ggthemes,
glue,
magrittr,
methods,
raster,
rjson,
rlang,
sf,
sp,
stringr,
tidyselect,
utils,
viridis
Suggests:
knitr,
rmarkdown,
spelling,
testthat
VignetteBuilder:
knitr
ByteCompile: true
Encoding: UTF-8
Language: en-US
LazyData: TRUE
RoxygenNote: 7.2.3
SystemRequirements: 'unrar' (Linux/macOS) or '7-Zip' (Windows)
to work with '.rar' files, C++11, GDAL (>= 2.0.1), GEOS (>= 3.8.0), PROJ (>=
SystemRequirements: 'unrar' (Linux/macOS) or '7-Zip' (Windows) to work
with '.rar' files, C++11, GDAL (>= 2.0.1), GEOS (>= 3.8.0), PROJ (>=
6.2.1)
Imports:
rlang,
curl,
dplyr,
glue,
stringr,
ggplot2,
ggthemes,
ggspatial,
methods,
magrittr,
fs,
sf,
assertthat,
viridis,
raster,
sp,
rjson,
tidyselect
Suggests:
rmarkdown,
knitr
VignetteBuilder: knitr
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

-------------------------------------------------------

## geouy v0.2.8 (2023-08-22)

* update geouy.R for changes in roxygen2
* debug warning in add_geom.R

## geouy v0.2.7 (2023-05-16)

* Debug testing errors
Expand Down
4 changes: 2 additions & 2 deletions R/add_geom.R
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ add_geom <- function(data, unit, variable, crs = 32721){

if (is.character(data[[variable]])) {
name <- as.character(md[md$capa == unit, "name"])
g2 <- g %>% dplyr::select(name) %>%
g2 <- g %>% dplyr::select(all_of(name)) %>%
dplyr::rename("link" = name) %>%
dplyr::mutate(link = as.character(link))
data <- dplyr::left_join(g2, data, by = c("link" = variable))
} else {
cod <- as.character(md[md$capa == unit, "cod"])
g2 <- g %>% dplyr::select(cod) %>%
g2 <- g %>% dplyr::select(all_of(cod)) %>%
dplyr::rename("link" = cod) %>%
dplyr::mutate(link = as.numeric(link))
data <- dplyr::left_join(g2, data %>%
Expand Down
2 changes: 1 addition & 1 deletion R/geouy.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ NULL

## quiets concerns of R CMD check re: the .'s that appear in pipelines
if (getRversion() >= "2.15.1") utils::globalVariables(
c(".", "label", "link", "localidad", "lat", "lon")
c(".", "label", "link", "localidad", "lat", "lon", "all_of")
)
Loading

0 comments on commit 43c720d

Please sign in to comment.