From 2048404103a4bd4ffc12a208dbc6d3ca255ef21c Mon Sep 17 00:00:00 2001 From: Chris Black Date: Tue, 30 Sep 2025 16:30:47 -0700 Subject: [PATCH 1/4] specify all required params for harvest events --- modules/data.land/inst/generate_events.R | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/data.land/inst/generate_events.R b/modules/data.land/inst/generate_events.R index efc1d6ecc66..38470890db8 100755 --- a/modules/data.land/inst/generate_events.R +++ b/modules/data.land/inst/generate_events.R @@ -107,11 +107,14 @@ organic_matter_addition <- ca_fields |> # Harvest harvest <- ca_fields |> dplyr::transmute( - event_type = "harvest", - date = paste0(year, "-10-15"), - site_id = site_id, + event_type = "harvest", + date = paste0(year, "-10-15"), + site_id = site_id, frac_above_removed_0to1 = 0.10, - crop = crop + frac_below_removed_0to1 = 0.0, + frac_above_to_litter_0to1 = 0.0, + frac_below_to_litter_0to1 = 0.0, + crop = crop ) # Pruning (woody) From cf43e529264a9c7dd41e4f787ff4a733bcbc646d Mon Sep 17 00:00:00 2001 From: Chris Black Date: Tue, 30 Sep 2025 16:37:26 -0700 Subject: [PATCH 2/4] package checks complain about json in data/ --- modules/data.land/{data => inst}/events_schema_v0.1.0.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/data.land/{data => inst}/events_schema_v0.1.0.json (100%) diff --git a/modules/data.land/data/events_schema_v0.1.0.json b/modules/data.land/inst/events_schema_v0.1.0.json similarity index 100% rename from modules/data.land/data/events_schema_v0.1.0.json rename to modules/data.land/inst/events_schema_v0.1.0.json From 6d32fe4d57090c13d6a142450f41df809666c959 Mon Sep 17 00:00:00 2001 From: Chris Black Date: Tue, 30 Sep 2025 16:58:17 -0700 Subject: [PATCH 3/4] specify ensembleID as char not int --- modules/data.land/inst/events_schema_v0.1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data.land/inst/events_schema_v0.1.0.json b/modules/data.land/inst/events_schema_v0.1.0.json index a41af5f4928..21a853f8bc3 100644 --- a/modules/data.land/inst/events_schema_v0.1.0.json +++ b/modules/data.land/inst/events_schema_v0.1.0.json @@ -6,7 +6,7 @@ "properties": { "pecan_events_version": { "type": "string", "const": "0.1.0" }, "site_id": { "type": "string", "minLength": 1 }, - "ensemble_id": { "type": ["integer", "null"], "minimum": 0 }, + "ensemble_id": { "type": ["string", "null"], "minLength": 1 }, "geometry_uri": { "type": ["string", "null"], "format": "uri" }, "provenance": { "type": "object", "additionalProperties": true }, "events": { From 5a479d46ee4b5d18dca11277a3fe06135c02ae06 Mon Sep 17 00:00:00 2001 From: Chris Black Date: Tue, 30 Sep 2025 16:58:53 -0700 Subject: [PATCH 4/4] resolve check complaint about deprecation of .data in tidyselect context --- modules/data.land/R/look_up_fertilizer_components.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data.land/R/look_up_fertilizer_components.R b/modules/data.land/R/look_up_fertilizer_components.R index 0f07ac47d21..ed6a7818d50 100644 --- a/modules/data.land/R/look_up_fertilizer_components.R +++ b/modules/data.land/R/look_up_fertilizer_components.R @@ -104,7 +104,7 @@ look_up_fertilizer_components <- function( ) res <- fertilizer_info |> - dplyr::select(.data$name, .data$NO3_N, .data$NH4_N, .data$N_org, .data$C_org) |> + dplyr::select("name", "NO3_N", "NH4_N", "N_org", "C_org") |> dplyr::rename(type = .data$name) |> as.list() return(res)