fix tests/rdoc

.Rbuildignore

@@ -1,4 +1,5 @@
 ^.*\.Rproj$
+^.*\.REnviron$
 ^\.Rproj\.user$
 ^CODE_OF_CONDUCT\.md$
 ^CONTRIBUTING\.md$

NAMESPACE

@@ -158,6 +158,7 @@ export(ISOBoundAssociationRole)
 export(ISOBoundFeatureAttribute)
 export(ISOBoundingPolygon)
 export(ISOBrowseGraphic)
+export(ISOCTCodelistValue)
 export(ISOCarrierOfCharacteristics)
 export(ISOCellGeometry)
 export(ISOCharacterSet)
@@ -169,7 +170,6 @@ export(ISOCodeListDictionary)
 export(ISOCodeListValue)
 export(ISOCodelist)
 export(ISOCodelistCatalogue)
-export(ISOCTCodelistValue)
 export(ISOCompletenessCommission)
 export(ISOCompletenessOmission)
 export(ISOConceptualConsistency)
@@ -213,6 +213,8 @@ export(ISOEvaluationMethodType)
 export(ISOExtendedElementInformation)
 export(ISOExtent)
 export(ISOFeatureAssociation)
+export(ISOFeatureAssociation19115_3)
+export(ISOFeatureAssociation19139)
 export(ISOFeatureAttribute)
 export(ISOFeatureCatalogue)
 export(ISOFeatureCatalogueDescription)

R/ISOCTCodelistValue.R

@@ -1,4 +1,5 @@
 #' @name ISOCTCodelistValue
+#' @title ISOCTCodelistValue
 #'
 #' @docType class
 #' @importFrom R6 R6Class

R/ISOCodeListValue.R

@@ -1,4 +1,5 @@
 #' @name ISOCodeListValue
+#' @title ISOCodeListValue
 #'
 #' @docType class
 #' @importFrom R6 R6Class
