Merge pull request #20 from Metropolitan-Council/rm-rlang-fix-tests

Remove rlang, fix tests

.github/workflows/R-CMD-check.yaml

@@ -44,3 +44,4 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+          error-on: '"error"'

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: tc.sensors
 Title: Retrieve Loop Detector Data from the MnDOT JSON Feed
-Version: 0.2.1
-Date: 2022-10-26
+Version: 0.2.2
+Date: 2022-10-31
 Authors@R: c(
     person("Metropolitan Council", role = "cph"),
     person("Liz", "Roten", , "[email protected]", role = c("cre", "aut"),
@@ -27,7 +27,6 @@ Imports:
     jsonlite (>= 1.6.1),
     magrittr (>= 1.5),
     purrr (>= 0.3.4),
-    rlang (>= 0.4.6),
     sf (>= 0.9.5),
     tibble (>= 3.0.1),
     tidyr (>= 1.1.0),

NAMESPACE

@@ -44,7 +44,6 @@ importFrom(jsonlite,fromJSON)
 importFrom(magrittr,"%>%")
 importFrom(purrr,map)
 importFrom(purrr,map2)
-importFrom(rlang,.data)
 importFrom(sf,st_as_sf)
 importFrom(sf,st_cast)
 importFrom(sf,st_length)

R/add_weather.R

@@ -124,8 +124,8 @@ add_weather <- function(sensor_data,
 
   weather_sensor_agg <- clean_weather[, as.list(unlist(lapply(.SD, function(x) {
     list(
-      sum = sum(x, na.rm = T),
-      mean = round(mean(x, na.rm = T), 1)
+      sum = sum(x, na.rm = TRUE),
+      mean = round(mean(x, na.rm = TRUE), 1)
     )
   }))),
   by = .(date, interval_bin),

R/aggregate_sensor.R

@@ -120,14 +120,20 @@ aggregate_sensor <- function(sensor_data, config, interval_length,
     if (interpolate_missing == TRUE) {
       sensor_data <- sensor_data[
         , `:=`(volume.rollmean = data.table::shift(
-          data.table::frollapply(volume, 3, mean, align = "center", na.rm = T, hasNA = T)
+          data.table::frollapply(volume, 3, mean,
+            align = "center",
+            na.rm = TRUE, hasNA = TRUE
+          )
         )),
         by = .(sensor)
       ][
         , volume := ifelse(is.na(volume), volume.rollmean, volume)
       ][
         , `:=`(occupancy.rollmean = data.table::shift(
-          data.table::frollapply(occupancy, 3, mean, align = "center", na.rm = T, hasNA = T)
+          data.table::frollapply(occupancy, 3, mean,
+            align = "center", na.rm = TRUE,
+            hasNA = TRUE
+          )
         )),
         by = .(sensor)
       ][
@@ -158,8 +164,8 @@ aggregate_sensor <- function(sensor_data, config, interval_length,
 
     sensor_data_agg <- sensor_data[, as.list(unlist(lapply(.SD, function(x) {
       list(
-        sum = round(mean(x, na.rm = T) * n_rows_expected),
-        mean = mean(x, na.rm = T),
+        sum = round(mean(x, na.rm = TRUE) * n_rows_expected),
+        mean = mean(x, na.rm = TRUE),
         pct.null = round(100 * sum(is.na(x)) / length(x))
       )
     }))),
@@ -186,8 +192,8 @@ aggregate_sensor <- function(sensor_data, config, interval_length,
 
     sensor_data_agg <- sensor_data[, as.list(unlist(lapply(.SD, function(x) {
       list(
-        sum = round(mean(x, na.rm = T) * n_rows_expected),
-        mean = mean(x, na.rm = T),
+        sum = round(mean(x, na.rm = TRUE) * n_rows_expected),
+        mean = mean(x, na.rm = TRUE),
         pct.null = round(100 * sum(is.na(x)) / length(x))
       )
     }))),

R/generate_spatial_lines.R

@@ -77,7 +77,7 @@ generate_spatial_lines <- function(config) {
     dplyr::summarise(do_union = FALSE, .groups = "keep") %>%
     sf::st_cast("LINESTRING") %>%
     sf::st_set_crs(4326) %>%
-    dplyr::mutate(length_miles = as.numeric(sf::st_length(.data$geometry)) * 0.00062137)
+    dplyr::mutate(length_miles = as.numeric(sf::st_length(geometry)) * 0.00062137)
 
   return(lines_sf)
 }

R/pull_configuration.R

@@ -66,7 +66,6 @@
 #' @importFrom purrr map2
 #' @importFrom data.table fwrite
 #' @importFrom utils download.file
-#' @importFrom rlang .data
 #'
 #' @export
 pull_configuration <- function(return_opt = "in_memory", .quiet = TRUE) {
@@ -85,42 +84,42 @@ pull_configuration <- function(return_opt = "in_memory", .quiet = TRUE) {
       xml2::xml_find_all(metro_config, "//detector")
     )
   ) %>%
-    dplyr::mutate(detector_path = .data$value) %>%
-    tidyr::separate(.data$detector_path, into = c(
+    dplyr::mutate(detector_path = value) %>%
+    tidyr::separate(detector_path, into = c(
       "front", "tms_config",
       "device", "rnode",
       "detector"
     ), sep = "/") %>%
-    tidyr::unite(rnode_path, .data$front,
-      .data$tms_config, .data$device,
-      .data$rnode,
+    tidyr::unite(rnode_path, front,
+      tms_config, device,
+      rnode,
       sep = "/"
     ) %>%
-    dplyr::mutate(rnode_path = trimws(.data$rnode_path)) %>%
-    dplyr::mutate(corridor_path = .data$rnode_path) %>%
-    tidyr::separate(.data$corridor_path, into = c(
+    dplyr::mutate(rnode_path = trimws(rnode_path)) %>%
+    dplyr::mutate(corridor_path = rnode_path) %>%
+    tidyr::separate(corridor_path, into = c(
       "front", "tms_config",
       "device", "rnode"
     ), sep = "/") %>%
-    tidyr::unite(corridor_path, .data$front,
-      .data$tms_config, .data$device,
+    tidyr::unite(corridor_path, front,
+      tms_config, device,
       sep = "/"
     ) %>%
-    dplyr::mutate(corridor_path = trimws(.data$corridor_path)) %>%
-    dplyr::select(-.data$name) %>%
-    dplyr::rename(detector_path = .data$value)
+    dplyr::mutate(corridor_path = trimws(corridor_path)) %>%
+    dplyr::select(-name) %>%
+    dplyr::rename(detector_path = value)
 
   # Rnode paths
   rnode_paths <- tibble::enframe(
     xml2::xml_path(xml2::xml_find_all(metro_config, "//r_node"))
   ) %>%
-    dplyr::transmute(rnode_path = .data$value)
+    dplyr::transmute(rnode_path = value)
 
   # Corridor paths
   corridor_paths <- tibble::enframe(
     xml2::xml_path(xml2::xml_find_all(metro_config, "//corridor"))
   ) %>%
-    dplyr::transmute(corridor_path = .data$value)
+    dplyr::transmute(corridor_path = value)
 
   # ------------------
   # ATTRIBUTES (rnodes & detectors)
@@ -178,9 +177,9 @@ pull_configuration <- function(return_opt = "in_memory", .quiet = TRUE) {
 
   config_tidy <- configuration %>%
     dplyr::select(
-      -.data$rnode, -.data$rnode_path,
-      -.data$detector, -.data$detector_path,
-      -.data$corridor_path
+      -rnode, -rnode_path,
+      -detector, -detector_path,
+      -corridor_path
     ) %>%
     dplyr::mutate(date = Sys.Date())
 

R/pull_sensor.R

@@ -60,7 +60,6 @@
 #' @importFrom tibble enframe as_tibble
 #' @importFrom jsonlite fromJSON
 #' @importFrom dplyr bind_cols rename
-#' @importFrom rlang .data
 #' @importFrom cli cli_alert
 #'
 #' @family loop sensor functions
@@ -134,25 +133,26 @@ extension_pull <- function(ext, ext_name, sensor, pull_date, quiet = TRUE) {
 
   df_default <- tibble::as_tibble(NA)
 
-  try(df_default <- tibble::enframe(
-    jsonlite::fromJSON(
-      txt = paste0(
-        "http://data.dot.state.mn.us/trafdat/metro/",
-        pull_year,
-        "/",
-        pull_year,
-        pull_month,
-        pull_day,
-        "/",
-        sensor,
-        ".",
-        ext,
-        "30.json"
+  try(
+    df_default <- tibble::enframe(
+      jsonlite::fromJSON(
+        txt = paste0(
+          "http://data.dot.state.mn.us/trafdat/metro/",
+          pull_year,
+          "/",
+          pull_year,
+          pull_month,
+          pull_day,
+          "/",
+          sensor,
+          ".",
+          ext,
+          "30.json"
+        )
       )
-    )
-  ) %>%
-    dplyr::select(.data$value),
-  silent = quiet
+    ) %>%
+      dplyr::select(value),
+    silent = quiet
   )
   names(df_default) <- ext_name
 

R/pull_sensor_ids.R

@@ -14,7 +14,6 @@
 #' @importFrom dplyr transmute
 #' @importFrom tibble enframe
 #' @importFrom utils download.file
-#' @importFrom rlang .data
 #'
 #' @export
 pull_sensor_ids <- function(.quiet = TRUE) {
@@ -24,5 +23,5 @@ pull_sensor_ids <- function(.quiet = TRUE) {
   metro_config <- xml2::read_xml(gzfile(tmp))
 
   tibble::enframe(trimws(xml2::xml_attr(xml2::xml_find_all(metro_config, "//detector"), "name"))) %>%
-    dplyr::transmute(detector = .data$value)
+    dplyr::transmute(detector = value)
 }

R/scrub.R

@@ -6,7 +6,6 @@
 #' @export
 #'
 scrub_sensor <- function(sensor_data, interval_length = NA) {
-
   sensor_data[!duplicated(sensor_data, by = c("date", "hour", "min", "sensor"), fromLast = TRUE)]
 }
 

data-raw/logo.R

@@ -29,43 +29,54 @@ counties <- tigris::counties(
     "Washington"
   ))
 
-roads_sf <- roads(state = "MN",
-                  year = 2020,
-                  county = c(
-                    "Hennepin",
-                    "Dakota",
-                    "Carver",
-                    "Ramsey",
-                    "Anoka",
-                    "Scott",
-                    "Washington")) %>%
+roads_sf <- roads(
+  state = "MN",
+  year = 2020,
+  county = c(
+    "Hennepin",
+    "Dakota",
+    "Carver",
+    "Ramsey",
+    "Anoka",
+    "Scott",
+    "Washington"
+  )
+) %>%
   sf::st_simplify()
 
 
 map_plot <- ggplot() +
-  geom_sf(data = counties,
-          color = "gray80",
-          fill = "white",
-          lwd = 0) +
-  geom_sf(data = roads_sf %>%
-            filter(RTTYP %in% c(
-              "U",
-              "I",
-              "S"
-            )),
-          mapping = aes(color = MTFCC),
-          size = 0.7,
-          show.legend = F) +
-  scale_color_brewer(direction = -1,
-                     palette = "PuBu") +
+  geom_sf(
+    data = counties,
+    color = "gray80",
+    fill = "white",
+    lwd = 0
+  ) +
+  geom_sf(
+    data = roads_sf %>%
+      filter(RTTYP %in% c(
+        "U",
+        "I",
+        "S"
+      )),
+    mapping = aes(color = MTFCC),
+    size = 0.7,
+    show.legend = F
+  ) +
+  scale_color_brewer(
+    direction = -1,
+    palette = "PuBu"
+  ) +
   theme_void() +
   theme_transparent()
 
 map_plot
-ggsave(plot = map_plot,
-       width = 7.36,
-       height = 6.92,
-       filename = "data-raw/subplot.png", device = "png", dpi = 300)
+ggsave(
+  plot = map_plot,
+  width = 7.36,
+  height = 6.92,
+  filename = "data-raw/subplot.png", device = "png", dpi = 300
+)
 
 print(sticker(
   subplot = "data-raw/subplot.png",

tests/testthat.R

@@ -1,5 +1,4 @@
 library(testthat)
 library(tc.sensors)
 
-set.seed(as.numeric(format(Sys.Date(), "%d")) + 24601)
 test_check("tc.sensors")

tests/testthat/setup.R

@@ -0,0 +1,5 @@
+# setup
+
+yesterday <- as.Date(Sys.Date() - 3)
+
+config <- pull_configuration()

tests/testthat/test-add_distance.R

@@ -1,5 +1,3 @@
-testthat::skip_if_offline()
-
 
 test_that("distance is calculated correctly", {
   config <- as.data.table(pull_configuration())
@@ -24,5 +22,5 @@ test_that("distance is calculated correctly", {
   testthat::expect_true(nrow(th22) == nrow(pulled))
 
   # max distance no greater than 3 miles
-  testthat::expect_true(max(pulled$distance, na.rm = T) < 3)
+  testthat::expect_true(max(pulled$distance, na.rm = TRUE) < 3)
 })

tests/testthat/test-add_weather.R

@@ -1,14 +1,7 @@
 
-testthat::skip_if_offline(host = "metrocouncil.org")
 testthat::skip_on_ci()
 
 test_that("Weather data functions as expected", {
-  config <- pull_configuration()
-
-
-  yesterday <- as.Date(Sys.Date() - 3)
-
-
   config_sample <- dplyr::filter(config, config$detector_abandoned == "f") %>%
     dplyr::sample_n(1)