Merge pull request #30 from chris-prener/release-v1.0.0

Release v1.0.0
chris-prener · May 31, 2022 · 8b45981 · 8b45981
2 parents ccfeeed + 7c53d25
commit 8b45981
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 11 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -13,3 +13,4 @@
 ^index\.Rmd$
 ^index\.md$
 ^LICENSE$
+^CRAN-SUBMISSION$
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -0,0 +1,3 @@
+Version: 1.0.0
+Date: 2022-05-26 18:11:26 UTC
+SHA: 96539cf90837330b7132703c96dd285b84f90f9b
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: biscale
 Type: Package
 Title: Tools and Palettes for Bivariate Thematic Mapping
-Version: 1.0.0.9000
+Version: 1.0.0
 Authors@R: c(
     person("Christopher", "Prener", , "chris.prener@gmail.com", c("aut", "cre"),
     comment = c(ORCID = "0000-0002-4310-9888")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# biscale 1.0.0.9999
+# biscale 1.0.0
 
 * New features
     * `bi_class()` now accepts factors for one or both of the `x` and `y` variables, allowing more flexibility for how breaks are calculated. If you want finer grained control over your categories, calculate them ahead of time and then pass the factors on to `bi_class()`.

diff --git a/R/bi_pal.R b/R/bi_pal.R
@@ -5,9 +5,11 @@
 #'
 #' @details The \code{"Brown"}, \code{"DkBlue"}, \code{"DkCyan"}, and \code{"GrPink"}
 #'     palettes were made by
-#'     \href{http://www.joshuastevens.net/cartography/make-a-bivariate-choropleth-map/}{Joshua Stevens}.
+#'     \href{https://www.joshuastevens.net/cartography/make-a-bivariate-choropleth-map/}{Joshua Stevens}.
 #'     The \code{"DkViolet"} palette was made by
 #'     \href{https://timogrossenbacher.ch/2019/04/bivariate-maps-with-ggplot2-and-sf/}{Timo Grossenbacher and Angelo Zehr}.
+#'     Many of the new palettes were inspired by Branson Fox's earlier work to expand
+#'     \code{biscale}.
 #'
 #' @usage bi_pal(pal, dim = 3, preview = TRUE, flip_axes = FALSE, rotate_pal = FALSE)
 #'

diff --git a/README.Rmd b/README.Rmd
@@ -28,7 +28,7 @@ knitr::opts_chunk$set(
 
 In addition to support for two-by-two, three-by-three, and four-by-four maps, the package also supports a range of methods for calculating breaks for bivariate maps.
 
-## What's New in v1.0.0.9000?
+## What's New in v1.0.0?
 ### New Features
   * `bi_class()` now accepts factors for one or both of the `x` and `y` variables, allowing more flexibility for how breaks are calculated. If you want finer grained control over your categories, calculate them ahead of time and then pass the factors on to `bi_class()`.
   * `bi_pal()`, `bi_legend()`, `bi_scale_fill()`, and `bi_scale_color()` functions all support four-by-four bivariate maps when `dim = 4`. Note that the original five palettes do not support four-by-four mapping, but very close approximations (e.g. `DkBlue2` instead of `DkBlue`) are now provided in their place. The legacy palettes are all still included in the package.

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ In addition to support for two-by-two, three-by-three, and four-by-four
 maps, the package also supports a range of methods for calculating
 breaks for bivariate maps.
 
-## What’s New in v1.0.0.9000?
+## What’s New in v1.0.0?
 
 ### New Features
 

diff --git a/index.md b/index.md
@@ -10,7 +10,7 @@
 
 `biscale` implements a set of functions for bivariate thematic mapping based on the [tutorial](https://timogrossenbacher.ch/2019/04/bivariate-maps-with-ggplot2-and-sf/) written by Timo Grossenbacher and Angelo Zehr as well as a set of bivariate mapping palettes, including Joshua Stevens' [classic color schemes](http://www.joshuastevens.net/cartography/make-a-bivariate-choropleth-map/). In addition to support for two-by-two, three-by-three, and four-by-four maps, the package also supports a range of methods for calculating breaks for bivariate maps.
 
-## What's New in v1.0.0.9000?
+## What's New in v1.0.0?
 ### New Features
   * `bi_class()` now accepts factors for one or both of the `x` and `y` variables, allowing more flexibility for how breaks are calculated. If you want finer grained control over your categories, calculate them ahead of time and then pass the factors on to `bi_class()`.
   * `bi_pal()`, `bi_legend()`, `bi_scale_fill()`, and `bi_scale_color()` functions all support four-by-four bivariate maps when `dim = 4`. Note that the original five palettes do not support four-by-four mapping, but very close approximations (e.g. `DkBlue2` instead of `DkBlue`) are now provided in their place. The legacy palettes are all still included in the package.

diff --git a/man/bi_class.Rd b/man/bi_class.Rd
diff --git a/man/bi_pal.Rd b/man/bi_pal.Rd
diff --git a/man/figures/pal_border.png b/man/figures/pal_border.png
diff --git a/man/figures/pals_legancy.jpeg → man/figures/pals_legacy.jpeg b/man/figures/pals_legancy.jpeg → man/figures/pals_legacy.jpeg
diff --git a/vignettes/bivariate_palettes.Rmd b/vignettes/bivariate_palettes.Rmd
@@ -33,7 +33,7 @@ Most of the newly added palettes not based on legacy designs were adapted from e
 To ensure compatibility with scripts written with older versions of `biscale`, the original five palettes included in the package are still available. They can be used only for two-by-two (`dim = 2`) and three-by-three (`dim = 3`) maps.
 
 ```{r echo=FALSE, out.width='100%'}
-knitr::include_graphics('../man/figures/pals_legancy.jpeg')
+knitr::include_graphics('../man/figures/pals_legacy.jpeg')
 ```
 
 The `"DkViolet"` palette was created by [Timo Grossenbacher and Angelo Zehr](https://timogrossenbacher.ch/2019/04/bivariate-maps-with-ggplot2-and-sf/), and the other four palettes were created by [Joshua Stevens](https://www.joshuastevens.net/cartography/make-a-bivariate-choropleth-map/).