Skip to content

Commit

Permalink
Fixes for submission
Browse files Browse the repository at this point in the history
  • Loading branch information
hafen committed Nov 29, 2023
1 parent ff80d12 commit 6da91cf
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 32 deletions.
18 changes: 9 additions & 9 deletions R/grid_docs.R
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ NULL

#' @name argentina_grid1
#' @description
#' * **argentina_grid1:** Grid for the 23 provinces of Argentina. It includes the Malvinas/Falkland Islands and the Antarctic Territories (these are disputed, but they are included since many researchers might use data from these locations). Image reference [here](https://s-media-cache-ak0.pinimg.com/736x/bf/cb/96/bfcb9654477c127d3b0e0b72d5be65fc.jpg). Thanks to [eliocamp](https://github.com/eliocamp).
#' * **argentina_grid1:** Grid for the 23 provinces of Argentina. It includes the Malvinas/Falkland Islands and the Antarctic Territories (these are disputed, but they are included since many researchers might use data from these locations). Image reference [here](https://i.pinimg.com/736x/bf/cb/96/bfcb9654477c127d3b0e0b72d5be65fc.jpg). Thanks to [eliocamp](https://github.com/eliocamp).
#' @usage argentina_grid1
#' @rdname grids
#' @md
Expand Down Expand Up @@ -258,15 +258,15 @@ NULL

#' @name ng_state_grid1
#' @description
#' * **ng_state_grid1:** Grid layout for the 37 Federal States of Nigeria. Image reference [here](https://camo.githubusercontent.com/fa12bca8fe3f3de3d7af707400adbc7fc4656cc3/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f382f38332f4e6967657269615f7374617465732e706e67). Thanks to [ghosthedirewolf](https://github.com/ghosthedirewolf).
#' * **ng_state_grid1:** Grid layout for the 37 Federal States of Nigeria. Image reference [here](https://camo.githubusercontent.com/fa12bca8fe3f3de3d7af707400adbc7fc4656cc3/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f382f38332f4e6967657269615f7374617465732e706e67). Thanks to [aledemogr](https://github.com/aledemogr).
#' @usage ng_state_grid1
#' @rdname grids
#' @md
NULL

#' @name bd_upazila_grid1
#' @description
#' * **bd_upazila_grid1:** Grid layout for Bangladesh 64 Upazilas. Image reference [here](https://camo.githubusercontent.com/df1e4aff5a3e0238afef97586d324d9b23acf27b/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f7468756d622f322f32382f42445f4d61705f61646d696e2e7376672f38303070782d42445f4d61705f61646d696e2e7376672e706e67). Thanks to [ghosthedirewolf](https://github.com/ghosthedirewolf).
#' * **bd_upazila_grid1:** Grid layout for Bangladesh 64 Upazilas. Image reference [here](https://camo.githubusercontent.com/df1e4aff5a3e0238afef97586d324d9b23acf27b/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f7468756d622f322f32382f42445f4d61705f61646d696e2e7376672f38303070782d42445f4d61705f61646d696e2e7376672e706e67). Thanks to [aledemogr](https://github.com/aledemogr).
#' @usage bd_upazila_grid1
#' @rdname grids
#' @md
Expand Down Expand Up @@ -354,7 +354,7 @@ NULL

#' @name jo_gov_grid1
#' @description
#' * **jo_gov_grid1:** Grid layout for Governorates of Jordan. Image reference [here](https://user-images.githubusercontent.com/1275592/82837533-32964c00-9e7e-11ea-841f-8ab3a202b888.png). Thanks to [ghosthedirewolf](https://github.com/ghosthedirewolf).
#' * **jo_gov_grid1:** Grid layout for Governorates of Jordan. Image reference [here](https://user-images.githubusercontent.com/1275592/82837533-32964c00-9e7e-11ea-841f-8ab3a202b888.png). Thanks to [aledemogr](https://github.com/aledemogr).
#' @usage jo_gov_grid1
#' @rdname grids
#' @md
Expand Down Expand Up @@ -442,7 +442,7 @@ NULL

#' @name us_nh_counties_grid1
#' @description
#' * **us_nh_counties_grid1:** Grid layout for the 10 counties in New Hampshire. Image reference [here](https://en.wikipedia.org/wiki/List_of_counties_in_New_Hampshire#/media/File:New_Hampshire_Locator_Map.PNG). Thanks to [soungl](https://github.com/soungl).
#' * **us_nh_counties_grid1:** Grid layout for the 10 counties in New Hampshire. Image reference [here](https://en.wikipedia.org/wiki/List_of_counties_in_New_Hampshire#/media/File:New_Hampshire_Locator_Map.PNG). Thanks to [ghost](https://github.com/ghost).
#' @usage us_nh_counties_grid1
#' @rdname grids
#' @md
Expand Down Expand Up @@ -650,7 +650,7 @@ NULL

