Skip to content

Commit fab825c

Browse files
committed
removed landmap and gdalUtils deps
1 parent c583673 commit fab825c

23 files changed

+1205
-850
lines changed

DESCRIPTION

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: plotKML
2-
Version: 0.8-2
3-
Date: 2021-10-06
2+
Version: 0.8-3
3+
Date: 2022-06-05
44
Title: Visualization of Spatial and Spatio-Temporal Objects in Google Earth
55
Author: Tomislav Hengl [cre, aut], Andrea Gilardi [ctb], Pierre Roudier [ctb], Dylan Beaudette [ctb], Edzer Pebesma [ctb], Michael Blaschek [ctb]
66
Authors@R: c(person("Tomislav", "Hengl", role = c("cre", "aut"),
@@ -12,7 +12,7 @@ Authors@R: c(person("Tomislav", "Hengl", role = c("cre", "aut"),
1212
person("Michael", "Blaschek", role = "ctb"))
1313
Maintainer: Tomislav Hengl <tom.hengl@opengeohub.org>
1414
Depends: R (>= 3.5.0)
15-
Imports: methods, tools, gstat, colorRamps, pixmap, utils, XML, dismo, landmap, sp, raster, rgdal, aqp, spacetime, colorspace, plyr, stringr, scales, zoo, RColorBrewer, classInt, sf, stars
15+
Imports: methods, tools, gstat, colorRamps, pixmap, utils, XML, dismo, sp, raster, rgdal, aqp, spacetime, colorspace, plyr, stringr, scales, zoo, RColorBrewer, classInt, sf, stars
1616
Suggests:
1717
RSAGA,
1818
plotrix,
@@ -28,9 +28,9 @@ Suggests:
2828
rgbif,
2929
Hmisc,
3030
uuid,
31+
R.utils,
3132
intervals,
3233
reshape,
33-
gdalUtils,
3434
snowfall,
3535
parallel,
3636
testthat

R/AAA-classes.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Color palette:
22
setClass("sp.palette", representation(type = 'character', bounds = 'vector', color = 'character', names = 'character', icons = 'character'), validity = function(object) {
3-
if(!class(object@bounds)=="numeric")
3+
if(!is(object@bounds, "numeric"))
44
return('Vector with upper and lower limits required')
55
if((length(object@bounds)-1)!=length(object@color)|(length(object@bounds)-1)!=length(object@names))
66
return('Size of bounds (-1), colors and element names must be equal')
@@ -19,7 +19,7 @@ setClass("SpatialMetadata", representation(xml = "XMLInternalDocument", field.na
1919
field_names <- merge(met, mdnames[,c("metadata","field.names")], by="metadata", all.x=TRUE, all.y=FALSE)[,"field.names"]
2020
if(!any(field_names %in% object@field.names))
2121
return("Field names do not match the column names in the xml slot")
22-
if(!class(object@field.names)=="character")
22+
if(!is(object@field.names, "character"))
2323
return("Field names as character vector required")
2424
})
2525

R/AAAA.R

+2-3
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,12 @@ paths <- function(gdalwarp = "", gdal_translate = "", convert = "", saga_cmd = "
9898
## try to locate GDAL / Patyhon:
9999
if(.Platform$OS.type == "windows"){
100100
if(gdalwarp==""|gdal_translate==""){
101-
if(requireNamespace("gdalUtils", quietly = TRUE)){
102-
gdalUtils::gdal_setInstallation(search_path=gdal.dir, rescan=FALSE)
101+
.gdal_setInstallation(search_path=gdal.dir, rescan=FALSE)
103102
x <- getOption("gdalUtils_gdalPath")
104103
if(!is.null(x[[1]]$path)){
105104
gdalwarp = shQuote(utils::shortPathName(normalizePath(file.path(x[[1]]$path, "gdalwarp.exe"))))
106105
gdal_translate = shQuote(utils::shortPathName(normalizePath(file.path(x[[1]]$path, "gdal_translate.exe"))))
107-
}} else {
106+
} else {
108107
if(silent==FALSE){
109108
warning("Could not locate GDAL! Install program and add it to the Windows registry. See https://gdal.org/ for more info.")
110109
}

R/attributes.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# if the user passed in TRUE, then we want all of the columns
55
# AG: AFAIK, we shouldn't use class(x) == "something" to test for class
66
# Maybe: if (is.logical(columns)) ?
7-
if (class(columns) == 'logical'){
7+
if(is(columns, 'logical')){
88
columns <- seq_len(ncol(x)) # use all columns from the dataframe row
99
}
1010
else { # otherwise, keep only requested columns

0 commit comments

Comments
 (0)