Updates

.Rbuildignore

@@ -15,3 +15,4 @@ geofacet.code-workspace
 ^docs$
 ^pkgdown$
 ^revdep$
+^\.github$

DESCRIPTION

@@ -1,10 +1,12 @@
 Package: geofacet
 Title: 'ggplot2' Faceting Utilities for Geographical Data
-Version: 0.2.0
+Version: 0.2.1
 Authors@R: c(
     person("Ryan", "Hafen", email = "[email protected]", role = c("aut", "cre")),
     person("Barret", "Schloerke", email = "[email protected]", role = "ctb"))
-Description: Provides geofaceting functionality for 'ggplot2'. Geofaceting arranges a sequence of plots of data for different geographical entities into a grid that preserves some of the geographical orientation.
+Description: Provides geofaceting functionality for 'ggplot2'. Geofaceting
+    arranges a sequence of plots of data for different geographical entities
+    into a grid that preserves some of the geographical orientation.
 Depends: R (>= 3.2)
 License: MIT + file LICENSE
 Encoding: UTF-8
@@ -15,19 +17,20 @@ Imports:
     graphics,
     rnaturalearth,
     sp,
-    sf,
     ggrepel,
     imguR,
     gridExtra,
     geogrid,
-    methods
+    methods,
+    rlang
 Suggests:
+    sf,
     testthat,
     covr,
     lintr,
     knitr,
     rmarkdown
 URL: https://github.com/hafen/geofacet
 BugReports: https://github.com/hafen/geofacet/issues
-RoxygenNote: 7.1.0
+RoxygenNote: 7.2.3
 VignetteBuilder: knitr

NAMESPACE

@@ -35,6 +35,7 @@ importFrom(gridExtra,grid.arrange)
 importFrom(gtable,gtable_filter)
 importFrom(imguR,upload_image)
 importFrom(methods,as)
+importFrom(rlang,.data)
 importFrom(rnaturalearth,ne_countries)
 importFrom(rnaturalearth,ne_states)
 importFrom(sp,CRS)

NEWS.md

@@ -1,3 +1,8 @@
+Version 0.2.1
+----------------------------------------------------------------------
+
+- Fix issue with unicode characters in grid names
+
 Version 0.2
 ----------------------------------------------------------------------
 

R/facet_geo.R