#' @name us_mo_counties_grid1
#' @description
#' * **us_mo_counties_grid1:** Grids for Counties of Missouri, United States Image reference [here](https://private-user-images.githubusercontent.com/1275592/286454845-404f638c-76fe-4ef7-8756-e536ba3b5bfe.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDEyMjQ5MzYsIm5iZiI6MTcwMTIyNDYzNiwicGF0aCI6Ii8xMjc1NTkyLzI4NjQ1NDg0NS00MDRmNjM4Yy03NmZlLTRlZjctODc1Ni1lNTM2YmEzYjViZmUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQUlXTkpZQVg0Q1NWRUg1M0ElMkYyMDIzMTEyOSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyMzExMjlUMDIyMzU2WiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9OGFhZmNmMTljMDMzZjYyZjc4OTRjMjI2NWY3NTUyMjNlMjViZjc5NGRiMjEwZWY4YzllYjhiYzNjNGE4YzZjNCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.dHa3geXvsIVsHuXvMhqT3I6seiiCOqTFIv3AeSF96Dw). Thanks to [Yanqi-Xu](https://github.com/Yanqi-Xu).
#' * **us_mo_counties_grid1:** Grids for Counties of Missouri, United States Image reference [here](https://camo.githubusercontent.com/aecf36302e81059f92f399587faae8c88a81d6711ac468438c8c6ce71c2fd88a/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f322f32342f4d6973736f7572695f4c6f6361746f725f4d61702e504e47). Thanks to [Yanqi-Xu](https://github.com/Yanqi-Xu).
#' @usage us_mo_counties_grid1
#' @rdname grids
#' @md
Expand Down Expand Up @@ -698,7 +698,7 @@ NULL

#' @name ca_quebec_electoral_districts_grid1
#' @description
#' * **ca_quebec_electoral_districts_grid1:** Grid of Electoral Districts of Québec, Canada Image reference [here](https://private-user-images.githubusercontent.com/1275592/286448312-3de49f2f-cc0b-4509-b67a-84329245e4ab.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDEyMjI1NTksIm5iZiI6MTcwMTIyMjI1OSwicGF0aCI6Ii8xMjc1NTkyLzI4NjQ0ODMxMi0zZGU0OWYyZi1jYzBiLTQ1MDktYjY3YS04NDMyOTI0NWU0YWIucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQUlXTkpZQVg0Q1NWRUg1M0ElMkYyMDIzMTEyOSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyMzExMjlUMDE0NDE5WiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YjFjMjg3MTUzYTBkYmFkYWY1ODM5Nzg5YTg0MjIyOWM0MWJjMTJiZmMxZDE1MzVjMTY3MjEyY2EzMjlhNTIzNiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.qGJHg9WguHQZ9Hixk3DS_rmaZZd6eQJNpeJykSMQpbw). Thanks to [jhroy](https://github.com/jhroy).
#' * **ca_quebec_electoral_districts_grid1:** Grid of Electoral Districts of Québec, Canada Image reference [here](https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/2022_Québec_General_Election_Map.svg/1020px-2022_Québec_General_Election_Map.svg.png?20221230235759). Thanks to [jhroy](https://github.com/jhroy).
#' @usage ca_quebec_electoral_districts_grid1
#' @rdname grids
#' @md
Expand Down Expand Up @@ -898,7 +898,7 @@ NULL

#' @name fr_departements_grid1
#' @description
#' * **fr_departements_grid1:** Grid for France's departements, the second levels of administrative boundaries after the regions Image reference [here](https://private-user-images.githubusercontent.com/1275592/286455090-673ae153-092d-4632-ab43-d6be18139a1c.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDEyMjUwMjAsIm5iZiI6MTcwMTIyNDcyMCwicGF0aCI6Ii8xMjc1NTkyLzI4NjQ1NTA5MC02NzNhZTE1My0wOTJkLTQ2MzItYWI0My1kNmJlMTgxMzlhMWMucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQUlXTkpZQVg0Q1NWRUg1M0ElMkYyMDIzMTEyOSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyMzExMjlUMDIyNTIwWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9MzU5MDY3YzhhYjQ2OWIxYjdmYTc4MDI2NjM0ZGRhYTBkNjMwOTEyYWFkZmZlNjY2MzA0MmFhMjMyNDUwZDA3MSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.-V_AHDxiL3yAkk-oJAUYtdLM74O-_3ITjSYzU5-G8lo). Thanks to [tvroylandt](https://github.com/tvroylandt).
#' * **fr_departements_grid1:** Grid for France's departements, the second levels of administrative boundaries after the regions Image reference [here](https://camo.githubusercontent.com/790b9e52bccf40a4934c37ce58ea7726831811284200fc88abebce1ea22304b6/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f7468756d622f622f62312f50726f76696e6365735f6f665f4672616e63655f2532386e756d657265642532392e7376672f3139323070782d50726f76696e6365735f6f665f4672616e63655f2532386e756d657265642532392e7376672e706e67). Thanks to [tvroylandt](https://github.com/tvroylandt).
#' @usage fr_departements_grid1
#' @rdname grids
#' @md
Expand Down Expand Up @@ -962,7 +962,7 @@ NULL

