Skip to content

Commit

Permalink
Merge pull request #98 from KonstiDE/master
Browse files Browse the repository at this point in the history
Switch to terra
  • Loading branch information
KonstiDE authored Jan 12, 2024
2 parents ec6cac2 + 5ab9e31 commit 826a8df
Show file tree
Hide file tree
Showing 131 changed files with 2,502 additions and 2,242 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
^\.travis\.yml$
inst/demo
.project
.idea
.git
.gitignore
.Rprofile
Expand Down
28 changes: 24 additions & 4 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
Expand All @@ -15,16 +15,36 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: covr
extra-packages: any::covr
needs: coverage

- name: Test coverage
run: covr::codecov()
run: |
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v3
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
12 changes: 6 additions & 6 deletions .github/workflows/rcmdcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-pandoc@v2

- name: Install xquartz
if: runner.os == 'macOS'
run: brew install --cask xquartz
Expand All @@ -45,25 +45,25 @@ jobs:
use-public-rspm: true
Ncpus: '2'

- name: Install dependencies (Win)
- name: Install dependencies (Win)
if: runner.os == 'windows'
uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- name: Install dependencies (Non-Win)
if: runner.os != 'windows'
uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck, cran/randomForest@4.6-14, cran/XML@3.99-0.8
needs: check

- name: Install RF
if: ${{ matrix.config.r != 'oldrel-1' }}
run: install.packages("randomForest")
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
23 changes: 9 additions & 14 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,40 +1,36 @@
Package: RStoolbox
Type: Package
Title: Tools for Remote Sensing Data Analysis
Version: 0.3.1.9999
Version: 0.4.0
Authors@R: c(
person("Benjamin", "Leutner", role=c("cre", "aut"), email="rstoolboxpackage@gmail.com", comment = c(ORCID = "0000-0002-6893-2002")),
person("Benjamin", "Leutner", role=c("aut"), email="rstoolboxpackage@gmail.com", comment = c(ORCID = "0000-0002-6893-2002")),
person("Ned", "Horning", role ="aut", email="horning@amnh.org"),
person("Jakob", "Schwalb-Willmann", role ="aut", email="movevis@schwalb-willmann.de", comment = c(ORCID = "0000-0003-2665-1509")),
person("Robert J.", "Hijmans", role = "ctb", email = "r.hijmans@gmail.com",comment = c(ORCID = "0000-0001-5872-2872"))
person("Robert J.", "Hijmans", role = "ctb", email = "r.hijmans@gmail.com",comment = c(ORCID = "0000-0001-5872-2872")),
person("Konstantin", "Mueller", role = c("ctb", "cre"), email = "konstantinfinn.mueller@gmx.de", comment = c(ORCID = "0000-0001-6540-3124"))
)
Description: Toolbox for remote sensing image processing and analysis such as
calculating spectral indices, principal component transformation, unsupervised
calculating spectral indexes, principal component transformation, unsupervised
and supervised classification or fractional cover analyses.
URL: https://bleutner.github.io/RStoolbox/, https://github.com/bleutner/RStoolbox
BugReports: https://github.com/bleutner/RStoolbox/issues
Encoding: UTF-8
Depends:
R (>= 3.5.0)
Imports:
raster (>= 2.3-40),
caret (>= 6.0-79),
sp,
sf,
terra,
rgdal,
XML,
dplyr,
ggplot2,
tidyr,
reshape2,
codetools,
lifecycle,
parallel,
exactextractr,
doParallel,
foreach,
Rcpp,
methods
methods,
magrittr
Suggests:
randomForest,
kernlab,
Expand All @@ -45,5 +41,4 @@ Suggests:
LinkingTo: Rcpp,
RcppArmadillo
License: GPL (>=3)
LazyData: true
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
229 changes: 109 additions & 120 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,120 +1,109 @@
# Generated by roxygen2: do not edit by hand

