Merge pull request #165 from Fan-iX/main

Avoid tint color shift caused by the `limits` parameter in `scale_*_hypso_tint_b` and `scale_*_hypso_tint_c`
dieghernan · Jan 23, 2025 · c487144 · c487144
2 parents d0512d9 + d056dfd
commit c487144
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/R/scales_hypso.R b/R/scales_hypso.R
@@ -480,8 +480,8 @@ scale_fill_hypso_tint_c <- function(palette = "etopo1_hypso", ...,
 
   if (is.null(values)) values <- hypsocol$limit
   # Reescale
-  res <- scales::rescale(values)
   if (is.null(limits)) limits <- range(values)
+  res <- scales::rescale(values, from = limits)
 
   ggplot2::scale_fill_gradientn(...,
     colors = hexcol,
@@ -524,8 +524,8 @@ scale_colour_hypso_tint_c <- function(palette = "etopo1_hypso", ...,
 
   if (is.null(values)) values <- hypsocol$limit
   # Reescale
-  res <- scales::rescale(values)
   if (is.null(limits)) limits <- range(values)
+  res <- scales::rescale(values, from = limits)
 
   ggplot2::scale_colour_gradientn(...,
     colors = hexcol,
@@ -569,8 +569,8 @@ scale_fill_hypso_tint_b <- function(palette = "etopo1_hypso", ...,
 
   if (is.null(values)) values <- hypsocol$limit
   # Reescale
-  res <- scales::rescale(values)
   if (is.null(limits)) limits <- range(values)
+  res <- scales::rescale(values, from = limits)
 
   ggplot2::scale_fill_stepsn(
     ...,
@@ -614,8 +614,8 @@ scale_colour_hypso_tint_b <- function(palette = "etopo1_hypso", ...,
 
   if (is.null(values)) values <- hypsocol$limit
   # Reescale
-  res <- scales::rescale(values)
   if (is.null(limits)) limits <- range(values)
+  res <- scales::rescale(values, from = limits)
 
   ggplot2::scale_colour_stepsn(
     ...,