changed relativeage to rockage

R/01_classDefinitions.R

@@ -398,7 +398,7 @@ setClass("speleothem",
                         dripheight = "numeric",
                         monitoring = "logical",
                         geology = "character",
-                        relativeage = "character",
+                        rockage = "character",
                         speleothemtype = "character",
                         dripheightunits = "character",
                         entitycovertype = "character",
@@ -417,7 +417,7 @@ setClass("speleothem",
                    dripheight = NA_integer_,
                    monitoring = FALSE,
                    geology = NA_character_,
-                   relativeage = NA_character_,
+                   rockage = NA_character_,
                    speleothemtype = NA_character_,
                    dripheightunits = NA_character_,
                    entitycovertype = NA_character_,

R/build_speleothem.R

@@ -17,7 +17,7 @@ build_speleothem <- function(...) {
                   dripheightunits = use_na(args$dripheightunits, "char"),
                   monitoring = use_na(args$monitoring, "logic"),
                   geology = use_na(args$geology, "char"),
-                  relativeage = use_na(args$relativeage, "char"),
+                  rockage = use_na(args$rockage, "char"),
                   speleothemtype = use_na(args$speleothemtype, "char"),
                   entitycovertype = use_na(args$entitycovertype, "char"),
                   entrancedistance = use_na(args$entrancedistance, "int"),

R/parse_speleothem.R

@@ -23,7 +23,7 @@ parse_speleothem <- function(data) {
            dripheight = use_na(x$dripheight, "int"),
            monitoring = use_na(x$monitoring, "bool"),
            geology = use_na(x$geology, "char"),
-           relativeage = use_na(x$rockage, "char"),
+           rockage = use_na(x$rockage, "char"),
            speleothemtype = use_na(x$speleothemtype, "char"),
            dripheightunits = use_na(x$dripheightunits, "char"),
            entitycovertype = use_na(x$entitycovertype, "char"),

R/set_speleothem.R

@@ -11,7 +11,7 @@
 #' @param dripheight drip height
 #' @param monitoring Is the speleothem being monitored? TRUE/FALSE
 #' @param geology rock type of the speleothem
-#' @param relativeage relative age of the speleothem
+#' @param rockage relative age of the speleothem
 #' @param speleothemtype type of speleothem
 #' @param dripheightunits Units for drip height
 #' @param entitycovertype type of cover around the speleothem
@@ -33,7 +33,7 @@ set_speleothem <- function(x = NA,
                            dripheight = NA_integer_,
                            monitoring = FALSE,
                            geology = NA_character_,
-                           relativeage = NA_character_,
+                           rockage = NA_character_,
                            speleothemtype = NA_character_,
                            dripheightunits = NA_character_,
                            entitycovertype = NA_character_,
@@ -60,7 +60,7 @@ set_speleothem <- function(x = NA,
     x$dripheight <- dripheight
     x$monitoring <- monitoring
     x$geology <- geology
-    x$relativeage <- relativeage
+    x$rockage <- rockage
     x$speleothemtype <- speleothemtype
     x$dripheightunits <- dripheightunits
     x$entitycovertype <- entitycovertype

R/speleothem-methods.R

@@ -12,7 +12,7 @@ setMethod(f = "show",
                     dripheightunits = object@dripheightunits,
                     monitoring = object@monitoring,
                     geology = object@geology,
-                    relativeage = object@relativeage,
+                    rockage = object@rockage,
                     speleothemtype = object@speleothemtype,
                     entrancedistance = object@entrancedistance,
                     entrancedistanceunits = object@entrancedistanceunits,
@@ -40,7 +40,7 @@ setMethod(f = "show",
                          dripheightunits = y@dripheightunits,
                          monitoring = y@monitoring,
                          geology = y@geology,
-                         relativeage = y@relativeage,
+                         rockage = y@rockage,
                          speleothemtype = y@speleothemtype,
                          entrancedistance = y@entrancedistance,
                          entrancedistanceunits = y@entrancedistanceunits,
@@ -164,7 +164,7 @@ setMethod(f = "as.data.frame",
                        dripheightunits = x@dripheightunits,
                        monitoring = x@monitoring,
                        geology = x@geology,
-                       relativeage = x@relativeage,
+                       rockage = x@rockage,
                        speleothemtype = x@speleothemtype,
                        entrancedistance = x@entrancedistance,
                        entrancedistanceunits = x@entrancedistanceunits,

R/speleothemdetails.R

@@ -32,7 +32,7 @@ setMethod(f = "speleothemdetails",
              .data$taxonid, .data$variablename, .data$value, .data$units,
              # speleothem details
              .data$speleothemtype, .data$geology,
-             .data$relativeage, .data$monitoring,
+             .data$rockage, .data$monitoring,
              .data$speleothemdriptype, .data$dripheight, .data$dripheightunits,
              .data$covertype, .data$entitycoverthickness,
              .data$entrancedistance, .data$entrancedistanceunits, 

R/speleothems.R

@@ -25,7 +25,7 @@ setMethod(f = "speleothems",
       output <- output %>%
         select(.data$siteid, .data$sitename, .data$collectionunitid,
                .data$datasetid, .data$entityid, .data$entityname,
-               .data$speleothemtype, .data$geology, .data$relativeage,
+               .data$speleothemtype, .data$geology, .data$rockage,
                .data$monitoring, .data$speleothemdriptype, .data$dripheight,
                .data$dripheightunits, .data$covertype,
                .data$entitycoverthickness, .data$entrancedistance,
@@ -115,7 +115,7 @@ setMethod(f = "speleothems",
                   dripheightunits = y$dripheightunits,
                   monitoring = y$monitoring,
                   geology = y$geology,
-                  relativeage = y$relativeage,
+                  rockage = y$rockage,
                   covertype = y$entitycovertype,
                   entitycoverthickness = y$entitycoverthickness,
                   entrancedistance = y$entrancedistance,