diff --git a/.travis.yml b/.travis.yml index f5c2d9a..7803090 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ sudo: required apt_packages: - binutils - - libproj-dev - gdal-bin - libgdal1-dev - netcdf-bin diff --git a/README.Rmd b/README.Rmd index cafa514..3ffba84 100644 --- a/README.Rmd +++ b/README.Rmd @@ -53,10 +53,10 @@ us <- usa_composite() dplyr::glimpse(us@data) -plot(us) +plot(us, lwd=0.25) us <- usa_composite("laea") -plot(us) +plot(us, lwd=0.25) us <- usa_composite() us_map <- fortify(us, region="name") @@ -87,17 +87,18 @@ gg + color="white", size=0.1) + coord_proj(us_laea_proj) + scale_fill_viridis(name="2014 Populaton Estimates", labels=comma) + - theme(legend.position="right") + theme(legend.position="top", + legend.key.width=unit(3, "lines")) us <- counties_composite() dplyr::glimpse(us@data) -plot(us) +plot(us, lwd=0.25) us <- counties_composite("laea") -plot(us) +plot(us, lwd=0.25) us <- counties_composite() us_map <- fortify(us, region="fips") diff --git a/README.md b/README.md index d01b699..319e9db 100644 --- a/README.md +++ b/README.md @@ -52,28 +52,30 @@ dplyr::glimpse(us@data) ``` ## Observations: 51 - ## Variables: 11 - ## $ geo_id (chr) "0400000US04", "0400000US05", "0400000US06", "0400000US08", "0400000US09", "0400000US11... - ## $ fips_state (chr) "04", "05", "06", "08", "09", "11", "13", "17", "18", "22", "27", "28", "30", "35", "38... - ## $ name (chr) "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "District of Columbia",... - ## $ iso_3166_2 (chr) "AZ", "AR", "CA", "CO", "CT", "DC", "GA", "IL", "IN", "LA", "MN", "MS", "MT", "NM", "ND... - ## $ census (dbl) 6392017, 2915918, 37253956, 5029196, 3574097, 601723, 9687653, 12830632, 6483802, 45333... - ## $ pop_estimataes_base (dbl) 6392310, 2915958, 37254503, 5029324, 3574096, 601767, 9688681, 12831587, 6484192, 45334... - ## $ pop_2010 (dbl) 6411999, 2922297, 37336011, 5048575, 3579345, 605210, 9714464, 12840097, 6490308, 45455... - ## $ pop_2011 (dbl) 6472867, 2938430, 37701901, 5119661, 3590537, 620427, 9813201, 12858725, 6516560, 45759... - ## $ pop_2012 (dbl) 6556236, 2949300, 38062780, 5191709, 3594362, 635040, 9919000, 12873763, 6537632, 46047... - ## $ pop_2013 (dbl) 6634997, 2958765, 38431393, 5272086, 3599341, 649111, 9994759, 12890552, 6570713, 46292... - ## $ pop_2014 (dbl) 6731484, 2966369, 38802500, 5355866, 3596677, 658893, 10097343, 12880580, 6596855, 4649... + ## Variables: 13 + ## $ geo_id "0400000US04", "0400000US05", "0400000US06", "0400000US08", "0400000US09", "0400000US11... + ## $ fips_state "04", "05", "06", "08", "09", "11", "13", "17", "18", "22", "27", "28", "30", "35", "38... + ## $ name "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "District of Columbia",... + ## $ lsad "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",... + ## $ census_area 113594.084, 52035.477, 155779.220, 103641.888, 4842.355, 61.048, 57513.485, 55518.930, ... + ## $ iso_3166_2 "AZ", "AR", "CA", "CO", "CT", "DC", "GA", "IL", "IN", "LA", "MN", "MS", "MT", "NM", "ND... + ## $ census 6392017, 2915918, 37253956, 5029196, 3574097, 601723, 9687653, 12830632, 6483802, 45333... + ## $ pop_estimataes_base 6392310, 2915958, 37254503, 5029324, 3574096, 601767, 9688681, 12831587, 6484192, 45334... + ## $ pop_2010 6411999, 2922297, 37336011, 5048575, 3579345, 605210, 9714464, 12840097, 6490308, 45455... + ## $ pop_2011 6472867, 2938430, 37701901, 5119661, 3590537, 620427, 9813201, 12858725, 6516560, 45759... + ## $ pop_2012 6556236, 2949300, 38062780, 5191709, 3594362, 635040, 9919000, 12873763, 6537632, 46047... + ## $ pop_2013 6634997, 2958765, 38431393, 5272086, 3599341, 649111, 9994759, 12890552, 6570713, 46292... + ## $ pop_2014 6731484, 2966369, 38802500, 5355866, 3596677, 658893, 10097343, 12880580, 6596855, 4649... ``` r -plot(us) +plot(us, lwd=0.25) ``` ``` r us <- usa_composite("laea") -plot(us) +plot(us, lwd=0.25) ``` @@ -86,8 +88,17 @@ gg <- ggplot() gg <- gg + geom_map(data=us_map, map=us_map, aes(x=long, y=lat, map_id=id), color="#2b2b2b", size=0.1, fill=NA) +``` + + ## Warning: Ignoring unknown aesthetics: x, y + +``` r gg <- gg + theme_map() +``` + + ## Warning: `panel.margin` is deprecated. Please use `panel.spacing` property instead +``` r gg + coord_map() ``` @@ -136,7 +147,8 @@ gg + color="white", size=0.1) + coord_proj(us_laea_proj) + scale_fill_viridis(name="2014 Populaton Estimates", labels=comma) + - theme(legend.position="right") + theme(legend.position="top", + legend.key.width=unit(3, "lines")) ``` @@ -148,26 +160,25 @@ dplyr::glimpse(us@data) ``` ## Observations: 3,143 - ## Variables: 9 - ## $ fips (chr) "01001", "01009", "01017", "01021", "01033", "01045", "01051", "01065", "01079", "01083", "0109... - ## $ state_fips (chr) "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "05", "05", "06",... - ## $ county_fips (chr) "001", "009", "017", "021", "033", "045", "051", "065", "079", "083", "099", "107", "121", "141... - ## $ name (chr) "Autauga", "Blount", "Chambers", "Chilton", "Colbert", "Dale", "Elmore", "Hale", "Lawrence", "L... - ## $ lsad (chr) "County", "County", "County", "County", "County", "County", "County", "County", "County", "Coun... - ## $ census_area (dbl) 594.436, 644.776, 596.531, 692.854, 592.619, 561.150, 618.485, 643.943, 690.678, 559.936, 1025.... - ## $ state (chr) "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabam... - ## $ iso_3166_2 (chr) "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AR", "AR", "CA",... - ## $ population (dbl) 54590, 57466, 34228, 43611, 54451, 50129, 79330, 15750, 34148, 83313, 22993, 19646, 82194, 1722... + ## Variables: 8 + ## $ fips "01001", "01009", "01017", "01021", "01033", "01045", "01051", "01065", "01079", "01083", "0109... + ## $ state_fips "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "01", "05", "05", "06",... + ## $ county_fips "001", "009", "017", "021", "033", "045", "051", "065", "079", "083", "099", "107", "121", "141... + ## $ name "Autauga", "Blount", "Chambers", "Chilton", "Colbert", "Dale", "Elmore", "Hale", "Lawrence", "L... + ## $ lsad "County", "County", "County", "County", "County", "County", "County", "County", "County", "Coun... + ## $ census_area 594.436, 644.776, 596.531, 692.854, 592.619, 561.150, 618.485, 643.943, 690.678, 559.936, 1025.... + ## $ state "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabama", "Alabam... + ## $ iso_3166_2 "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AL", "AR", "AR", "CA",... ``` r -plot(us) +plot(us, lwd=0.25) ``` ``` r us <- counties_composite("laea") -plot(us) +plot(us, lwd=0.25) ``` @@ -180,8 +191,17 @@ gg <- ggplot() gg <- gg + geom_map(data=us_map, map=us_map, aes(x=long, y=lat, map_id=id), color="#2b2b2b", size=0.1, fill=NA) +``` + + ## Warning: Ignoring unknown aesthetics: x, y + +``` r gg <- gg + theme_map() +``` + + ## Warning: `panel.margin` is deprecated. Please use `panel.spacing` property instead +``` r gg + coord_map() ``` @@ -232,7 +252,7 @@ library(testthat) date() ``` - ## [1] "Tue Mar 29 15:08:54 2016" + ## [1] "Mon Dec 19 16:02:00 2016" ``` r test_dir("tests/") @@ -240,3 +260,6 @@ test_dir("tests/") ## testthat results ======================================================================================================== ## OK: 6 SKIPPED: 0 FAILED: 0 + ## + ## DONE =================================================================================================================== + ## You rock! diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-1.png b/README_files/figure-markdown_github/unnamed-chunk-3-1.png index 1237e8f..9530497 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-1.png and b/README_files/figure-markdown_github/unnamed-chunk-3-1.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-10.png b/README_files/figure-markdown_github/unnamed-chunk-3-10.png index 63aa380..d583d16 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-10.png and b/README_files/figure-markdown_github/unnamed-chunk-3-10.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-11.png b/README_files/figure-markdown_github/unnamed-chunk-3-11.png index d935cce..8ae734c 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-11.png and b/README_files/figure-markdown_github/unnamed-chunk-3-11.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-12.png b/README_files/figure-markdown_github/unnamed-chunk-3-12.png index 4ca9c84..3312eea 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-12.png and b/README_files/figure-markdown_github/unnamed-chunk-3-12.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-13.png b/README_files/figure-markdown_github/unnamed-chunk-3-13.png index 346e8f0..78e1c07 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-13.png and b/README_files/figure-markdown_github/unnamed-chunk-3-13.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-14.png b/README_files/figure-markdown_github/unnamed-chunk-3-14.png index e618572..97b24d0 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-14.png and b/README_files/figure-markdown_github/unnamed-chunk-3-14.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-15.png b/README_files/figure-markdown_github/unnamed-chunk-3-15.png index 60e4b6a..baa33c8 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-15.png and b/README_files/figure-markdown_github/unnamed-chunk-3-15.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-16.png b/README_files/figure-markdown_github/unnamed-chunk-3-16.png index 61fe772..0ec63d9 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-16.png and b/README_files/figure-markdown_github/unnamed-chunk-3-16.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-17.png b/README_files/figure-markdown_github/unnamed-chunk-3-17.png index d519e15..7b22ce8 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-17.png and b/README_files/figure-markdown_github/unnamed-chunk-3-17.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-18.png b/README_files/figure-markdown_github/unnamed-chunk-3-18.png index 7749d25..4286a72 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-18.png and b/README_files/figure-markdown_github/unnamed-chunk-3-18.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-19.png b/README_files/figure-markdown_github/unnamed-chunk-3-19.png index 7679ac8..08c7c05 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-19.png and b/README_files/figure-markdown_github/unnamed-chunk-3-19.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-2.png b/README_files/figure-markdown_github/unnamed-chunk-3-2.png index b1155a5..ebcb5cc 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-2.png and b/README_files/figure-markdown_github/unnamed-chunk-3-2.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-3.png b/README_files/figure-markdown_github/unnamed-chunk-3-3.png index 0faa94b..00097b6 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-3.png and b/README_files/figure-markdown_github/unnamed-chunk-3-3.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-4.png b/README_files/figure-markdown_github/unnamed-chunk-3-4.png index 403a8af..b8c8866 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-4.png and b/README_files/figure-markdown_github/unnamed-chunk-3-4.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-5.png b/README_files/figure-markdown_github/unnamed-chunk-3-5.png index e875d4f..d967dde 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-5.png and b/README_files/figure-markdown_github/unnamed-chunk-3-5.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-6.png b/README_files/figure-markdown_github/unnamed-chunk-3-6.png index c8dd6f0..c232566 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-6.png and b/README_files/figure-markdown_github/unnamed-chunk-3-6.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-7.png b/README_files/figure-markdown_github/unnamed-chunk-3-7.png index 5f11cbf..7748eb0 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-7.png and b/README_files/figure-markdown_github/unnamed-chunk-3-7.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-8.png b/README_files/figure-markdown_github/unnamed-chunk-3-8.png index 45621b9..b885acd 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-8.png and b/README_files/figure-markdown_github/unnamed-chunk-3-8.png differ diff --git a/README_files/figure-markdown_github/unnamed-chunk-3-9.png b/README_files/figure-markdown_github/unnamed-chunk-3-9.png index c08ff2d..074d8b5 100644 Binary files a/README_files/figure-markdown_github/unnamed-chunk-3-9.png and b/README_files/figure-markdown_github/unnamed-chunk-3-9.png differ diff --git a/albersusa.Rproj b/albersusa.Rproj index 446d9e1..2222d51 100644 --- a/albersusa.Rproj +++ b/albersusa.Rproj @@ -1,8 +1,8 @@ Version: 1.0 -RestoreWorkspace: Default -SaveWorkspace: Default -AlwaysSaveHistory: Default +RestoreWorkspace: No +SaveWorkspace: No +AlwaysSaveHistory: No EnableCodeIndexing: Yes UseSpacesForTab: Yes diff --git a/inst/extdata/counties.rda b/inst/extdata/counties.rda index 93ca239..ecf8f26 100644 Binary files a/inst/extdata/counties.rda and b/inst/extdata/counties.rda differ diff --git a/inst/extdata/states.rda b/inst/extdata/states.rda index 27a1cdd..37e8aab 100644 Binary files a/inst/extdata/states.rda and b/inst/extdata/states.rda differ diff --git a/tests/testthat/test-albersusa.R b/tests/testthat/test-albersusa.R index 450f1a6..e9ed3f0 100644 --- a/tests/testthat/test-albersusa.R +++ b/tests/testthat/test-albersusa.R @@ -7,8 +7,8 @@ test_that("we can do something", { expect_that(us, is_a("SpatialPolygonsDataFrame")) expect_that(cty, is_a("SpatialPolygonsDataFrame")) - expect_that(dim(us), equals(c(51, 11))) - expect_that(dim(cty), equals(c(3143, 9))) + expect_that(dim(us), equals(c(51, 13))) + expect_that(dim(cty), equals(c(3143, 8))) expect_that(length(us@polygons), equals(51)) expect_that(length(cty@polygons), equals(3143))