separate distance calculation and filtering

inbo · Aug 7, 2024 · cd5d915 · cd5d915
1 parent 80dccd2
commit cd5d915
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/source/targets/data_preparation/R/data_selection.R b/source/targets/data_preparation/R/data_selection.R
@@ -42,8 +42,8 @@ select_within_time_periods <- function(counts_df) {
   return(out_df)
 }
 
-# Select data within circle radius
-select_within_circle_radius <- function(counts_df, radius = 300) {
+# Calculate distance of observation to center point
+calculate_obs_dist <- function(counts_df) {
   require("dplyr")
   require("rlang")
   require("sf")
@@ -58,7 +58,6 @@ select_within_circle_radius <- function(counts_df, radius = 300) {
 
   # Calculate distances between observation locations (geometry)
   # and count locations (geometry.point)
-  # Select data within radius distance
   obs_to_point_distances <- counts_df %>%
     full_join(sampling_points, by = join_by("plotnaam", "regio")) %>%
     mutate(
@@ -68,8 +67,7 @@ select_within_circle_radius <- function(counts_df, radius = 300) {
       calc_distance = round(units::drop_units(.data$calc_distance))
     ) %>%
     select(-c("distance2plot", "geometry.point")) %>%
-    rename(distance2plot = "calc_distance") %>%
-    filter(.data$distance2plot <= radius)
+    rename(distance2plot = "calc_distance")
 
   return(obs_to_point_distances)
 }
diff --git a/source/targets/data_preparation/_targets.R b/source/targets/data_preparation/_targets.R
@@ -94,14 +94,20 @@ list(
     iteration = "list"
   ),
   tar_target(
-    name = select_within_radius,
-    command = select_within_circle_radius(
-      counts_df = select_time_periods,
-      radius = 300
+    name = calculate_obs_distance,
+    command = calculate_obs_dist(
+      counts_df = select_time_periods
     ),
     pattern = map(select_time_periods),
     iteration = "list"
   ),
+  tar_target(
+    name = select_within_radius,
+    command = calculate_obs_distance %>%
+      filter(.data$distance2plot <= 300),
+    pattern = map(calculate_obs_distance),
+    iteration = "list"
+  ),
   tar_target(
     name = select_species_groups,
     command = dplyr::filter(