diff --git a/.Rbuildignore b/.Rbuildignore index 0287e7b..0dd4583 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -14,4 +14,3 @@ ^codecov\.yml$ ^LICENSE\.md$ ^\.lintr$ -^CRAN-SUBMISSION$ \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c919404 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +revdep/** linguist-vendored diff --git a/DESCRIPTION b/DESCRIPTION index cb88d24..b80e922 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: usmapdata Title: Mapping Data for 'usmap' Package -Version: 0.1.1.9999 +Version: 0.1.2.9999 Description: Provides a container for data used by the 'usmap' package. The data used by 'usmap' has been extracted into this package so that the file size of the 'usmap' package can be reduced greatly. The data in this diff --git a/NEWS.md b/NEWS.md index a36356a..9caaf75 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,9 @@ -# usmapdata 0.1.1.9999 +# usmapdata 0.1.2.9999 + + + +# usmapdata 0.1.2 +Released Monday, December 11, 2023. * Add `fips_data` function to load raw FIPS data from included csv files. * `fips_data()`, `fips_data("state")`, or `fips_data("states")` load state FIPS codes diff --git a/revdep/README.md b/revdep/README.md index 74ecfe6..e4d8545 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -3,14 +3,14 @@ |field |value | |:--------|:------------------------------------------| |version |R version 4.3.0 (2023-04-21) | -|os |macOS 14.0 | +|os |macOS 14.1.2 | |system |aarch64, darwin20 | |ui |RStudio | |language |(EN) | |collate |en_US.UTF-8 | |ctype |en_US.UTF-8 | |tz |America/New_York | -|date |2023-10-20 | +|date |2023-12-10 | |rstudio |2023.06.0+421 Mountain Hydrangea (desktop) | |pandoc |NA | @@ -18,7 +18,7 @@ |package |old |new |Δ | |:---------|:-----|:----------|:--| -|usmapdata |0.1.0 |0.1.0.9999 |* | +|usmapdata |0.1.1 |0.1.1.9999 |* | # Revdeps diff --git a/revdep/checks.noindex/libraries.csv b/revdep/checks.noindex/libraries.csv index 9533ac2..cf6b707 100644 --- a/revdep/checks.noindex/libraries.csv +++ b/revdep/checks.noindex/libraries.csv @@ -1,2 +1,2 @@ package,old,new,delta -usmapdata,0.1.0,0.1.0.9999,* +usmapdata,0.1.1,0.1.1.9999,* diff --git a/revdep/checks.noindex/usmap/new/libraries.txt b/revdep/checks.noindex/usmap/new/libraries.txt index 4e1b677..569ca00 100644 --- a/revdep/checks.noindex/usmap/new/libraries.txt +++ b/revdep/checks.noindex/usmap/new/libraries.txt @@ -1,28 +1,28 @@ Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmapdata/new -usmapdata (0.1.0.9999) +usmapdata (0.1.1.9999) Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmap askpass (1.2.0) base64enc (0.1-3) -brio (1.1.3) -bslib (0.5.1) +brio (1.1.4) +bslib (0.6.1) cachem (1.0.8) callr (3.7.3) class (7.3-22) classInt (0.4-10) cli (3.6.1) colorspace (2.1-0) -covr (3.6.3) +covr (3.6.4) crayon (1.5.2) -curl (5.1.0) +curl (5.2.0) DBI (1.1.3) -desc (1.4.2) +desc (1.4.3) diffobj (0.3.5) digest (0.6.33) -e1071 (1.7-13) +e1071 (1.7-14) ellipsis (0.3.2) -evaluate (0.22) -fansi (1.0.5) +evaluate (0.23) +fansi (1.0.6) farver (2.1.1) fastmap (1.1.1) fontawesome (0.5.2) @@ -32,33 +32,32 @@ ggrepel (0.9.4) glue (1.6.2) gtable (0.3.4) highr (0.10) -htmltools (0.5.6.1) +htmltools (0.5.7) httr (1.4.7) isoband (0.2.7) jquerylib (0.1.4) -jsonlite (1.8.7) +jsonlite (1.8.8) KernSmooth (2.23-22) -knitr (1.44) +knitr (1.45) labeling (0.4.3) -lattice (0.21-9) +lattice (0.22-5) lazyeval (0.2.2) -lifecycle (1.0.3) +lifecycle (1.0.4) magrittr (2.0.3) MASS (7.3-60) -Matrix (1.6-1.1) +Matrix (1.6-4) memoise (2.0.1) mgcv (1.9-0) mime (0.12) munsell (0.5.0) -nlme (3.1-163) +nlme (3.1-164) openssl (2.1.1) pillar (1.9.0) -pkgbuild (1.4.2) +pkgbuild (1.4.3) pkgconfig (2.0.3) pkgload (1.3.3) praise (1.0.0) -prettyunits (1.2.0) -processx (3.8.2) +processx (3.8.3) proto (1.0.0) proxy (0.4-27) ps (1.7.5) @@ -68,26 +67,26 @@ RColorBrewer (1.1-3) Rcpp (1.0.11) rematch2 (2.1.2) rex (1.2.1) -rlang (1.1.1) +rlang (1.1.2) rmarkdown (2.25) -rprojroot (2.0.3) -s2 (1.1.4) -sass (0.4.7) -scales (1.2.1) +rprojroot (2.0.4) +s2 (1.1.5) +sass (0.4.8) +scales (1.3.0) sf (1.0-14) -sp (2.1-1) -stringi (1.7.12) -stringr (1.5.0) +sp (2.1-2) +stringi (1.8.2) +stringr (1.5.1) sys (3.4.2) -testthat (3.2.0) +testthat (3.2.1) tibble (3.2.1) -tinytex (0.48) -units (0.8-4) -utf8 (1.2.3) -vctrs (0.6.4) +tinytex (0.49) +units (0.8-5) +utf8 (1.2.4) +vctrs (0.6.5) viridisLite (0.4.2) -waldo (0.5.1) -withr (2.5.1) -wk (0.8.0) -xfun (0.40) +waldo (0.5.2) +withr (2.5.2) +wk (0.9.1) +xfun (0.41) yaml (2.3.7) diff --git a/revdep/checks.noindex/usmap/new/usmap.Rcheck/00check.log b/revdep/checks.noindex/usmap/new/usmap.Rcheck/00check.log index a9781ad..c0d7c72 100644 --- a/revdep/checks.noindex/usmap/new/usmap.Rcheck/00check.log +++ b/revdep/checks.noindex/usmap/new/usmap.Rcheck/00check.log @@ -4,11 +4,11 @@ * R was compiled by Apple clang version 14.0.0 (clang-1400.0.29.202) GNU Fortran (GCC) 12.2.0 -* running under: macOS 14.0 +* running under: macOS 14.1.2 * using session charset: UTF-8 * using options ‘--no-manual --no-build-vignettes’ * checking for file ‘usmap/DESCRIPTION’ ... OK -* this is package ‘usmap’ version ‘0.6.2’ +* this is package ‘usmap’ version ‘0.6.3’ * package encoding: UTF-8 * checking package namespace information ... OK * checking package dependencies ... OK diff --git a/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat.Rout b/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat.Rout index 96b1552..24a1f45 100644 --- a/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat.Rout +++ b/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat.Rout @@ -27,4 +27,4 @@ package 'testthat' was built under R version 4.3.1 > > proc.time() user system elapsed - 2.457 0.118 2.573 + 2.024 0.104 2.148 diff --git a/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat/test-plot.R b/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat/test-plot.R index 96cf564..68a4a6f 100644 --- a/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat/test-plot.R +++ b/revdep/checks.noindex/usmap/new/usmap.Rcheck/tests/testthat/test-plot.R @@ -60,78 +60,78 @@ test_that("correct data is used", { test_that("layer parameters are correct", { expect_is(p$layers[[1]], "ggproto") - expect_equal(deparse(p$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(p$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(p$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(p$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(p$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(p$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(p$layers[[1]]$aes_params$colour), "black") expect_equal(as.character(p$layers[[1]]$aes_params$fill), "red") expect_equal(p$layers[[1]]$aes_params$linewidth, 0.4) expect_is(q$layers[[1]], "ggproto") - expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data[[\"x\"]]") - expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data[[\"y\"]]") - expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data[[\"group\"]]") + expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data$group") expect_equal(deparse(q$layers[[1]]$mapping$fill), "~.data[[\"pop_2015\"]]") expect_equal(as.character(q$layers[[1]]$aes_params$colour), "blue") expect_equal(q$layers[[1]]$aes_params$linewidth, 0.4) expect_is(r$layers[[1]], "ggproto") - expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data[[\"x\"]]") - expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data[[\"y\"]]") - expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data[[\"group\"]]") + expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data$group") expect_equal(deparse(r$layers[[1]]$mapping$fill), "~.data[[\"values\"]]") expect_equal(as.character(r$layers[[1]]$aes_params$colour), "black") expect_equal(r$layers[[1]]$aes_params$linewidth, 0.8) expect_is(s$layers[[1]], "ggproto") - expect_equal(deparse(s$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(s$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(s$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(s$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(s$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(s$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(s$layers[[1]]$aes_params$fill), "white") expect_equal(as.character(s$layers[[1]]$aes_params$colour), "black") expect_equal(s$layers[[1]]$aes_params$linewidth, 0.4) expect_is(s$layers[[2]], "ggproto") - expect_equal(deparse(s$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(s$layers[[2]]$mapping$y), "~y") - expect_equal(deparse(s$layers[[2]]$mapping$label), "~abbr") + expect_equal(deparse(s$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(s$layers[[2]]$mapping$y), "~.data$y") + expect_equal(deparse(s$layers[[2]]$mapping$label), "~.data$abbr") expect_equal(as.character(s$layers[[2]]$aes_params$colour), "blue") expect_is(t$layers[[1]], "ggproto") - expect_equal(deparse(t$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(t$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(t$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(t$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(t$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(t$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(t$layers[[1]]$aes_params$fill), "yellow") expect_equal(as.character(t$layers[[1]]$aes_params$colour), "black") expect_equal(t$layers[[1]]$aes_params$linewidth, 0.6) expect_is(t$layers[[2]], "ggproto") - expect_equal(deparse(t$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(t$layers[[2]]$mapping$y), "~y") + expect_equal(deparse(t$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(t$layers[[2]]$mapping$y), "~.data$y") expect_equal(deparse(t$layers[[2]]$mapping$label), - "~sub(\" County\", \"\", county)") + "~sub(\" County\", \"\", .data$county)") expect_is(u$layers[[1]], "ggproto") - expect_equal(deparse(u$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(u$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(u$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(u$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(u$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(u$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(u$layers[[1]]$aes_params$fill), "white") expect_equal(as.character(u$layers[[1]]$aes_params$colour), "black") expect_equal(u$layers[[1]]$aes_params$linewidth, 0.4) expect_is(u$layers[[2]], "ggproto") - expect_equal(deparse(u$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(u$layers[[2]]$mapping$y), "~y") - expect_equal(deparse(u$layers[[2]]$mapping$label), "~abbr") + expect_equal(deparse(u$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(u$layers[[2]]$mapping$y), "~.data$y") + expect_equal(deparse(u$layers[[2]]$mapping$label), "~.data$abbr") expect_is(v$layers[[1]], "ggproto") - expect_equal(deparse(v$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(v$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(v$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(v$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(v$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(v$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(v$layers[[1]]$aes_params$fill), "white") expect_equal(as.character(v$layers[[1]]$aes_params$colour), "black") expect_equal(v$layers[[1]]$aes_params$linewidth, 0.4) expect_is(v$layers[[2]], "ggproto") - expect_equal(deparse(v$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(v$layers[[2]]$mapping$y), "~y") - expect_equal(deparse(v$layers[[2]]$mapping$label), "~abbr") + expect_equal(deparse(v$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(v$layers[[2]]$mapping$y), "~.data$y") + expect_equal(deparse(v$layers[[2]]$mapping$label), "~.data$abbr") }) test_that("warning occurs for unnecessary fill argument", { diff --git a/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.Rout b/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.Rout index a3cfa27..a3c075c 100644 --- a/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.Rout +++ b/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.Rout @@ -471,7 +471,7 @@ detaching ‘package:ggplot2’ > options(digits = 7L) > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n") -Time elapsed: 2.867 0.117 2.998 0 0 +Time elapsed: 2.292 0.102 2.406 0 0 > grDevices::dev.off() null device 1 diff --git a/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.pdf b/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.pdf index b711067..62c7c69 100644 Binary files a/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.pdf and b/revdep/checks.noindex/usmap/new/usmap.Rcheck/usmap-Ex.pdf differ diff --git a/revdep/checks.noindex/usmap/old/libraries.txt b/revdep/checks.noindex/usmap/old/libraries.txt index 08d9b93..ccb35b6 100644 --- a/revdep/checks.noindex/usmap/old/libraries.txt +++ b/revdep/checks.noindex/usmap/old/libraries.txt @@ -1,28 +1,28 @@ Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmapdata/old -usmapdata (0.1.0) +usmapdata (0.1.1) Library: /Users/paolo/Documents/Code/github/usmapdata/revdep/library.noindex/usmap askpass (1.2.0) base64enc (0.1-3) -brio (1.1.3) -bslib (0.5.1) +brio (1.1.4) +bslib (0.6.1) cachem (1.0.8) callr (3.7.3) class (7.3-22) classInt (0.4-10) cli (3.6.1) colorspace (2.1-0) -covr (3.6.3) +covr (3.6.4) crayon (1.5.2) -curl (5.1.0) +curl (5.2.0) DBI (1.1.3) -desc (1.4.2) +desc (1.4.3) diffobj (0.3.5) digest (0.6.33) -e1071 (1.7-13) +e1071 (1.7-14) ellipsis (0.3.2) -evaluate (0.22) -fansi (1.0.5) +evaluate (0.23) +fansi (1.0.6) farver (2.1.1) fastmap (1.1.1) fontawesome (0.5.2) @@ -32,33 +32,32 @@ ggrepel (0.9.4) glue (1.6.2) gtable (0.3.4) highr (0.10) -htmltools (0.5.6.1) +htmltools (0.5.7) httr (1.4.7) isoband (0.2.7) jquerylib (0.1.4) -jsonlite (1.8.7) +jsonlite (1.8.8) KernSmooth (2.23-22) -knitr (1.44) +knitr (1.45) labeling (0.4.3) -lattice (0.21-9) +lattice (0.22-5) lazyeval (0.2.2) -lifecycle (1.0.3) +lifecycle (1.0.4) magrittr (2.0.3) MASS (7.3-60) -Matrix (1.6-1.1) +Matrix (1.6-4) memoise (2.0.1) mgcv (1.9-0) mime (0.12) munsell (0.5.0) -nlme (3.1-163) +nlme (3.1-164) openssl (2.1.1) pillar (1.9.0) -pkgbuild (1.4.2) +pkgbuild (1.4.3) pkgconfig (2.0.3) pkgload (1.3.3) praise (1.0.0) -prettyunits (1.2.0) -processx (3.8.2) +processx (3.8.3) proto (1.0.0) proxy (0.4-27) ps (1.7.5) @@ -68,26 +67,26 @@ RColorBrewer (1.1-3) Rcpp (1.0.11) rematch2 (2.1.2) rex (1.2.1) -rlang (1.1.1) +rlang (1.1.2) rmarkdown (2.25) -rprojroot (2.0.3) -s2 (1.1.4) -sass (0.4.7) -scales (1.2.1) +rprojroot (2.0.4) +s2 (1.1.5) +sass (0.4.8) +scales (1.3.0) sf (1.0-14) -sp (2.1-1) -stringi (1.7.12) -stringr (1.5.0) +sp (2.1-2) +stringi (1.8.2) +stringr (1.5.1) sys (3.4.2) -testthat (3.2.0) +testthat (3.2.1) tibble (3.2.1) -tinytex (0.48) -units (0.8-4) -utf8 (1.2.3) -vctrs (0.6.4) +tinytex (0.49) +units (0.8-5) +utf8 (1.2.4) +vctrs (0.6.5) viridisLite (0.4.2) -waldo (0.5.1) -withr (2.5.1) -wk (0.8.0) -xfun (0.40) +waldo (0.5.2) +withr (2.5.2) +wk (0.9.1) +xfun (0.41) yaml (2.3.7) diff --git a/revdep/checks.noindex/usmap/old/usmap.Rcheck/00check.log b/revdep/checks.noindex/usmap/old/usmap.Rcheck/00check.log index a26edc6..757456f 100644 --- a/revdep/checks.noindex/usmap/old/usmap.Rcheck/00check.log +++ b/revdep/checks.noindex/usmap/old/usmap.Rcheck/00check.log @@ -4,11 +4,11 @@ * R was compiled by Apple clang version 14.0.0 (clang-1400.0.29.202) GNU Fortran (GCC) 12.2.0 -* running under: macOS 14.0 +* running under: macOS 14.1.2 * using session charset: UTF-8 * using options ‘--no-manual --no-build-vignettes’ * checking for file ‘usmap/DESCRIPTION’ ... OK -* this is package ‘usmap’ version ‘0.6.2’ +* this is package ‘usmap’ version ‘0.6.3’ * package encoding: UTF-8 * checking package namespace information ... OK * checking package dependencies ... OK diff --git a/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat.Rout b/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat.Rout index edd4c1b..d4f049a 100644 --- a/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat.Rout +++ b/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat.Rout @@ -27,4 +27,4 @@ package 'testthat' was built under R version 4.3.1 > > proc.time() user system elapsed - 2.463 0.120 2.683 + 2.088 0.114 2.330 diff --git a/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat/test-plot.R b/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat/test-plot.R index 96cf564..68a4a6f 100644 --- a/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat/test-plot.R +++ b/revdep/checks.noindex/usmap/old/usmap.Rcheck/tests/testthat/test-plot.R @@ -60,78 +60,78 @@ test_that("correct data is used", { test_that("layer parameters are correct", { expect_is(p$layers[[1]], "ggproto") - expect_equal(deparse(p$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(p$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(p$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(p$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(p$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(p$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(p$layers[[1]]$aes_params$colour), "black") expect_equal(as.character(p$layers[[1]]$aes_params$fill), "red") expect_equal(p$layers[[1]]$aes_params$linewidth, 0.4) expect_is(q$layers[[1]], "ggproto") - expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data[[\"x\"]]") - expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data[[\"y\"]]") - expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data[[\"group\"]]") + expect_equal(deparse(q$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(q$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(q$layers[[1]]$mapping$group), "~.data$group") expect_equal(deparse(q$layers[[1]]$mapping$fill), "~.data[[\"pop_2015\"]]") expect_equal(as.character(q$layers[[1]]$aes_params$colour), "blue") expect_equal(q$layers[[1]]$aes_params$linewidth, 0.4) expect_is(r$layers[[1]], "ggproto") - expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data[[\"x\"]]") - expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data[[\"y\"]]") - expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data[[\"group\"]]") + expect_equal(deparse(r$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(r$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(r$layers[[1]]$mapping$group), "~.data$group") expect_equal(deparse(r$layers[[1]]$mapping$fill), "~.data[[\"values\"]]") expect_equal(as.character(r$layers[[1]]$aes_params$colour), "black") expect_equal(r$layers[[1]]$aes_params$linewidth, 0.8) expect_is(s$layers[[1]], "ggproto") - expect_equal(deparse(s$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(s$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(s$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(s$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(s$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(s$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(s$layers[[1]]$aes_params$fill), "white") expect_equal(as.character(s$layers[[1]]$aes_params$colour), "black") expect_equal(s$layers[[1]]$aes_params$linewidth, 0.4) expect_is(s$layers[[2]], "ggproto") - expect_equal(deparse(s$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(s$layers[[2]]$mapping$y), "~y") - expect_equal(deparse(s$layers[[2]]$mapping$label), "~abbr") + expect_equal(deparse(s$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(s$layers[[2]]$mapping$y), "~.data$y") + expect_equal(deparse(s$layers[[2]]$mapping$label), "~.data$abbr") expect_equal(as.character(s$layers[[2]]$aes_params$colour), "blue") expect_is(t$layers[[1]], "ggproto") - expect_equal(deparse(t$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(t$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(t$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(t$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(t$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(t$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(t$layers[[1]]$aes_params$fill), "yellow") expect_equal(as.character(t$layers[[1]]$aes_params$colour), "black") expect_equal(t$layers[[1]]$aes_params$linewidth, 0.6) expect_is(t$layers[[2]], "ggproto") - expect_equal(deparse(t$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(t$layers[[2]]$mapping$y), "~y") + expect_equal(deparse(t$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(t$layers[[2]]$mapping$y), "~.data$y") expect_equal(deparse(t$layers[[2]]$mapping$label), - "~sub(\" County\", \"\", county)") + "~sub(\" County\", \"\", .data$county)") expect_is(u$layers[[1]], "ggproto") - expect_equal(deparse(u$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(u$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(u$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(u$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(u$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(u$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(u$layers[[1]]$aes_params$fill), "white") expect_equal(as.character(u$layers[[1]]$aes_params$colour), "black") expect_equal(u$layers[[1]]$aes_params$linewidth, 0.4) expect_is(u$layers[[2]], "ggproto") - expect_equal(deparse(u$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(u$layers[[2]]$mapping$y), "~y") - expect_equal(deparse(u$layers[[2]]$mapping$label), "~abbr") + expect_equal(deparse(u$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(u$layers[[2]]$mapping$y), "~.data$y") + expect_equal(deparse(u$layers[[2]]$mapping$label), "~.data$abbr") expect_is(v$layers[[1]], "ggproto") - expect_equal(deparse(v$layers[[1]]$mapping$x), "~x") - expect_equal(deparse(v$layers[[1]]$mapping$y), "~y") - expect_equal(deparse(v$layers[[1]]$mapping$group), "~group") + expect_equal(deparse(v$layers[[1]]$mapping$x), "~.data$x") + expect_equal(deparse(v$layers[[1]]$mapping$y), "~.data$y") + expect_equal(deparse(v$layers[[1]]$mapping$group), "~.data$group") expect_equal(as.character(v$layers[[1]]$aes_params$fill), "white") expect_equal(as.character(v$layers[[1]]$aes_params$colour), "black") expect_equal(v$layers[[1]]$aes_params$linewidth, 0.4) expect_is(v$layers[[2]], "ggproto") - expect_equal(deparse(v$layers[[2]]$mapping$x), "~x") - expect_equal(deparse(v$layers[[2]]$mapping$y), "~y") - expect_equal(deparse(v$layers[[2]]$mapping$label), "~abbr") + expect_equal(deparse(v$layers[[2]]$mapping$x), "~.data$x") + expect_equal(deparse(v$layers[[2]]$mapping$y), "~.data$y") + expect_equal(deparse(v$layers[[2]]$mapping$label), "~.data$abbr") }) test_that("warning occurs for unnecessary fill argument", { diff --git a/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.Rout b/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.Rout index 36c4e0e..768ea18 100644 --- a/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.Rout +++ b/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.Rout @@ -471,7 +471,7 @@ detaching ‘package:ggplot2’ > options(digits = 7L) > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n") -Time elapsed: 2.899 0.141 4.138 0 0 +Time elapsed: 2.448 0.13 3.567 0 0 > grDevices::dev.off() null device 1 diff --git a/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.pdf b/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.pdf index 752e61e..8ac426c 100644 Binary files a/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.pdf and b/revdep/checks.noindex/usmap/old/usmap.Rcheck/usmap-Ex.pdf differ diff --git a/revdep/checks.noindex/usmap/usmap_0.6.2.tar.gz b/revdep/checks.noindex/usmap/usmap_0.6.2.tar.gz deleted file mode 100644 index 168cc96..0000000 Binary files a/revdep/checks.noindex/usmap/usmap_0.6.2.tar.gz and /dev/null differ diff --git a/revdep/checks.noindex/usmap/usmap_0.6.3.tar.gz b/revdep/checks.noindex/usmap/usmap_0.6.3.tar.gz new file mode 100644 index 0000000..1b9096c Binary files /dev/null and b/revdep/checks.noindex/usmap/usmap_0.6.3.tar.gz differ diff --git a/revdep/data.sqlite b/revdep/data.sqlite index 8ff81d3..6eb85e5 100644 Binary files a/revdep/data.sqlite and b/revdep/data.sqlite differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/DESCRIPTION b/revdep/library.noindex/usmapdata/new/usmapdata/DESCRIPTION index e87186c..e04737c 100644 --- a/revdep/library.noindex/usmapdata/new/usmapdata/DESCRIPTION +++ b/revdep/library.noindex/usmapdata/new/usmapdata/DESCRIPTION @@ -1,6 +1,6 @@ Package: usmapdata Title: Mapping Data for 'usmap' Package -Version: 0.1.0.9999 +Version: 0.1.1.9999 Description: Provides a container for data used by the 'usmap' package. The data used by 'usmap' has been extracted into this package so that the file size of the 'usmap' package can be reduced greatly. The data in this @@ -19,7 +19,7 @@ RoxygenNote: 7.2.3 RemoteType: local RemoteUrl: /Users/paolo/Documents/Code/github/usmapdata NeedsCompilation: no -Packaged: 2023-10-20 18:01:27 UTC; paolo +Packaged: 2023-12-11 03:08:24 UTC; paolo Author: Paolo Di Lorenzo [aut, cre] Maintainer: Paolo Di Lorenzo -Built: R 4.3.0; ; 2023-10-20 18:01:27 UTC; unix +Built: R 4.3.0; ; 2023-12-11 03:08:25 UTC; unix diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/INDEX b/revdep/library.noindex/usmapdata/new/usmapdata/INDEX index 79e0dcf..11e5757 100644 --- a/revdep/library.noindex/usmapdata/new/usmapdata/INDEX +++ b/revdep/library.noindex/usmapdata/new/usmapdata/INDEX @@ -1,3 +1,4 @@ centroid_labels Retrieve centroid labels +fips_data Retrieve state and county FIPS codes us_map Retrieve US map data usmapdata usmapdata: Mapping Data for usmap Package diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/Rd.rds b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/Rd.rds index e49d521..47d0c98 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/Rd.rds and b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/Rd.rds differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/hsearch.rds b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/hsearch.rds index 32eb006..0637b13 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/hsearch.rds and b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/hsearch.rds differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/links.rds b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/links.rds index d72363f..09e2a00 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/links.rds and b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/links.rds differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/nsInfo.rds b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/nsInfo.rds index acbb4b2..6172e50 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/nsInfo.rds and b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/nsInfo.rds differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/package.rds b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/package.rds index 2b6b96b..535a194 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/Meta/package.rds and b/revdep/library.noindex/usmapdata/new/usmapdata/Meta/package.rds differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/NAMESPACE b/revdep/library.noindex/usmapdata/new/usmapdata/NAMESPACE index f9a81a9..40fb9b8 100644 --- a/revdep/library.noindex/usmapdata/new/usmapdata/NAMESPACE +++ b/revdep/library.noindex/usmapdata/new/usmapdata/NAMESPACE @@ -1,4 +1,5 @@ # Generated by roxygen2: do not edit by hand export(centroid_labels) +export(fips_data) export(us_map) diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/NEWS.md b/revdep/library.noindex/usmapdata/new/usmapdata/NEWS.md index 23205f0..a36356a 100644 --- a/revdep/library.noindex/usmapdata/new/usmapdata/NEWS.md +++ b/revdep/library.noindex/usmapdata/new/usmapdata/NEWS.md @@ -1,4 +1,11 @@ -# usmapdata 0.1.0.9999 +# usmapdata 0.1.1.9999 + +* Add `fips_data` function to load raw FIPS data from included csv files. + * `fips_data()`, `fips_data("state")`, or `fips_data("states")` load state FIPS codes + * `fips_data("county")` or `fips_data("counties")` load county FIPS codes + +# usmapdata 0.1.1 +Released Saturday, October 21, 2023. * Update package author email and website. diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdb b/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdb index fd6bb00..2ee29d6 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdb and b/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdb differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdx b/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdx index de5ed6f..108d1ac 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdx and b/revdep/library.noindex/usmapdata/new/usmapdata/R/usmapdata.rdx differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/help/AnIndex b/revdep/library.noindex/usmapdata/new/usmapdata/help/AnIndex index 9253860..8525e98 100644 --- a/revdep/library.noindex/usmapdata/new/usmapdata/help/AnIndex +++ b/revdep/library.noindex/usmapdata/new/usmapdata/help/AnIndex @@ -2,5 +2,6 @@ usmapdata-package usmapdata centroid_labels centroid_labels col_classes_centroids col_classes_centroids col_classes_map col_classes_map +fips_data fips_data usmapdata usmapdata us_map us_map diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/help/aliases.rds b/revdep/library.noindex/usmapdata/new/usmapdata/help/aliases.rds index 71b338f..2df9643 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/help/aliases.rds and b/revdep/library.noindex/usmapdata/new/usmapdata/help/aliases.rds differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/help/paths.rds b/revdep/library.noindex/usmapdata/new/usmapdata/help/paths.rds index 468a432..bc50781 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/help/paths.rds and b/revdep/library.noindex/usmapdata/new/usmapdata/help/paths.rds differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdb b/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdb index a9e1fe7..feb8799 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdb and b/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdb differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdx b/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdx index 39a74d5..96b7e8e 100644 Binary files a/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdx and b/revdep/library.noindex/usmapdata/new/usmapdata/help/usmapdata.rdx differ diff --git a/revdep/library.noindex/usmapdata/new/usmapdata/html/00Index.html b/revdep/library.noindex/usmapdata/new/usmapdata/html/00Index.html index 806a5fb..e65d3a3 100644 --- a/revdep/library.noindex/usmapdata/new/usmapdata/html/00Index.html +++ b/revdep/library.noindex/usmapdata/new/usmapdata/html/00Index.html @@ -12,7 +12,7 @@

Mapping Data for 'usmap' Package
[Up] [Top] -

Documentation for package ‘usmapdata’ version 0.1.0.9999

+

Documentation for package ‘usmapdata’ version 0.1.1.9999