#' @name us_state_without_DC_grid3
#' @description
#' * **us_state_without_DC_grid3:** United States grid without Washington, D.C Image reference [here](https://camo.githubusercontent.com/5038126fbe0052e7d42602dc6856aedc7822f639/687474703a2f2f6269742e6c792f75732d67726964). Thanks to [truongduongvn2](https://github.com/truongduongvn2).
#' * **us_state_without_DC_grid3:** United States grid without Washington, D.C Image reference [here](https://camo.githubusercontent.com/5038126fbe0052e7d42602dc6856aedc7822f639/687474703a2f2f6269742e6c792f75732d67726964). Thanks to [ghost](https://github.com/ghost).
#' @usage us_state_without_DC_grid3
#' @rdname grids
#' @md
Expand Down
2 changes: 1 addition & 1 deletion R/package-geofacet.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ NULL
#' @name state_ranks
#' @docType data
#' @description
#' State rankings in the following categories with the variable upon which ranking is based in parentheses: education (adults over 25 with a bachelor's degree in 2015), employment (March 2017 unemployment rate - Bureau of Labor Statistics), health (obesity rate from 2015 - Centers for Disease Control), insured (uninsured rate in 2015 - US Census), sleep (share of adults that report at least 7 hours of sleep each night from 2016 - Disease Control), wealth (poverty rate 2014/15 - US Census). In each category, the lower the ranking, the more favorable. This data is based on data presented here: \url{https://www.axios.com/an-emoji-built-from-data-for-every-state-2408885674.html}
#' State rankings in the following categories with the variable upon which ranking is based in parentheses: education (adults over 25 with a bachelor's degree in 2015), employment (March 2017 unemployment rate - Bureau of Labor Statistics), health (obesity rate from 2015 - Centers for Disease Control), insured (uninsured rate in 2015 - US Census), sleep (share of adults that report at least 7 hours of sleep each night from 2016 - Disease Control), wealth (poverty rate 2014/15 - US Census). In each category, the lower the ranking, the more favorable. This data is based on data presented here: \url{https://www.axios.com/2017/12/15/the-emoji-states-of-america-1513302318}
#' @usage state_ranks
#' @keywords data
NULL
Expand Down
6 changes: 4 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
## Release summary

**Resubmission:** Fix issue with a broken URL.
New submission

Package was archived on CRAN today

- Updated to be compatible with ggplot2 updates
- Added new grids
- Changed vignette builder to pkgdown (no longer dependent on packagedocs)

## Test environments

* local OS X install, R 4.0.0
* local OS X install, R 4.3.2
* ubuntu 16.04 (on travis-ci), R 4.0.0
* win-builder (devel and release)

Expand Down
6 changes: 3 additions & 3 deletions man-roxygen/ex-facet_geo.R
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ ggplot(election, aes("", pct, fill = candidate)) +
facet_geo(~ state, grid = "us_state_grid2") +
scale_y_continuous(expand = c(0, 0)) +
labs(title = "2016 Election Results",
caption = "Data Source: http://bit.ly/2016votecount",
caption = "Data Source: https://docs.google.com/spreadsheets/d/133Eb4qQmOxNvtesw2hdVns073R68EZx4SfCnP4IGQf8",
x = NULL,
y = "Percentage of Voters") +
theme(axis.title.x = element_blank(),
Expand All @@ -177,7 +177,7 @@ ggplot(election, aes(candidate, pct, fill = candidate)) +
theme_bw() +
coord_flip() +
labs(title = "2016 Election Results",
caption = "Data Source: http://bit.ly/2016votecount",
caption = "Data Source: https://docs.google.com/spreadsheets/d/133Eb4qQmOxNvtesw2hdVns073R68EZx4SfCnP4IGQf8",
x = NULL,
y = "Percentage of Voters") +
theme(strip.text.x = element_text(size = 6))
Expand All @@ -188,7 +188,7 @@ ggplot(election, aes(candidate, votes / 1000000, fill = candidate)) +
facet_geo(~ state, grid = "us_state_grid2") +
coord_flip() +
labs(title = "2016 Election Results",
caption = "Data Source: http://bit.ly/2016votecount",
caption = "Data Source: https://docs.google.com/spreadsheets/d/133Eb4qQmOxNvtesw2hdVns073R68EZx4SfCnP4IGQf8",
x = NULL,
y = "Votes (millions)") +
theme(strip.text.x = element_text(size = 6))
Expand Down
6 changes: 3 additions & 3 deletions man/facet_geo.Rd

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

Loading

0 comments on commit 6da91cf

Please sign in to comment.