#187 wrapping into SWE Elements

eblondel · Oct 31, 2022 · 1ad75dd · 1ad75dd
1 parent bf2e088
commit 1ad75dd
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 21 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -344,6 +344,7 @@ export(geometaLogger)
 export(geometa_coverage)
 export(getClassesInheriting)
 export(getGeometaOption)
+export(getGeometaOptions)
 export(getIANAMimeTypes)
 export(getISOClasses)
 export(getISOCodelist)

diff --git a/R/SWECategory.R b/R/SWECategory.R
@@ -53,13 +53,13 @@ SWECategory <- R6Class("SWECategory",
      #'@description setCodeSpace
      #'@param codeSpace codeSpace
      setCodeSpace = function(codeSpace){
-       self$codeSpace <- codeSpace
+       self$codeSpace <- SWEElement$create(element = "codeSpace", value = codeSpace)
      },
 
      #'@description setConstraint
      #'@param constraint constraint
      setConstraint = function(constraint){
-       self$constraint <- constraint
+       self$constraint <- SWEElement$create(element = "constraint", value = constraint)
      },
 
      #'@description setValue
@@ -68,7 +68,7 @@ SWECategory <- R6Class("SWECategory",
        if(!is.character(value)){
          stop("Value should be character")
        }
-       self$value <- value
+       self$value <- SWEElement$create(element = "value", value = value)
      }
    )                        
 )
diff --git a/R/SWECategoryRange.R b/R/SWECategoryRange.R
@@ -52,13 +52,13 @@ SWECategoryRange <- R6Class("SWECategoryRange",
     #'@description setCodeSpace
     #'@param codeSpace codeSpace
     setCodeSpace = function(codeSpace){
-      self$codeSpace <- codeSpace
+      self$codeSpace <- SWEElement$create(element = "codeSpace", value = codeSpace)
     },
 
     #'@description setConstraint
     #'@param constraint constraint
     setConstraint = function(constraint){
-      self$constraint <- constraint
+      self$constraint <- SWEElement$create(element = "constraint", value = constraint)
     },
 
     #'@description setValue
@@ -78,7 +78,7 @@ SWECategoryRange <- R6Class("SWECategoryRange",
       }else{
         stop("Value should be either a vector or matrix")
       }
-      self$value <- value
+      self$value <- SWEElement$create(element = "value", value = value)
     }
   )                        
 )
diff --git a/R/SWECount.R b/R/SWECount.R
@@ -47,7 +47,7 @@ SWECount <- R6Class("SWECount",
     #'@description setConstraint
     #'@param constraint constraint
     setConstraint = function(constraint){
-      self$constraint <- constraint
+      self$constraint <- SWEElement$create(element = "constraint", value = constraint)
     },
 
     #'@description setValue
@@ -56,7 +56,7 @@ SWECount <- R6Class("SWECount",
       if(!is.integer(value)){
         stop("Value should be integer")
       }
-      self$value <- value
+      self$value <- SWEElement$create(element = "value", value = value)
     }
   )                        
 )
diff --git a/R/SWECountRange.R b/R/SWECountRange.R
@@ -47,7 +47,7 @@ SWECountRange <- R6Class("SWECountRange",
     #'@description setConstraint
     #'@param constraint constraint
     setConstraint = function(constraint){
-      self$constraint <- constraint
+      self$constraint <- SWEElement$create(element = "constraint", value = constraint)
     },
 
     #'@description setValue
@@ -67,7 +67,7 @@ SWECountRange <- R6Class("SWECountRange",
       }else{
         stop("Value should be either a vector or matrix")
       }
-      self$value <- value
+      self$value <- SWEElement$create(element = "value", value = value)
     }
   )                        
 )
diff --git a/R/SWEQuantity.R b/R/SWEQuantity.R
@@ -60,7 +60,7 @@ SWEQuantity <- R6Class("SWEQuantity",
     #'@description setConstraint
     #'@param constraint constraint
     setConstraint = function(constraint){
-      self$constraint <- constraint
+      self$constraint <- SWEElement$new(element = "constraint", value = constraint)
     },
 
     #'@description setValue
@@ -69,7 +69,7 @@ SWEQuantity <- R6Class("SWEQuantity",
       if(!is.numeric(value)){
         stop("Value should be numeric")
       }
-      self$value <- value
+      self$value <- SWEElement$new(element = "value", value = value)
     }
   )                        
 )
diff --git a/R/SWEQuantityRange.R b/R/SWEQuantityRange.R
@@ -60,7 +60,7 @@ SWEQuantityRange <- R6Class("SWEQuantityRange",
      #'@description setConstraint
      #'@param constraint constraint
      setConstraint = function(constraint){
-       self$constraint <- constraint
+       self$constraint <- SWEElement$new(element = "constraint", value = constraint)
      },
 
      #'@description setValue
@@ -80,7 +80,7 @@ SWEQuantityRange <- R6Class("SWEQuantityRange",
        }else{
          stop("Value should be either a vector or matrix")
        }
-       self$value <- value
+       self$value <- SWEElement$new(element = "value", value = value)
      }
    )                        
 )
diff --git a/R/SWEText.R b/R/SWEText.R
@@ -47,13 +47,13 @@ SWEText <- R6Class("SWEText",
     #'@description setConstraint
     #'@param constraint constraint
     setConstraint = function(constraint){
-      self$constraint <- constraint
+      self$constraint <- SWEElement$new(element = "constraint", value = constraint)
     },
 
     #'@description setValue
     #'@param value value
     setValue = function(value){
-      self$value <- value
+      self$value <- SWEElement$new(element = "value", value = value)
     }
   )                        
 )
diff --git a/R/SWETime.R b/R/SWETime.R
@@ -60,7 +60,7 @@ SWETime <- R6Class("SWETime",
      #'@description setConstraint
      #'@param constraint constraint
      setConstraint = function(constraint){
-       self$constraint <- constraint
+       self$constraint <- SWEElement$new(element = "constraint", value = constraint)
      },
 
      #'@description setValue
@@ -69,7 +69,7 @@ SWETime <- R6Class("SWETime",
        if(!is(value,"Date") && !is(value, "POSIXt")){
          stop("Value should be either a Date or POSIX object")
        }
-       self$value <- value
+       self$value <- SWEElement$new(element = "value", value = value)
      }
    )                        
 )
diff --git a/R/SWETimeRange.R b/R/SWETimeRange.R
@@ -61,14 +61,14 @@ SWETimeRange <- R6Class("SWETimeRange",
     #'@description setConstraint
     #'@param constraint constraint
     setConstraint = function(constraint){
-      self$constraint <- constraint
+      self$constraint <- SWEElement$create(element = "constraint", value = constraint)
     },
 
     #'@description setValue
     #'@param start start time
     #'@param end end time
     setValue = function(start, end){
-      self$value <- matrix(list(start, end), nrow = 1, ncol = 2, byrow = TRUE)
+      self$value <- SWEElement$create(element = "value", value = matrix(list(start, end), nrow = 1, ncol = 2, byrow = TRUE))
     }
   )                        
 )
diff --git a/R/geometa_options.R b/R/geometa_options.R
@@ -27,7 +27,8 @@ getGeometaOption <- function(option){
 #'@name getGeometaOptions
 #'@aliases getGeometaOptions
 #'@title getGeometaOptions
-#' @description \code{getGeometaOptions} allows to get options from \pkg{geometa}
+#'@description \code{getGeometaOptions} allows to get options from \pkg{geometa}
+#'@export
 #' 
 #' @usage getGeometaOptions()
 #'