remove option for explicit parsing, not needed

Author: clauswilke

R/sf.R

@@ -383,10 +383,6 @@ scale_type.sfc <- function(x) "identity"
 #' @usage NULL
 #' @format NULL
 CoordSf <- ggproto("CoordSf", CoordCartesian,
-  # parameters that control the parsing of labels plotted in the
-  # N or E directions
-  parse_N_labels = FALSE,
-  parse_E_labels = FALSE,
 
   # Find the first CRS if not already supplied
   setup_params = function(self, data) {
@@ -462,7 +458,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
       }
 
       if (is.character(x_labels)) {
-        needs_parsing[graticule$type == "E"] <- self$parse_E_labels
+        needs_parsing[graticule$type == "E"] <- FALSE
       } else {
         # all labels need to be temporarily stored as character vectors
         x_labels <- as.character(x_labels)
@@ -490,7 +486,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
       }
 
       if (is.character(y_labels)) {
-        needs_parsing[graticule$type == "N"] <- self$parse_N_labels
+        needs_parsing[graticule$type == "N"] <- FALSE
       } else {
         # all labels need to be temporarily stored as character vectors
         y_labels <- as.character(y_labels)
@@ -636,29 +632,18 @@ sf_rescale01_x <- function(x, range) {
 #' @param datum CRS that provides datum to use when generating graticules
 #' @param ndiscr number of segments to use for discretising graticule lines;
 #'   try increasing this when graticules look unexpected
-#' @param parse_N_labels If `TRUE`, labels indicating latitude (the degree to which
-#'   we are north or south) are parsed into R expressions before plotting. These
-#'   correspond to y-axis tick labels in a simple latitude-longitude plot.
-#'   Default is `FALSE`.
-#' @param parse_E_labels If `TRUE`, labels indicating longitude (the degree to which
-#'   we are east or west) are parsed into R expressions before plotting. These
-#'   correspond to x-axis tick labels in a simple latitude-longitude plot.
-#'   Default is `FALSE`.
 #' @inheritParams coord_cartesian
 #' @export
 #' @rdname ggsf
 coord_sf <- function(xlim = NULL, ylim = NULL, expand = TRUE,
                      crs = NULL, datum = sf::st_crs(4326), ndiscr = 100,
-                     parse_N_labels = FALSE, parse_E_labels = FALSE,
                      default = FALSE) {
   ggproto(NULL, CoordSf,
     limits = list(x = xlim, y = ylim),
     datum = datum,
     crs = crs,
     ndiscr = ndiscr,
     expand = expand,
-    parse_N_labels = parse_N_labels,
-    parse_E_labels = parse_E_labels,
     default = default
   )
 }

man/ggsf.Rd

@@ -84,52 +84,27 @@ test_that("axis labels can be set manually", {
     parsed
   )
 
-  # parsing via coord_sf()
+  # reverse x and y from previous test
   b <- ggplot_build(
     plot +
-      scale_x_continuous(
-        breaks = c(1000, 2000, 3000),
-        labels = c("10^3", "2 %*% 10^3", "3 %*% 10^3")
-      ) +
       scale_y_continuous(
-        breaks = c(1000, 1500, 2000),
-        labels = c("10^3", "1.5 %*% 10^3", "2 %*% 10^3")
-      ) +
-      coord_sf(parse_E_labels = TRUE, parse_N_labels = FALSE)
-  )
-  graticule <- b$layout$panel_params[[1]]$graticule
-  parsed <- vector("list", 3)
-  parsed[1:3] <- parse(text = c("10^3", "2 %*% 10^3", "3 %*% 10^3"))
-  expect_identical(
-    graticule[graticule$type == "E", ]$degree_label,
-    parsed
-  )
-  expect_identical(
-    graticule[graticule$type == "N", ]$degree_label,
-    as.list(c("10^3", "1.5 %*% 10^3", "2 %*% 10^3"))
-  )
-
-  b <- ggplot_build(
-    plot +
-      scale_x_continuous(
         breaks = c(1000, 2000, 3000),
-        labels = c("10^3", "2 %*% 10^3", "3 %*% 10^3")
+        labels = c("A", "B", "C")
       ) +
-      scale_y_continuous(
+      scale_x_continuous(
         breaks = c(1000, 1500, 2000),
-        labels = c("10^3", "1.5 %*% 10^3", "2 %*% 10^3")
-      ) +
-      coord_sf(parse_E_labels = FALSE, parse_N_labels = TRUE)
+        labels = parse(text = c("10^3", "1.5 %*% 10^3", "2 %*% 10^3"))
+      )
   )
   graticule <- b$layout$panel_params[[1]]$graticule
   expect_identical(
-    graticule[graticule$type == "E", ]$degree_label,
-    as.list(c("10^3", "2 %*% 10^3", "3 %*% 10^3"))
+    graticule[graticule$type == "N", ]$degree_label,
+    as.list(c("A", "B", "C"))
   )
   parsed <- vector("list", 3)
   parsed[1:3] <- parse(text = c("10^3", "1.5 %*% 10^3", "2 %*% 10^3"))
   expect_identical(
-    graticule[graticule$type == "N", ]$degree_label,
+    graticule[graticule$type == "E", ]$degree_label,
     parsed
   )