#414

Author: eblondel

R/geoflow_validator.R

@@ -761,7 +761,7 @@ geoflow_validator_entity_Rights <- R6Class("geoflow_validator_entity_Rights",
       #'@param j col index (internal index to be used for graphical \pkg{geoflow} validation handlers)
       #'@param str string to validate
       initialize = function(i, j, str){
-        valid_keys <- list("license","use","useLimitation", "useConstraint", "accessConstraint", "otherConstraint", "accessRight", "accessConditions")
+        valid_keys <- list("license","use","useLimitation", "termsOfUse", "disclaimer", "citation", "useConstraint", "accessConstraint", "otherConstraint", "accessRight", "accessConditions")
         super$initialize(TRUE,TRUE, TRUE, valid_keys, NULL,TRUE, FALSE, TRUE, i, j, str)
       }
     )

doc/metadata.md

@@ -178,7 +178,7 @@ Examples cover both:
 | **Definition**               | Description of the access and/or use constraints. Restriction code are map ISO 19115, the 2 constraints are related to code list . Control to term , use limitation can be use for any term of use (license, prefered citation, disclaimer). other constraint free text can be used |
 | **Need**                     |Optional               |
 | **Default key (if omitted)** |*Not applicable*|
-| **other keys available**     |``license``  <br /> ``use``  <br /> ``useLimitation``  <br /> ``useConstraint`` <br /> ``accessConstraint`` <br />  ``otherConstraint``|
+| **other keys available**     |``license``  <br /> ``use``  <br /> ``useLimitation``  <br /> ``termsOfuSe`` <br /> ``disclaimer`` <br /> ``citation`` <br />  ``useConstraint`` <br /> ``accessConstraint`` <br />  ``otherConstraint``|
 | **Examples**                 |               |
 | Simple usage                 |key:rule       |
 | Advanced usage               |`useLimitation:Free usage_` <br/> `accessConstraint:otherRestrictions_` <br/> `useConstraint:intellectualPropertyRights_` <br/> `otherConstraint:The supplier is unable to guarantee the accuracy, updating, integrity, completeness of the data`               |

inst/actions/geometa_create_iso_19115.R

@@ -422,7 +422,7 @@ function(action, entity, config){
       }
     }
     #use limitation
-    uses <- entity$rights[sapply(entity$rights, function(x){tolower(x$key) %in% c("use","uselimitation")})]
+    uses <- entity$rights[sapply(entity$rights, function(x){tolower(x$key) %in% c("use","uselimitation","termsofuse", "disclaimer", "citation")})]
     if(length(uses)>0){
       for(use in uses){
         for(value in use$values){