fix #423

Author: eblondel

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: geoflow
-Version: 1.0.0.9002
-Date: 2025-10-28
+Version: 1.0.0.9003
+Date: 2025-10-31
 Title: Orchestrate Geospatial (Meta)Data Management Workflows and Manage FAIR Services
 Description: An engine to facilitate the orchestration and execution of metadata-driven data management workflows, in compliance with 'FAIR' 
   (Findable, Accessible, Interoperable and Reusable) data management principles. By means of a pivot metadata model, relying on the 'DublinCore' standard (<https://dublincore.org/>), 

NEWS.md

@@ -10,6 +10,8 @@
 
 **Enhancements**
 
+* [#423](https://github.com/r-geoflow/geoflow/issues/423) Capacity to update relations auto-set by geoflow with `enrichWithRelations`
+
 _nothing yet_
 
 **New features**

R/geoflow_entity.R

@@ -1637,6 +1637,11 @@ geoflow_entity <- R6Class("geoflow_entity",
     #'@param config geoflow config object
     enrichWithRelations = function(config){
 
+      #check for geoflow auto-set relations, if any we remove them to avoid duplicating auto-set relations
+      if(any(sapply(self$relations, function(x){x$prov == "geoflow"}))){
+        self$relations = self$relations[sapply(self$relations, function(x){x$prov != "geoflow"})]
+      }
+      
       geosapi_action <- NULL
       actions <- list()
       if(length(config$actions)>0) actions <- config$actions[sapply(config$actions, function(x){regexpr("geosapi",x$id)>0})]
@@ -1667,6 +1672,7 @@ geoflow_entity <- R6Class("geoflow_entity",
           if(geosapi_action$getOption("enrich_with_relation_wms_thumbnail")){
             config$logger$INFO("Enrich entity with OGC WMS thumbnail for layer = '%s'", layername)
             new_thumbnail <- geoflow_relation$new()
+            new_thumbnail$setProv("geoflow")
             new_thumbnail$setKey("thumbnail")
             new_thumbnail$setName(layername)
             map_overview = set_i18n(term_key = "graphic_overview", expr = "{{layername}} - {{term}}", layername = layername)
@@ -1693,6 +1699,7 @@ geoflow_entity <- R6Class("geoflow_entity",
           if(geosapi_action$getOption("enrich_with_relation_wms")){
             config$logger$INFO("Enrich entity with OGC WMS base URL for layer = '%s'", layername)
             new_wms <- geoflow_relation$new()
+            new_wms$setProv("geoflow")
             new_wms$setKey("wms")
             new_wms$setName(layername)
             new_wms$setDescription(
@@ -1717,6 +1724,7 @@ geoflow_entity <- R6Class("geoflow_entity",
             if(geosapi_action$getOption("enrich_with_relation_wfs")){
               config$logger$INFO("Enrich entity with OGC WFS base URL for layer = '%s'", layername)
               new_wfs <- geoflow_relation$new()
+              new_wfs$setProv("geoflow")
               new_wfs$setKey("wfs")
               new_wfs$setName(layername)
               new_wfs$setDescription(
@@ -1739,6 +1747,7 @@ geoflow_entity <- R6Class("geoflow_entity",
               config$logger$INFO("Enrich entity with OGC WFS download links for layer = '%s'", layername)
               #wfs (GML)
               new_wfs_gml <- geoflow_relation$new()
+              new_wfs_gml$setProv("geoflow")
               new_wfs_gml$setKey("download")
               new_wfs_gml$setName(layername)
               new_wfs_gml$setDescription(
@@ -1757,6 +1766,7 @@ geoflow_entity <- R6Class("geoflow_entity",
               self$addRelation(new_wfs_gml)
               #wfs (GeoJSON)
               new_wfs_geojson <- geoflow_relation$new()
+              new_wfs_geojson$setProv("geoflow")
               new_wfs_geojson$setKey("download")
               new_wfs_geojson$setName(layername)
               new_wfs_geojson$setDescription(
@@ -1775,6 +1785,7 @@ geoflow_entity <- R6Class("geoflow_entity",
               self$addRelation(new_wfs_geojson)
               #wfs (ESRI Shapefile)
               new_wfs_shp <- geoflow_relation$new()
+              new_wfs_shp$setProv("geoflow")
               new_wfs_shp$setKey("download")
               new_wfs_shp$setName(layername)
               new_wfs_shp$setDescription(
@@ -1793,6 +1804,7 @@ geoflow_entity <- R6Class("geoflow_entity",
               self$addRelation(new_wfs_shp)
               #CSV
               new_wfs_csv <- geoflow_relation$new()
+              new_wfs_csv$setProv("geoflow")
               new_wfs_csv$setKey("download")
               new_wfs_csv$setName(layername)
               new_wfs_csv$setDescription(
@@ -1819,6 +1831,7 @@ geoflow_entity <- R6Class("geoflow_entity",
             if(geosapi_action$getOption("enrich_with_relation_wcs")){
               config$logger$INFO("Enrich entity with OGC WCS base URL for layer = '%s'", layername)
               new_wcs <- geoflow_relation$new()
+              new_wcs$setProv("geoflow")
               new_wcs$setKey("wcs")
               new_wcs$setName(layername)
               new_wcs$setDescription(
@@ -1842,6 +1855,7 @@ geoflow_entity <- R6Class("geoflow_entity",
               config$logger$INFO("Enrich entity with OGC WCS download links for layer = '%s'", layername)
               #wcs (image/geotiff)
               new_wcs_geotiff <- geoflow_relation$new()
+              new_wcs_geotiff$setProv("geoflow")
               new_wcs_geotiff$setKey("download")
               new_wcs_geotiff$setName(layername)
               new_wcs_geotiff$setDescription(
@@ -1883,6 +1897,7 @@ geoflow_entity <- R6Class("geoflow_entity",
         geonetwork_base_url = config$software$output$geonetwork_config$parameters$url
         #xml metadata url
         metadata_url <- geoflow_relation$new()
+        metadata_url$setProv("geoflow")
         metadata_url$setKey("http")
         metadata_url$setName("ISO 19115 metadata (CSW GetRecordById)")
         csw_record_url = paste0(
@@ -1896,6 +1911,7 @@ geoflow_entity <- R6Class("geoflow_entity",
 
         #html metadata url
         metadata_url_2 = geoflow_relation$new()
+        metadata_url_2$setProv("geoflow")
         metadata_url_2$setKey("http")
         metadata_url_2$setName("ISO 19115 metadata (HTML)")
         html_record_url = paste0(geonetwork_base_url, "/srv/api/records/", mdId)
@@ -1911,6 +1927,7 @@ geoflow_entity <- R6Class("geoflow_entity",
         csw_base_url = config$software$output$csw_config$parameters$url
         #xml metadata url
         metadata_url <- geoflow_relation$new()
+        metadata_url$setProv("geoflow")
         metadata_url$setKey("http")
         metadata_url$setName("ISO 19115 metadata (CSW GetRecordById)")
         csw_record_url = paste0(
@@ -1927,6 +1944,7 @@ geoflow_entity <- R6Class("geoflow_entity",
         if(regexpr("geonetwork", csw_base_url)>0){
           geonetwork_base_url = unlist(strsplit(csw_base_url, "/srv"))[1]
           metadata_url_2 = geoflow_relation$new()
+          metadata_url_2$setProv("geoflow")
           metadata_url_2$setKey("http")
           metadata_url_2$setName("ISO 19115 metadata (HTML)")
           html_record_url = paste0(geonetwork_base_url, "/srv/api/records/", mdId)

R/geoflow_relation.R

@@ -14,6 +14,7 @@
 #' @examples
 #' \dontrun{
 #'   relation <- geoflow_relation$new()
+#'   relation$setProv("user")
 #'   relation$setKey("wms")
 #'   relation$setLink("http://somelink/wms")
 #'   relation$setMimeType("application/xml")
@@ -35,6 +36,8 @@ geoflow_relation <- R6Class("geoflow_relation",
    name = NULL,
    #'@field description relation name
    description = NULL,
+   #'@field prov provenance,
+   prov = "user",
 
    #'@description Initializes an object of class \link{geoflow_relation}
    #'@param str character string to initialize from using key-based syntax
@@ -90,6 +93,13 @@ geoflow_relation <- R6Class("geoflow_relation",
    #'@param description description
    setDescription = function(description){
      self$description <- description
+   },
+   
+   #'@description Set provenance
+   #'@param prov provenance
+   setProv = function(prov = c("user","geoflow")){
+     prov = match.arg(prov)
+     self$prov = prov
    }
  )                                  
 )