@@ -63,7 +63,11 @@ ggplot_add.facet_geo_spec <- function(object, plot, object_name) {
   grd <- tmp$grd
 
   plot <- plot %+% do.call(ggplot2::facet_wrap, object)
-  attr(plot, "geofacet") <- list(grid = grd, move_axes = move_axes, scales = object$scales)
+  attr(plot, "geofacet") <- list(
+    grid = grd,
+    move_axes = move_axes,
+    scales = object$scales
+  )
 
   class(plot) <- c("facet_geo", class(plot))
   return(plot)
@@ -172,6 +176,7 @@ plot.facet_geo <- function(x, ...) {
 #' @export
 #' @importFrom ggplot2 ggplot geom_rect geom_text aes xlim ylim
 #' @importFrom gridExtra grid.arrange
+#' @importFrom rlang .data
 #' @examples
 #' grid_preview(us_state_grid2)
 #' grid_preview(eu_grid1, label = "name")
@@ -191,7 +196,7 @@ grid_preview <- function(x, label = NULL, label_raw = NULL) {
     x$txt <- x[[label]]
   }
 
-  p <- ggplot2::ggplot(x, ggplot2::aes_string("col", "row", label = "txt")) +
+  p <- ggplot2::ggplot(x, ggplot2::aes(.data$col, .data$row, label = "txt")) +
     ggplot2::geom_rect(
       xmin = as.numeric(x$col) - 0.5, xmax = as.numeric(x$col) + 0.5,
       ymin = as.numeric(x$row) - 0.5, ymax = as.numeric(x$row) + 0.5,
@@ -216,7 +221,7 @@ grid_preview <- function(x, label = NULL, label_raw = NULL) {
     p2 <- plot_geo_raw(spdf, label = label_raw)
     p <- gridExtra::grid.arrange(p2, p, nrow = 1)
   } else {
-    plot(p)
+    suppressWarnings(plot(p))
   }
   invisible(p)
 }
@@ -404,10 +409,11 @@ get_grid <- function(grid) {
     }
   } else if (inherits(grid, "data.frame")) {
     grd <- check_grid(grid)
-    message_nice("Note: You provided a user-specified grid. ",
-      "If this is a generally-useful grid, please consider submitting it ",
-      "to become a part of the geofacet package. You can do this easily by ",
-      "calling:\ngrid_submit(__grid_df_name__)")
+    if (!inherits(grid, "geofacet_grid"))
+      message_nice("Note: You provided a user-specified grid. ",
+        "If this is a generally-useful grid, please consider submitting it ",
+        "to become a part of the geofacet package. You can do this easily by ",
+        "calling:\ngrid_submit(__grid_df_name__)")
   } else {
     stop("grid not recognized...")
   }

R/grid_docs.R

@@ -50,15 +50,15 @@ NULL
 
 #' @name gb_london_boroughs_grid
 #' @description
-#' * **gb_london_boroughs_grid:** Grid layout for the boroughs of London. Note that the column \code{code_ons} contains the \href{http://geoportal.statistics.gov.uk/datasets/464be6191a434a91a5fa2f52c7433333_0?uiTab=table}{codes} used by UK Office for National Statistics. Image reference [here](https://cloud.githubusercontent.com/assets/13021448/26399784/3133d684-4076-11e7-8eac-1e74d023bf18.jpg). Thanks to [eldenvo](https://github.com/eldenvo).
+#' * **gb_london_boroughs_grid:** Grid layout for the boroughs of London. Note that the column \code{code_ons} contains the codes used by UK Office for National Statistics. Image reference [here](https://cloud.githubusercontent.com/assets/13021448/26399784/3133d684-4076-11e7-8eac-1e74d023bf18.jpg). Thanks to [eldenvo](https://github.com/eldenvo).
 #' @usage gb_london_boroughs_grid
 #' @rdname grids
 #' @md
 NULL
 
 #' @name nhs_scot_grid
 #' @description
-#' * **nhs_scot_grid:** Grid layout for a grid of NHS Scotland Health Boards. Note that the column \code{code} contains the \href{http://geoportal.statistics.gov.uk/datasets/61dca36aa33e4aee99bbfa784fa9eb25_0?uiTab=table}{codes} used by UK Office for National Statistics. Image reference [here](https://cloud.githubusercontent.com/assets/24879214/26426113/253658d0-40cf-11e7-88b5-fe5ee7fda44f.png). Thanks to [jsphdms](https://github.com/jsphdms).
+#' * **nhs_scot_grid:** Grid layout for a grid of NHS Scotland Health Boards. Note that the column \code{code} contains the codes used by UK Office for National Statistics. Image reference [here](https://cloud.githubusercontent.com/assets/24879214/26426113/253658d0-40cf-11e7-88b5-fe5ee7fda44f.png). Thanks to [jsphdms](https://github.com/jsphdms).
 #' @usage nhs_scot_grid
 #' @rdname grids
 #' @md
@@ -138,7 +138,7 @@ NULL
 
 #' @name us_wa_counties_grid1
 #' @description
-#' * **us_wa_counties_grid1:** Grid for Washington counties. Image reference [here](http://www.countymapsofwashington.com/aapics/washingstate.gif).
+#' * **us_wa_counties_grid1:** Grid for Washington counties. Image reference [here](https://www.countymapsofwashington.com/aapics/washingstate.gif).
 #' @usage us_wa_counties_grid1
 #' @rdname grids
 #' @md
@@ -162,7 +162,7 @@ NULL
 
 #' @name se_counties_grid1
 #' @description
-#' * **se_counties_grid1:** Grid for counties of Sweden. Image reference [here](http://www.worldatlas.com/webimage/countrys/europe/lgcolor/secounties.gif). Thanks to [duleise](https://github.com/duleise).
+#' * **se_counties_grid1:** Grid for counties of Sweden. Image reference [here](https://www.worldatlas.com/webimage/countrys/europe/lgcolor/secounties.gif). Thanks to [duleise](https://github.com/duleise).
 #' @usage se_counties_grid1
 #' @rdname grids
 #' @md
@@ -338,7 +338,7 @@ NULL
 
 #' @name sk_province_grid1
 #' @description
-#' * **sk_province_grid1:** Grid layout for South Korean sis and dos (metropolitan/special/autonomous cities and provinces). Image reference [here](http://tong.visitkorea.or.kr/enu/images/koreastay/korea_map.jpg). Thanks to [heon131](https://github.com/heon131).
+#' * **sk_province_grid1:** Grid layout for South Korean sis and dos (metropolitan/special/autonomous cities and provinces). Image reference [here](https://tong.visitkorea.or.kr/enu/images/koreastay/korea_map.jpg). Thanks to [heon131](https://github.com/heon131).
 #' @usage sk_province_grid1
 #' @rdname grids
 #' @md
@@ -386,7 +386,7 @@ NULL
 
 #' @name br_states_grid2
 #' @description
-#' * **br_states_grid2:** Grid for the 27 states of Brazil. Image reference [here](http://www.brazil-help.com/mapa_do_brasil.gif). Thanks to [hafen](https://github.com/hafen).
+#' * **br_states_grid2:** Grid for the 27 states of Brazil. Image reference [here](https://www.brazil-help.com/mapa_do_brasil.gif). Thanks to [hafen](https://github.com/hafen).
 #' @usage br_states_grid2
 #' @rdname grids
 #' @md

R/package-geofacet.R

@@ -50,7 +50,7 @@ NULL
 #' @name election
 #' @docType data
 #' @description
-#' 2016 US presidential election results, obtained from \url{http://bit.ly/2016votecount}.
+#' 2016 US presidential election results, obtained from \url{https://bit.ly/2016votecount}.
 #' @usage election
 #' @keywords data
 NULL
@@ -60,7 +60,7 @@ NULL
 #' @name eu_imm
 #' @docType data
 #' @description
-#' Annual number of resettled persons for each EU country. "Resettled refugees means persons who have been granted an authorization to reside in a Member State within the framework of a national or Community resettlement scheme.". Source: \url{http://ec.europa.eu/eurostat/cache/metadata/en/migr_asydec_esms.htm}. Dataset ID: tps00195.
+#' Annual number of resettled persons for each EU country. "Resettled refugees means persons who have been granted an authorization to reside in a Member State within the framework of a national or Community resettlement scheme.". Source: \url{https://ec.europa.eu/eurostat/cache/metadata/en/migr_asydec_esms.htm}. Dataset ID: tps00195.
 #' @usage eu_imm
 #' @keywords data
 NULL
@@ -70,7 +70,7 @@ NULL
 #' @name eu_gdp
 #' @docType data
 #' @description
-#' GDP per capita in PPS - Index (EU28 = 100). "Gross domestic product (GDP) is a measure for the economic activity. It is defined as the value of all goods and services produced less the value of any goods or services used in their creation. The volume index of GDP per capita in Purchasing Power Standards (PPS) is expressed in relation to the European Union (EU28) average set to equal 100. If the index of a country is higher than 100, this country's level of GDP per head is higher than the EU average and vice versa. Basic figures are expressed in PPS, i.e. a common currency that eliminates the differences in price levels between countries allowing meaningful volume comparisons of GDP between countries. Please note that the index, calculated from PPS figures and expressed with respect to EU28 = 100, is intended for cross-country comparisons rather than for temporal comparisons." Source: \url{http://ec.europa.eu/eurostat/web/national-accounts/data/main-tables}. Dataset ID: tec00114.
+#' GDP per capita in PPS - Index (EU28 = 100). "Gross domestic product (GDP) is a measure for the economic activity. It is defined as the value of all goods and services produced less the value of any goods or services used in their creation. The volume index of GDP per capita in Purchasing Power Standards (PPS) is expressed in relation to the European Union (EU28) average set to equal 100. If the index of a country is higher than 100, this country's level of GDP per head is higher than the EU average and vice versa. Basic figures are expressed in PPS, i.e. a common currency that eliminates the differences in price levels between countries allowing meaningful volume comparisons of GDP between countries. Please note that the index, calculated from PPS figures and expressed with respect to EU28 = 100, is intended for cross-country comparisons rather than for temporal comparisons." Source is no longer available (previously at http://ec.europa.eu/eurostat/web/national-accounts/data/main-tables). Dataset ID: tec00114.
 #' @usage eu_gdp
 #' @keywords data
 NULL

README.md

@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/hafen/geofacet.svg?branch=master)](https://travis-ci.org/hafen/geofacet)
-[![Coverage Status](https://img.shields.io/codecov/c/github/hafen/geofacet/master.svg)](https://codecov.io/github/hafen/geofacet?branch=master)
+[![R-CMD-check](https://github.com/hafen/geofacet/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/hafen/geofacet/actions/workflows/R-CMD-check.yaml)
+[![Codecov test coverage](https://codecov.io/gh/hafen/geofacet/branch/master/graph/badge.svg)](https://app.codecov.io/gh/hafen/geofacet?branch=master)
 [![CRAN](http://www.r-pkg.org/badges/version/geofacet)](https://CRAN.R-project.org/package=geofacet)
 [![CRAN Downloads](http://cranlogs.r-pkg.org/badges/geofacet)](https://CRAN.R-project.org/package=geofacet)
 

_pkgdown.yml

@@ -1 +1,45 @@
 destination: docs
+
+## layout the order in which topics are presented in the rd docs
+# 1. get a list of topics with the following:
+#    db <- tools::Rd_db("geofacet")
+#    topics <- gsub("\\.Rd", "", names(db))
+#    cat(paste(topics, collapse = "\n"))
+# 2. arrange the topic names into sections as desired in the format below:
+## If you need to see which topics are missing, do the following in addition:
+# cur <- yaml::yaml.load_file("rd_index.yaml")
+# cur <- unlist(lapply(cur, function(x) x$topics))
+# cat(paste(setdiff(topics, cur), collapse = "\n"))
+knitr:
+  eval: false
+
+sections:
+-
+  section_name: Package Functions
+  topics:
+    - facet_geo
+    - get_grid_names
+    - grid_design
+    - grid_preview
+    - grid_submit
+
+-
+  section_name: Grids
+  topics:
+    -
+      file: grids.Rd
+      title: "grids"
+
+-
+  section_name: Datasets
+  topics:
+    - aus_pop
+    - election
+    - eu_gdp
+    - eu_imm
+    - india_pop
+    - london_afford
+    - nhs_scot_dental
+    - sa_pop_dens
+    - state_ranks
+    - state_unemp

codecov.yml

@@ -1 +1,14 @@
 comment: false
+
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 1%
+        informational: true
+    patch:
+      default:
+        target: auto
+        threshold: 1%
+        informational: true

data-raw/grids.R

@@ -15,13 +15,14 @@ sort(nchar(grid_list$ref_img))
 
 lapply(nms, function(x) {
   message(x)
-  url <- sprintf("https://raw.githubusercontent.com/hafen/grid-designer/master/grids/%s.csv", x)
+  urlstr <- sprintf("https://raw.githubusercontent.com/hafen/grid-designer/master/grids/%s.csv", x)
   # tmp <- utils::read.csv(url, stringsAsFactors = FALSE, nrows = 1)
   # # all columns other than "row" and "col" will be strings (names and codes)
   # cls <- ifelse(names(tmp) %in% c("row", "col"), "integer", "character")
   # # use read.csv simply because it means one less dependency...
   # res <- utils::read.csv(url, colClasses = cls, stringsAsFactors = FALSE, na.strings = NULL)
-  res <- data.frame(readr::read_csv(url, na = ""))
+  res <- data.frame(readr::read_csv(url(urlstr), na = ""))
+  class(res) <- c("data.frame", "geofacet_grid")
   assign(x, res)
   eval(parse(text = sprintf("usethis::use_data(%s, overwrite = TRUE)", x)))
 })

docs/pkgdown.yml

@@ -3,5 +3,5 @@ pkgdown: 1.5.1
 pkgdown_sha: ~
 articles:
   geofacet: geofacet.html
-last_built: 2020-05-25T18:08Z
+last_built: 2020-05-25T22:47Z