Merge pull request #385 from StoXProject/develop

Develop

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: RstoxBase
-Version: 2.1.1
-Date: 2024-12-19
+Version: 2.1.2-9001
+Date: 2025-01-09
 Title: Base StoX Functions
 Authors@R: c(
   person(given = "Arne Johannes", 

NEWS.md

@@ -1,3 +1,6 @@
+# RstoxBase v2.1.2-9001  (2025-01-10)
+* Changed the behavior of DefinitionMethod = "Manual" from deleting all strata, to passing the StratumPolygon as output unchanged. In addition, a new option is added, "DeleteAllStrata", which replaces the old behavior of DefinitionMethod = "Manual".
+
 # RstoxBase v2.1.1  (2024-12-19)
 * Final release for StoX 4.1.1.
 * Updated documentation of the AcousticPSU process data.

R/Spatial.R

@@ -118,7 +118,7 @@ readStoxMultipolygonWKTFromFile <- function(FilePath) {
 #'
 DefineStratumPolygon <- function(
     processData, UseProcessData = FALSE, 
-    DefinitionMethod = c("Manual", "ResourceFile"), 
+    DefinitionMethod = c("Manual", "DeleteAllStrata", "ResourceFile"), 
     FileName = character(), 
     StratumNameLabel = character(), 
     SimplifyStratumPolygon = FALSE, 
@@ -137,9 +137,18 @@ DefineStratumPolygon <- function(
     if(grepl("ResourceFile", DefinitionMethod, ignore.case = TRUE)) {
         StratumPolygon <- readStratumPolygonFromFile(FileName, StratumNameLabel = StratumNameLabel)
     }
-    else if(grepl("Manual", DefinitionMethod, ignore.case = TRUE)) {
+    else if(grepl("DeleteAllStrata", DefinitionMethod, ignore.case = TRUE)) {
         StratumPolygon <- getRstoxBaseDefinitions("emptyStratumPolygon")
     }
+    # Manual implies to use the existing process data, or create an empty set if not present:
+    else if(grepl("Manual", DefinitionMethod, ignore.case = TRUE)) {
+        if(length(processData)) {
+            StratumPolygon <- processData
+        }
+        else {
+            StratumPolygon <- getRstoxBaseDefinitions("emptyStratumPolygon")
+        }
+    }
     else {
         stop("Inavlid DefinitionMethod")
     }