Skip to content

Commit

Permalink
Merge pull request #47 from VerkehrsbetriebeZuerich/bugfix/cran-fix
Browse files Browse the repository at this point in the history
Bugfix/cran fix
  • Loading branch information
yvesmauron authored Jan 19, 2024
2 parents dadfb20 + 16cca35 commit ee4827b
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 28 deletions.
1 change: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ RoxygenNote: 7.2.1
URL: https://github.com/VerkehrsbetriebeZuerich/catmaply,
https://verkehrsbetriebezuerich.github.io/catmaply/
BugReports: https://github.com/VerkehrsbetriebeZuerich/catmaply/issues
Language: en-US
11 changes: 11 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# catmaply 0.9.4 (17 Jan 2024)
* bugfix legend interactive no interactive legend
* updated CI/CD
* improved color range consistency between interactive and non-interactive legend


# catmaply 0.9.3 (01 Jan 2023)
* improved README.md
* #40 x-axis now supports datetime as well as date
* small maintenance updates

# catmaply 0.9.2 (20 Sept 2021)
* added pkgdown
* minor cleaning to fix HTML validation errors
Expand Down
8 changes: 0 additions & 8 deletions R/trace.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#' @param hover_hide boolean indicating if the hover label should be hidden or not; (default: FALSE).
#' @param color_palette a color palette vector.
#' @param categorical_color_range if the resulting heatmap holds categorical field values or continuous values that belong to a category; (default: FALSE).
#' @param categorical_col if categorical_color_range is TRUE, then this column is used to create categories; (default: FALSE).
#' @param category_items distinct/unique items of ordered category items
#' @param legend_items distinct/unique items of ordered legend items
#'
Expand Down Expand Up @@ -221,7 +220,6 @@ add_catmaply_single <- function(
#' @param annotated boolean indicating if annotations should be displayed.
#' @param text_color font color to be used for text; (default: "#444").
#' @param text_size font size to be used for text/annotation. Needs to be a number greater than or equal to 1; (default: 12).
#' @param text_font_color the typeface that will be applied by the web browser for the text/annotation.
#' The web browser will only be able to apply a font if it is available on the system which it operates.
#' Provide multiple font families, separated by commas, to indicate the preference in which to apply fonts if they aren't available on the system;
#' (default: c("Open Sans", "verdana", "arial", "sans-serif")).
Expand Down Expand Up @@ -256,7 +254,6 @@ add_catmaply_single <- function(
#' @param hover_hide boolean indicating if the hover label should be hidden or not; (default: FALSE).
#' @param color_palette a color palette vector.
#' @param categorical_color_range if the resulting heatmap holds categorical field values or continuous values that belong to a category; (default: FALSE).
#' @param categorical_col if categorical_color_range is TRUE, then this column is used to create categories; (default: FALSE).
#' @param category_items distinct/unique items of ordered category items
#' @param legend_items distinct/unique items of ordered legend items
#'
Expand Down Expand Up @@ -419,15 +416,10 @@ add_catmaply_slider <- function(
#'
#' Function to produce catmaply traces.
#'
#' @param fig plotly object
#' @param df data.frame or tibble holding the data.
#' @param annotated boolean indicating if annotations should be displayed.
#' @param text_color font color to be used for text; (default: "#444").
#' @param text_size font size to be used for text/annotation. Needs to be a number greater than or equal to 1; (default: 12).
#' @param text_font_color the typeface that will be applied by the web browser for the text/annotation.
#' The web browser will only be able to apply a font if it is available on the system which it operates.
#' Provide multiple font families, separated by commas, to indicate the preference in which to apply fonts if they aren't available on the system;
#' (default: c("Open Sans", "verdana", "arial", "sans-serif")).
#'
#' @return list
#'
Expand Down
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Test environments
* local R installation, R 4.2.1
* ubuntu 16.04, R 4.1.2
* ubuntu 22.04, R 4.2.1
* win-builder (devel)

## R CMD check results
Expand Down
12 changes: 4 additions & 8 deletions man/add_catmaply_slider.Rd

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

2 changes: 0 additions & 2 deletions man/add_catmaply_traces.Rd

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

2 changes: 0 additions & 2 deletions man/catmaply-package.Rd

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

7 changes: 0 additions & 7 deletions man/catmaply_annotations.Rd

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

0 comments on commit ee4827b

Please sign in to comment.