fix: pass ... to openair::cutData() in polarMap() and trajMap()

NEWS.md

@@ -4,6 +4,8 @@
 
 * Vectors greater than length 1 passed to `popup` in the `polarMap()` argument will no longer error when `type = NULL`.
 
+* `...` will successfully pass to `openair::cutData()` in the `polarMap()` and `trajMap()` families of functions.
+
 # openairmaps 0.9.0
 
 ## Breaking changes

R/polar_annulusMap.R

@@ -116,7 +116,7 @@ annulusMap <- function(data,
   }
 
   # cut data
-  data <- quick_cutdata(data = data, type = type)
+  data <- openair::cutData(x = data, type = type, ...)
 
   # deal with popups
   if (length(popup) > 1) {

R/polar_diffMap.R

@@ -153,8 +153,8 @@ diffMap <- function(before,
   }
 
   # cut data
-  before <- quick_cutdata(data = before, type = type)
-  after <- quick_cutdata(data = after, type = type)
+  before <- openair::cutData(x = before, type = type %||% "default", ...)
+  after <- openair::cutData(x = after, type = type %||% "default", ...)
 
   # prep data
   before <-

R/polar_freqMap.R

@@ -149,7 +149,7 @@ freqMap <- function(data,
   }
 
   # cut data
-  data <- quick_cutdata(data = data, type = type)
+  data <- openair::cutData(x = data, type = type %||% "default", ...)
 
   # deal with popups
   if (length(popup) > 1) {

R/polar_percentileMap.R

@@ -123,7 +123,7 @@ percentileMap <- function(data,
   }
 
   # cut data
-  data <- quick_cutdata(data = data, type = type)
+  data <- openair::cutData(x = data, type = type %||% "default", ...)
 
   # deal with popups
   if (length(popup) > 1) {

R/polar_polarMap.R

@@ -370,7 +370,7 @@ polarMap <- function(data,
   }
 
   # cut data
-  data <- quick_cutdata(data = data, type = type)
+  data <- openair::cutData(x = data, type = type %||% "default", ...)
 
   # deal with upper
   if (any(upper == "fixed")) {

R/polar_pollroseMap.R

@@ -92,7 +92,7 @@ pollroseMap <- function(data,
   longitude <- latlon$longitude
 
   # cut data
-  data <- quick_cutdata(data = data, type = type)
+  data <- openair::cutData(x = data, type = type %||% "default", ...)
 
   # deal with popups
   if (length(popup) > 1) {

R/polar_windroseMap.R

@@ -100,7 +100,7 @@ windroseMap <- function(data,
   data$ws_dup <- data$ws
 
   # cut data
-  data <- quick_cutdata(data = data, type = type)
+  data <- openair::cutData(x = data, type = type %||% "default", ...)
 
   # deal with popups
   if (length(popup) > 1) {

R/traj_trajMap.R

@@ -110,6 +110,8 @@
 #'
 #' @param control Deprecated. Please use `type`.
 #'
+#' @inheritDotParams openair::cutData -x -type
+#'
 #' @returns A leaflet object.
 #' @export
 #'
@@ -136,7 +138,8 @@ trajMap <-
            legend.title.autotext = TRUE,
            control.collapsed = FALSE,
            control.position = "topright",
-           control = NULL) {
+           control = NULL,
+           ...) {
     # handle deprecated argument
     if (!is.null(control)) {
       lifecycle::deprecate_soft(
@@ -158,8 +161,8 @@ trajMap <-
     data$datef <- factor(data$date)
 
     # if no "type", get a fake column
-    data <- quick_cutdata(data, type)
     type <- type %||% "default"
+    data <- openair::cutData(x = data, type = type, ...)
 
     # initialise map
     map <- leaflet::leaflet() %>%
@@ -406,7 +409,7 @@ trajMap <-
 #'
 #' @param facet Deprecated. Please use `type`.
 #'
-#' @inheritDotParams ggplot2::coord_sf -xlim -ylim -crs -default_crs
+#' @inheritDotParams openair::cutData -x -type
 #'
 #' @returns a `ggplot2` plot
 #' @export
@@ -462,7 +465,7 @@ trajMapStatic <-
     type <- type %||% facet
 
     # cut data
-    data <- quick_cutdata(data, type)
+    data <- openair::cutData(x = data, type = type, ...)
 
     # make plot
     plt <-
@@ -512,15 +515,13 @@ trajMapStatic <-
           xlim = xlim,
           ylim = ylim,
           default_crs = sf::st_crs(4326),
-          crs = crs,
-          ...
+          crs = crs
         )
     } else {
       coords <-
         ggplot2::coord_sf(
           xlim = xlim,
-          ylim = ylim,
-          ...
+          ylim = ylim
         )
     }
 

R/utils-map.R

@@ -625,14 +625,6 @@ quick_popup <- function(data, popup, latitude, longitude, control) {
   )
 }
 
-#' does 'cutdata'
-#' @param data,type inherited from parent function
-#' @noRd
-quick_cutdata <- function(data, type) {
-  if (is.null(type)) type <- "default"
-  openair::cutData(data, type = type)
-}
-
 #' checks if multiple pollutants have been provided with a "fixed" scale
 #' @noRd
 check_multipoll <- function(vec, pollutant) {