diff --git a/CITATION.cff b/CITATION.cff index de97f00f..8c20d153 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "rostemplate" in publications use:' type: software license: MIT title: 'rostemplate: Plantilla ''pkgdown'' para los paquetes de ''rOpenSpain''' -version: 0.2.0 +version: 0.2.0.9000 abstract: Plantilla privada para uso exclusivo de los paquetes de rOpenSpain. authors: - family-names: Hernangómez diff --git a/DESCRIPTION b/DESCRIPTION index ef462d75..38013230 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rostemplate Title: Plantilla 'pkgdown' para los paquetes de 'rOpenSpain' -Version: 0.2.0 +Version: 0.2.0.9000 Authors@R: person("Diego", "Hernangómez", , "diego.hernangomezherrero@gmail.com", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0001-8457-4658", affiliation = "rOpenSpain")) diff --git a/NAMESPACE b/NAMESPACE index efcfb7cb..914e7deb 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -7,6 +7,7 @@ export(ros_badge_ropenspain) export(ros_build) export(ros_gradient_pal) export(ros_green_pal) +export(ros_metro_madrid_pal) export(ros_qualitative_pal) export(ros_violet_pal) importFrom(grDevices,adjustcolor) diff --git a/NEWS.md b/NEWS.md index 86c55413..de4dc2d2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# rostemplate (development version) + +- Añade una nueva paleta de colores `ros_metro_madrid_pal()`. + # rostemplate 0.2.0 **Importante!** Configuración mínima en `pkgdowm.yaml` ha de ser: diff --git a/R/ros_pals.R b/R/ros_pals.R index db7dac2f..9d239c98 100644 --- a/R/ros_pals.R +++ b/R/ros_pals.R @@ -28,6 +28,8 @@ #' scales::show_col(ros_gradient_pal(9)) #' #' scales::show_col(ros_qualitative_pal(9)) +#' +#' scales::show_col(ros_metro_madrid_pal(9)) ros_green_pal <- function(n = 4, alpha = 0.9, rev = FALSE) { cols <- c("#98c00b", "#e0ecb5") if (rev) { @@ -106,3 +108,33 @@ ros_qualitative_pal <- function(n = 6, alpha = 0.9, rev = FALSE) { return(colors) } + +#' @rdname ros_pals +#' +#' @export +ros_metro_madrid_pal <- function(n = 4, alpha = 0.9, rev = FALSE) { + cols <- c( + "#39b5e6", "#e0292f", "#ffe114", "#b6551a", "#96bf0d", "#9a9999", + "#ff7c00", "#f373b7", "#990d66", "#1b0c80", "#136926", "#999933" + ) + + if (n > length(cols)) { + warning( + "ros_metropal_color() has ", length(cols), + ", less than requested (", n, ")" + ) + n <- length(cols) + } + + colors <- cols[seq_len(n)] + + if (rev) colors <- rev(colors) + + if (alpha == 1) { + return(colors) + } + + colors <- adjustcolor(colors, alpha.f = alpha) + + return(colors) +} diff --git a/codemeta.json b/codemeta.json index 4b00eb24..cc6377ec 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,13 +8,13 @@ "codeRepository": "https://github.com/ropenspain/rostemplate", "issueTracker": "https://github.com/ropenspain/rostemplate/issues", "license": "https://spdx.org/licenses/MIT", - "version": "0.2.0", + "version": "0.2.0.9000", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)", + "runtimePlatform": "R version 4.4.1 (2024-06-14)", "author": [ { "@type": "Person", @@ -146,7 +146,7 @@ "SystemRequirements": null }, "isPartOf": "https://ropenspain.es/", - "fileSize": "221.292KB", + "fileSize": "220.166KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/inst/schemaorg.json b/inst/schemaorg.json index 62be8a7c..a791f9c9 100644 --- a/inst/schemaorg.json +++ b/inst/schemaorg.json @@ -22,8 +22,8 @@ "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)", - "version": "0.2.0" + "runtimePlatform": "R version 4.4.1 (2024-06-14)", + "version": "0.2.0.9000" }, { "type": "SoftwareSourceCode", diff --git a/man/ros_pals.Rd b/man/ros_pals.Rd index 70b0ed7e..29f284a4 100644 --- a/man/ros_pals.Rd +++ b/man/ros_pals.Rd @@ -6,6 +6,7 @@ \alias{ros_violet_pal} \alias{ros_gradient_pal} \alias{ros_qualitative_pal} +\alias{ros_metro_madrid_pal} \title{Paletas de colores de \strong{rOpenSpain}} \usage{ ros_green_pal(n = 4, alpha = 0.9, rev = FALSE) @@ -15,6 +16,8 @@ ros_violet_pal(n = 4, alpha = 0.9, rev = FALSE) ros_gradient_pal(n = 4, alpha = 0.9, rev = FALSE) ros_qualitative_pal(n = 6, alpha = 0.9, rev = FALSE) + +ros_metro_madrid_pal(n = 4, alpha = 0.9, rev = FALSE) } \arguments{ \item{n}{Número de colores} @@ -40,5 +43,7 @@ scales::show_col(ros_violet_pal(9)) scales::show_col(ros_gradient_pal(9)) scales::show_col(ros_qualitative_pal(9)) + +scales::show_col(ros_metro_madrid_pal(9)) } \concept{ros_plot} diff --git a/vignettes/plot-1.png b/vignettes/plot-1.png index 6d7b769c..4c555e38 100644 Binary files a/vignettes/plot-1.png and b/vignettes/plot-1.png differ