diff --git a/R/saga-gis.R b/R/saga-gis.R index c6b00a6..c06b528 100644 --- a/R/saga-gis.R +++ b/R/saga-gis.R @@ -462,14 +462,14 @@ saga_gis <- } # SAGA versions < 7.5 only allow direct writing to native formats - if (senv$saga_vers < 7.5 & !raster_format %in% c("SAGA", "SAGA Compressed")) { + if (senv$saga_vers < "7.5" & !raster_format %in% c("SAGA", "SAGA Compressed")) { rlang::abort(paste( "SAGA versions < 7.5 only allow directly writing of", "raster data via the 'SAGA' or 'SAGA Compressed' raster formats" )) } - if (senv$saga_vers < 5.0 & raster_format != "SAGA") { + if (senv$saga_vers < "5.0" & raster_format != "SAGA") { rlang::abort("SAGA versions < 5.0 only allow the 'SAGA' raster format") } @@ -484,13 +484,13 @@ saga_gis <- } if (all(vector_format == c("ESRI Shapefile", "GeoPackage")) & - senv$saga_vers < 7.0) { + senv$saga_vers < "7.0") { vector_format <- "ESRI Shapefile" } else { vector_format <- "GeoPackage" } - if (senv$saga_vers < 7.0 & vector_format != "ESRI Shapefile") { + if (senv$saga_vers < "7.0" & vector_format != "ESRI Shapefile") { rlang::abort(paste( "SAGA versions < 7.0 only allow directly writing of", "vector data via the 'ESRI Shapefile' vector format" diff --git a/R/saga-version.R b/R/saga-version.R index 9818d23..ffe9a3d 100644 --- a/R/saga-version.R +++ b/R/saga-version.R @@ -15,6 +15,5 @@ saga_version <- function(saga_cmd) { m = regexpr("[[:digit:]]?[.][[:digit:]]{1,2}[.][[:digit:]]", saga_vers) ) saga_vers <- trimws(saga_vers) - as.numeric_version(saga_vers) }