CRAN changes

StatisticsNZ · Jun 7, 2022 · 47f247c · 47f247c
1 parent e6b6397
commit 47f247c
Show file tree

Hide file tree

Showing 24 changed files with 64 additions and 56 deletions.
diff --git a/R/leaf_sf.R b/R/leaf_sf.R
@@ -60,7 +60,7 @@ leaf_sf <- function(data,
 
   #colour
   pal <- pal[1]
-
+  
   #basemap
   if (shiny == FALSE) {
     if(basemap == "light") basemap_name <- "CartoDB.PositronNoLabels"
@@ -86,7 +86,7 @@ leaf_sf <- function(data,
     }
 
     popup_data <- popup_data %>%
-        dplyr::mutate_if(.predicate = is.numeric, .funs = popup_numeric_format)
+      dplyr::mutate_if(.predicate = is.numeric, .funs = popup_numeric_format)
 
     popup <- leafpop::popupTable(popup_data, zcol = 1:ncol(popup_data) - 1, row.numbers = FALSE, feature.id = FALSE)
   }
@@ -336,7 +336,7 @@ leaf_sf_col <- function(data,
   col_var <- rlang::enquo(col_var)
   label_var <- rlang::enquo(label_var)
   if (is.null(rlang::get_expr(label_var))) label_var <- col_var
-
+  
   #na's
   if (col_na_rm == TRUE) {
     data <- data %>% 
@@ -350,7 +350,7 @@ leaf_sf_col <- function(data,
     dplyr::select(!!label_var) %>% 
     dplyr::mutate_if(.predicate = is.numeric, .funs = label_numeric_format) %>% 
     dplyr::pull(!!label_var)
-
+  
   #logical to factor
   if (is.logical(col_var_vctr)) {
     data <- data %>% 

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -120,12 +120,11 @@ reference:
   - '`leaf_stars`'
   - '`leaf_stars_col`'
   - '`mutate_text`'
-  - '`pal_d3_reorder`'
+  - '`pal_d3_mix`'
   - '`pal_na`'
-  - '`pal_viridis_reorder`'
+  - '`pal_viridis_mix`'
   - '`plotly_camera`'
   - '`plotly_col_legend`'
-  - '`shiny_demo`'
   - '`summarise_boxplot_outliers`'
   - '`summarise_boxplot_stats`'
 

diff --git a/docs/articles/colour.html b/docs/articles/colour.html
diff --git a/docs/articles/ggplotly.html b/docs/articles/ggplotly.html
diff --git a/docs/articles/leaflet.html b/docs/articles/leaflet.html
diff --git a/docs/articles/scales.html b/docs/articles/scales.html
diff --git a/docs/articles/shiny.html b/docs/articles/shiny.html
diff --git a/docs/articles/simplevis.html b/docs/articles/simplevis.html
diff --git a/docs/articles/themes.html b/docs/articles/themes.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -9,7 +9,7 @@ articles:
   shiny: shiny.html
   simplevis: simplevis.html
   themes: themes.html
-last_built: 2022-06-04T00:55Z
+last_built: 2022-06-07T01:45Z
 urls:
   reference: https://statisticsnz.github.io/simplevis/reference
   article: https://statisticsnz.github.io/simplevis/articles

diff --git a/docs/reference/gg_point_col_facet-1.png b/docs/reference/gg_point_col_facet-1.png
diff --git a/docs/reference/gg_sf_col_facet-1.png b/docs/reference/gg_sf_col_facet-1.png
diff --git a/docs/reference/gg_violin_facet-1.png b/docs/reference/gg_violin_facet-1.png
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/leaf_basemap.html b/docs/reference/leaf_basemap.html
diff --git a/docs/reference/mutate_text.html b/docs/reference/mutate_text.html
diff --git a/docs/reference/plotly_camera.html b/docs/reference/plotly_camera.html
diff --git a/docs/reference/plotly_col_legend.html b/docs/reference/plotly_col_legend.html
diff --git a/docs/search.json b/docs/search.json
diff --git a/vignettes/leaflet.Rmd b/vignettes/leaflet.Rmd
@@ -23,7 +23,7 @@ set.seed(123456789)
 
 ### Overview
 
-[leaflet](https://rstudio.github.io/leaflet/) is a library that provides beautiful html widget maps. This allow use of basemaps, and therefore the ability to zoom in on features with the context that these provide. simplevis provides wrapper functions to map `sf` and `stars` objects. Arguments in these have been aligned to ggplot terminology to make things simple for the user.
+[{leaflet}](https://rstudio.github.io/leaflet/) is a library that provides beautiful html widget maps. This allow use of basemaps, and therefore the ability to zoom in on features with the context that these provide. {simplevis} provides wrapper functions to map `sf` and `stars` objects. Arguments in these have been aligned to {ggplot2} terminology to make things simple for the user.
 
 For the sf functions:
 

diff --git a/vignettes/scales.Rmd b/vignettes/scales.Rmd
@@ -212,7 +212,7 @@ gg_hbar(plot_data,
 
 For other functions, you will need to reorder the relevant variables as you want.
 
-The `tidytext` package provides a method for reordering within facets.
+The {tidytext} package provides a method for reordering within facets.
 
 ```{r}
 plot_data <- penguins %>%

diff --git a/vignettes/shiny.Rmd b/vignettes/shiny.Rmd
@@ -24,7 +24,7 @@ set.seed(123456789)
 
 ### Working with quoted inputs
 
-In [shiny](https://shiny.rstudio.com/), it is often easier to work with quoted variables. For {ggplot2} wrapper function, wrap the variables in `!!sym`, as shown below. 
+In [{shiny}](https://shiny.rstudio.com/), it is often easier to work with quoted variables. For {ggplot2} wrapper function, wrap the variables in `!!sym`, as shown below. 
 
 ```{r}
 gg_point_col(penguins, 

diff --git a/vignettes/simplevis.Rmd b/vignettes/simplevis.Rmd
@@ -518,7 +518,7 @@ leaf_sf_col(example_point,
             col_var = trend_category)
 ```
 
-Refer to the [{leaflet}](https://StatisticsNZ.github.io/simplevis/articles/{leaflet}.html) article for further information.
+Refer to the [{leaflet}](https://StatisticsNZ.github.io/simplevis/articles/leaflet.html) article for further information.
 
 ### Extending {simplevis} 
 

diff --git a/vignettes/themes.Rmd b/vignettes/themes.Rmd
@@ -22,7 +22,7 @@ library(palmerpenguins)
 set.seed(123456789)
 ```
 
-All plots have the same default undelying `{simplevis}` themes.
+All plots have the same default undelying {simplevis} themes.
 
 ```{r}
 gg_point_col(penguins,