fix data source handling

eblondel · eblondel · commit d67e662acc91 · 2024-05-07T22:44:19.000+02:00
diff --git a/R/geoflow_data.R b/R/geoflow_data.R
@@ -166,8 +166,8 @@ geoflow_data <- R6Class("geoflow_data",
           if(!any(sapply(data_props, function(x){x$key=="source"})) && !any(sapply(data_props, function(x){x$key=="dir"}))){
             stop("One or more data 'source' (or 'dir', as directory for sources) is mandatory")
           }
-          if(any(sapply(data_props, function(x){x$key=="source"}))) self$setSource(data_props$source$values)
         }
+        if(any(sapply(data_props, function(x){x$key=="source"}))) self$setSource(data_props$source$values)
           
         #sourceSql
         if(!is.null(data_props$sourceSql)){

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ geoflow_data <- R6Class("geoflow_data",`
`166`	`166`	`if(!any(sapply(data_props, function(x){x$key=="source"})) && !any(sapply(data_props, function(x){x$key=="dir"}))){`
`167`	`167`	`stop("One or more data 'source' (or 'dir', as directory for sources) is mandatory")`
`168`	`168`	`}`
`169`		`- if(any(sapply(data_props, function(x){x$key=="source"}))) self$setSource(data_props$source$values)`
`170`	`169`	`}`
	`170`	`+ if(any(sapply(data_props, function(x){x$key=="source"}))) self$setSource(data_props$source$values)`
`171`	`171`
`172`	`172`	`#sourceSql`
`173`	`173`	`if(!is.null(data_props$sourceSql)){`