@@ -18,7 +19,7 @@ ISOCodeListValue <- R6Class("ISOCodeListValue",
    inherit = ISOAbstractObject,
    private = list(
       printAttrs = list(),
-      xmlElement = "CodeListItem",
+      xmlElement = "CodeListValue",
       xmlNamespacePrefix = "GCO"
    ),
    public = list(

R/ISOFeatureAssociation.R

@@ -51,3 +51,119 @@ ISOFeatureAssociation <- R6Class("ISOFeatureAssociation",
 
    )         
 )
+
+#' ISOFeatureAssociation19139
+#'
+#' @docType class
+#' @importFrom R6 R6Class
+#' @export
+#' @keywords ISO feature association
+#' @return Object of \code{\link[R6]{R6Class}} for modelling an ISOFeatureAssociation in ISO 19139
+#' @format \code{\link[R6]{R6Class}} object.
+#' 
+#' @references 
+#'   ISO 19110:2005 Methodology for Feature cataloguing
+#' 
+#' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
+#'
+ISOFeatureAssociation19139 <- R6Class("ISOFeatureAssociation19139",
+ inherit = ISOFeatureType19139,
+ private = list(
+   xmlElement = "FC_FeatureAssociation",
+   xmlNamespacePrefix = "GFC"
+ ),
+ public = list(
+
+   #'@field roleName roleName [2..*]: ISOAssociationRole
+   roleName = list(),
+
+   #'@description Initializes object
+   #'@param xml object of class \link[XML]{XMLInternalNode-class}
+   initialize = function(xml = NULL){
+     super$initialize(xml = xml)
+   },
+
+   #'@description Adds role name
+   #'@param associationRole object of class \link{ISOAssociationRole}
+   #'@return \code{TRUE} if added, \code{FALSE} otherwise
+   addRoleName = function(associationRole){
+     if(!is(associationRole, "ISOAssociationRole")){
+       stop("The argument value should be an object of class 'ISOAssocationRole'")
+     }
+     return(self$addListElement("roleName", associationRole))
+   },
+
+   #'@description Deletes role name
+   #'@param associationRole object of class \link{ISOAssociationRole}
+   #'@return \code{TRUE} if deleted, \code{FALSE} otherwise
+   delRoleName = function(associationRole){
+     if(!is(associationRole, "ISOAssociationRole")){
+       stop("The argument value should be an object of class 'ISOAssocationRole'")
+     }
+     return(self$delListElement("roleName", associationRole))
+   }
+
+ )         
+)
+
+#' ISOFeatureAssociation19115_3
+#'
+#' @docType class
+#' @importFrom R6 R6Class
+#' @export
+#' @keywords ISO feature association
+#' @return Object of \code{\link[R6]{R6Class}} for modelling an ISOFeatureAssociation in ISO 19115-3
+#' @format \code{\link[R6]{R6Class}} object.
+#' 
+#' @references 
+#'   ISO 19110:2005 Methodology for Feature cataloguing
+#' 
+#' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
+#'
+ISOFeatureAssociation19115_3 <- R6Class("ISOFeatureAssociation19115_3",
+  inherit = ISOFeatureType19115_3,
+  private = list(
+    xmlElement = "FC_FeatureAssociation",
+    xmlNamespacePrefix = "GFC"
+  ),
+  public = list(
+
+    #'@field roleName roleName [2..*]: ISOAssociationRole
+    roleName = list(),
+
+    #'@description Initializes object
+    #'@param xml object of class \link[XML]{XMLInternalNode-class}
+    initialize = function(xml = NULL){
+      super$initialize(xml = xml)
+    },
+
+    #'@description Adds role name
+    #'@param associationRole object of class \link{ISOAssociationRole}
+    #'@return \code{TRUE} if added, \code{FALSE} otherwise
+    addRoleName = function(associationRole){
+      if(!is(associationRole, "ISOAssociationRole")){
+        stop("The argument value should be an object of class 'ISOAssocationRole'")
+      }
+      return(self$addListElement("roleName", associationRole))
+    },
+
+    #'@description Deletes role name
+    #'@param associationRole object of class \link{ISOAssociationRole}
+    #'@return \code{TRUE} if deleted, \code{FALSE} otherwise
+    delRoleName = function(associationRole){
+      if(!is(associationRole, "ISOAssociationRole")){
+        stop("The argument value should be an object of class 'ISOAssocationRole'")
+      }
+      return(self$delListElement("roleName", associationRole))
+    }
+
+  )         
+)
+
+ISOFeatureAssociation$new = function(xml = NULL){
+  self <- switch(getMetadataStandard(),
+   "19139" = ISOFeatureAssociation19139$new(xml = xml),
+   "19115-3" = ISOFeatureAssociation19115_3$new(xml = xml)
+  )
+  return(self)
+}

R/ISOFeatureCatalogueDescription.R

@@ -20,7 +20,7 @@
 #'   contact$setOnlineResource(fcLink)
 #'   rp = ISOResponsibleParty$new()
 #'   rp$setContactInfo(contact)
-#'   cit$setCitedResponsibleParty(rp)
+#'   cit$addCitedResponsibleParty(rp)
 #'   md$addFeatureCatalogueCitation(cit)
 #'  
 #' @references 

R/ISOFeatureType19115_3.R

@@ -8,6 +8,7 @@
 #' @format \code{\link[R6]{R6Class}} object.
 #' 
 #' @examples 
+#'  setMetadataStandard("19115-3") #required
 #'  #featuretype
 #'  md <- ISOFeatureType$new()
 #'  md$setTypeName("typeName")
@@ -55,6 +56,7 @@
 #'    md$addCharacteristic(fat)
 #'  }
 #'  xml <- md$encode()
+#'  setMetadataStandard("19139") 
 #'  
 #' @references 
 #'   - ISO 19110 - GFC 1.1 https://schemas.isotc211.org/19110/gfc/1.1/gfc/#element_FC_FeatureType

R/ISOImageryMetadata.R

@@ -216,7 +216,7 @@
 #'    
 #'    #create dataQuality object with a 'dataset' scope
 #'    dq <- ISODataQuality$new()
-#'    scope <- ISOScopeCode$new()
+#'    scope <- ISODataQualityScope$new()
 #'    scope$setLevel("dataset")
 #'    dq$setScope(scope)
 #'   

R/ISOImagerySensorType.R

@@ -8,7 +8,7 @@
 #' @format \code{\link[R6]{R6Class}} object.
 #' 
 #' @examples
-#'   md <- ISOImagerySensorType$new()
+#'   md <- ISOImagerySensorType$new(value ="type")
 #' 
 #' @references 
 #'   - 19139 \url{https://schemas.isotc211.org/19115/-2/gmi/1.0/gmi/#element_MI_SensoryTypeCode}
@@ -32,9 +32,9 @@ ISOImagerySensorType <- R6Class("ISOImagerySensorType",
      #'@param xml object of class \link[XML]{XMLInternalNode-class}
      #'@param value value
      #'@param description description
-     initialize = function(xml = NULL, value, description = NULL){
+     initialize = function(xml = NULL, value = NULL, description = NULL){
        super$initialize(xml = xml, id = private$xmlElement, value = value, description = description, 
-                        addCodeSpaceAttr = FALSE)
+                        addCodeListAttrs = FALSE,addCodeSpaceAttr = FALSE)
      }
    )                        
 )

R/ISOPixelOrientation.R

@@ -38,8 +38,7 @@ ISOPixelOrientation <- R6Class("ISOPixelOrientation",
     #'@param description description
     initialize = function(xml = NULL, value, description = NULL){
       super$initialize(xml = xml, id = private$xmlElement, value = value, description = description,
-                      addCodeSpaceAttr = FALSE)
-      self$attrs <- list()
+                       addCodeListAttrs = FALSE, addCodeSpaceAttr = FALSE)
    }
   )                        
 )

inst/extdata/examples/metadata.R

@@ -198,7 +198,7 @@ md$setDistributionInfo(distrib)
 
 #create dataQuality object with a 'dataset' scope
 dq <- ISODataQuality$new()
-scope <- ISOScopeCode$new()
+scope <- ISODataQualityScope$new()
 scope$setLevel("dataset")
 dq$setScope(scope)
 

inst/extdata/examples/metadata_i18n.R

@@ -570,7 +570,7 @@ md$setDistributionInfo(distrib)
 dq <- ISODataQuality$new()
 
 #add scope
-scope <- ISOScopeCode$new()
+scope <- ISODataQualityScope$new()
 scope$setLevel("dataset")
 dq$setScope(scope)