S3method(fortify,RasterBrick)
S3method(fortify,RasterLayer)
S3method(fortify,RasterStack)
S3method(predict,superClass)
S3method(predict,unsuperClass)
S3method(print,mapValidation)
S3method(print,superClass)
S3method(print,unsuperClass)
S3method(summary,ImageMetaData)
export(ImageMetaData)
export(classifyQA)
export(cloudMask)
export(cloudShadowMask)
export(coregisterImages)
export(decodeQA)
export(encodeQA)
export(estimateHaze)
export(fCover)
export(getMeta)
export(getValidation)
export(ggR)
export(ggRGB)
export(histMatch)
export(mesma)
export(normImage)
export(oneHotEncode)
export(panSharpen)
export(pifMatch)
export(radCor)
export(rasterCVA)
export(rasterEntropy)
export(rasterPCA)
export(readEE)
export(readMeta)
export(readRSTBX)
export(readSLI)
export(rescaleImage)
export(rsOpts)
export(sam)
export(saveRSTBX)
export(spectralIndices)
export(stackMeta)
export(superClass)
export(tasseledCap)
export(topCor)
export(unsuperClass)
export(validateMap)
export(writeSLI)
import(raster)
import(sf)
import(sp)
importFrom(Rcpp,sourceCpp)
importFrom(XML,xmlParse)
importFrom(XML,xmlToList)
importFrom(caret,confusionMatrix)
importFrom(caret,createDataPartition)
importFrom(caret,createFolds)
importFrom(caret,getTrainPerf)
importFrom(caret,postResample)
importFrom(caret,train)
importFrom(caret,trainControl)
importFrom(codetools,findGlobals)
importFrom(doParallel,registerDoParallel)
importFrom(dplyr,group_by)
importFrom(dplyr,mutate)
importFrom(exactextractr,exact_extract)
importFrom(foreach,getDoParRegistered)
importFrom(ggplot2,aes)
importFrom(ggplot2,aes_string)
importFrom(ggplot2,annotation_raster)
importFrom(ggplot2,coord_equal)
importFrom(ggplot2,facet_wrap)
importFrom(ggplot2,fortify)
importFrom(ggplot2,geom_blank)
importFrom(ggplot2,geom_raster)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,scale_fill_discrete)
importFrom(ggplot2,scale_fill_gradientn)
importFrom(ggplot2,scale_fill_identity)
importFrom(grDevices,hsv)
importFrom(graphics,abline)
importFrom(graphics,par)
importFrom(lifecycle,deprecate_warn)
importFrom(lifecycle,deprecated)
importFrom(lifecycle,is_present)
importFrom(methods,as)
importFrom(parallel,clusterExport)
importFrom(parallel,makeCluster)
importFrom(parallel,parApply)
importFrom(parallel,parLapply)
importFrom(parallel,parSapply)
importFrom(reshape2,melt)
importFrom(stats,approxfun)
importFrom(stats,coefficients)
importFrom(stats,complete.cases)
importFrom(stats,cor)
importFrom(stats,cov)
importFrom(stats,ecdf)
importFrom(stats,filter)
importFrom(stats,kmeans)
importFrom(stats,knots)
importFrom(stats,lm)
importFrom(stats,loadings)
importFrom(stats,median)
importFrom(stats,na.omit)
importFrom(stats,princomp)
importFrom(stats,setNames)
importFrom(terra,project)
importFrom(terra,rast)
importFrom(terra,vect)
importFrom(utils,capture.output)
importFrom(utils,data)
importFrom(utils,read.csv)
importFrom(utils,read.delim)
importFrom(utils,read.table)
importFrom(utils,str)
importFrom(utils,write.table)
useDynLib(RStoolbox)
# Generated by roxygen2: do not edit by hand

S3method(predict,superClass)
S3method(predict,unsuperClass)
S3method(print,mapValidation)
S3method(print,superClass)
S3method(print,unsuperClass)
S3method(summary,ImageMetaData)
export("%>%")
export(ImageMetaData)
export(classifyQA)
export(cloudMask)
export(cloudShadowMask)
export(coregisterImages)
export(decodeQA)
export(encodeQA)
export(estimateHaze)
export(fCover)
export(fortifySpatRaster)
export(getMeta)
export(getValidation)
export(ggR)
export(ggRGB)
export(histMatch)
export(mesma)
export(normImage)
export(oneHotEncode)
export(panSharpen)
export(pifMatch)
export(radCor)
export(rasterCVA)
export(rasterEntropy)
export(rasterPCA)
export(readEE)
export(readMeta)
export(readRSTBX)
export(readSLI)
export(rescaleImage)
export(rsOpts)
export(sam)
export(saveRSTBX)
export(spectralIndices)
export(stackMeta)
export(superClass)
export(tasseledCap)
export(topCor)
export(unsuperClass)
export(validateMap)
export(writeSLI)
import(sf)
import(terra)
importFrom(Rcpp,sourceCpp)
importFrom(XML,xmlParse)
importFrom(XML,xmlToList)
importFrom(caret,confusionMatrix)
importFrom(caret,createDataPartition)
importFrom(caret,createFolds)
importFrom(caret,getTrainPerf)
importFrom(caret,postResample)
importFrom(caret,train)
importFrom(caret,trainControl)
importFrom(dplyr,filter)
importFrom(dplyr,group_by)
importFrom(dplyr,mutate)
importFrom(dplyr,summarize)
importFrom(exactextractr,exact_extract)
importFrom(ggplot2,aes)
importFrom(ggplot2,aes_string)
importFrom(ggplot2,annotation_raster)
importFrom(ggplot2,coord_equal)
importFrom(ggplot2,facet_wrap)
importFrom(ggplot2,fortify)
importFrom(ggplot2,geom_blank)
importFrom(ggplot2,geom_raster)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,scale_fill_discrete)
importFrom(ggplot2,scale_fill_gradientn)
importFrom(ggplot2,scale_fill_identity)
importFrom(grDevices,hsv)
importFrom(graphics,abline)
importFrom(graphics,par)
importFrom(lifecycle,deprecate_warn)
importFrom(lifecycle,deprecated)
importFrom(lifecycle,is_present)
importFrom(magrittr,"%>%")
importFrom(methods,as)
importFrom(methods,show)
importFrom(reshape2,melt)
importFrom(stats,approxfun)
importFrom(stats,coefficients)
importFrom(stats,complete.cases)
importFrom(stats,cor)
importFrom(stats,cov)
importFrom(stats,ecdf)
importFrom(stats,kmeans)
importFrom(stats,knots)
importFrom(stats,lm)
importFrom(stats,loadings)
importFrom(stats,setNames)
importFrom(tidyr,complete)
importFrom(tidyr,pivot_wider)
importFrom(utils,capture.output)
importFrom(utils,data)
importFrom(utils,read.csv)
importFrom(utils,read.delim)
importFrom(utils,read.table)
importFrom(utils,str)
importFrom(utils,write.table)
useDynLib(RStoolbox)
Loading

0 comments on commit 826a8df

Please sign in to comment.