fix assignment of locations for satellite tables already using acroyn…

…yms (i.e., Value Add)
USEPA · Aug 15, 2023 · 921353a · 921353a
1 parent 3b0edf4
commit 921353a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/R/LoadSatellites.R b/R/LoadSatellites.R
@@ -137,8 +137,9 @@ conformTbStoIOSchema <- function(tbs, sat_spec, model) {
       tbs <- disaggregateSatelliteTable(disagg, tbs, sat_spec)
     }
   }
-  # Change Location if model is a state model
-  if (all(model$specs$ModelRegionAcronyms!="US", model$specs$IODataSource=="stateior")) {
+  # Change Location if model is a state model and not already using acronyms
+  if (all(model$specs$ModelRegionAcronyms!="US", model$specs$IODataSource=="stateior",
+          all(!unique(tbs$Location) %in% model$specs$ModelRegionAcronyms))) {
     # Format location in tbs
     tbs$Location <- formatLocationforStateModels(tbs$Location)
   }