From c7ef6b8dc64514167ebb1cc9aed85745f7e9182d Mon Sep 17 00:00:00 2001
From: juliansgottfried <113379962+juliansgottfried@users.noreply.github.com>
Date: Mon, 18 Aug 2025 00:47:54 -0400
Subject: [PATCH 1/2] re: issue 2

---
 R/spatPomp.R | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/spatPomp.R b/R/spatPomp.R
index e19706f..e403df6 100644
--- a/R/spatPomp.R
+++ b/R/spatPomp.R
@@ -219,7 +219,7 @@ setMethod(
     names(tmp) <- unit_names
     pomp_data <- data |> dplyr::mutate(ui = tmp[match(data[[unitname]], names(tmp))])
     pomp_data <- pomp_data |> tidyr::gather(unit_obsnames, key = 'obsname', value = 'val') |> dplyr::arrange_at(c(timename,'obsname','ui'))
-    pomp_data <- pomp_data |> dplyr::mutate(obsname = paste0(.data$obsname,.data$ui)) |> dplyr::select(-upos) |> dplyr::select(-.data$ui)
+	pomp_data <- pomp_data |> dplyr::mutate(obsname = paste0(.data$obsname,.data$ui)) |> dplyr::select(-all_of(units)) |> dplyr::select(-.data$ui)
     pomp_data <- pomp_data |> tidyr::spread(key = .data$obsname, value = .data$val)
     dat_col_order <- vector(length = U*length(unit_obsnames))
     for(oti in seq_along(unit_obsnames)){
@@ -257,7 +257,7 @@ setMethod(
         names(tmp) <- unit_names
         pomp_covar <- covar |> dplyr::mutate(ui = match(covar[[unitname]], names(tmp)))
         pomp_covar <- pomp_covar |> tidyr::gather(unit_covarnames, key = 'covname', value = 'val')
-        pomp_covar <- pomp_covar |> dplyr::mutate(covname = paste0(.data$covname,.data$ui)) |> dplyr::select(-upos_cov) |> dplyr::select(-.data$ui)
+		pomp_covar <- pomp_covar |> dplyr::mutate(covname = paste0(.data$covname,.data$ui)) |> dplyr::select(-all_of(unitname)) |> dplyr::select(-.data$ui)
         pomp_covar <- pomp_covar |> tidyr::spread(key = .data$covname, value = .data$val)
         for(cn in unit_covarnames){
           for(i in seq_len(U)){

From 65338b50a659c183f11f752c8dbbfdc7232bd571 Mon Sep 17 00:00:00 2001
From: juliansgottfried <113379962+juliansgottfried@users.noreply.github.com>
Date: Mon, 18 Aug 2025 01:01:39 -0400
Subject: [PATCH 2/2] re: issue 2

---
 R/spatPomp.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/spatPomp.R b/R/spatPomp.R
index e403df6..bf9328a 100644
--- a/R/spatPomp.R
+++ b/R/spatPomp.R
@@ -219,7 +219,7 @@ setMethod(
     names(tmp) <- unit_names
     pomp_data <- data |> dplyr::mutate(ui = tmp[match(data[[unitname]], names(tmp))])
     pomp_data <- pomp_data |> tidyr::gather(unit_obsnames, key = 'obsname', value = 'val') |> dplyr::arrange_at(c(timename,'obsname','ui'))
-	pomp_data <- pomp_data |> dplyr::mutate(obsname = paste0(.data$obsname,.data$ui)) |> dplyr::select(-all_of(units)) |> dplyr::select(-.data$ui)
+	pomp_data <- pomp_data |> dplyr::mutate(obsname = paste0(.data$obsname,.data$ui)) |> dplyr::select(-all_of(unitname)) |> dplyr::select(-.data$ui)
     pomp_data <- pomp_data |> tidyr::spread(key = .data$obsname, value = .data$val)
     dat_col_order <- vector(length = U*length(unit_obsnames))
     for(oti in seq_along(unit_obsnames)){