diff --git a/DESCRIPTION b/DESCRIPTION index 11b6644..010ff78 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Author: Guillermo Federico Olmedo [aut, cre], Samuel Ortega-Farias [aut], David Fonseca-Luengo [aut], Daniel de la Fuente-Saiz [aut], Fernando Fuentes Peñailillo [aut] Maintainer: Guillermo Federico Olmedo -Description: Tools and functions to calculate actual evapotranspiration +Description: Tools and functions to calculate actual Evapotranspiration using surface energy balance models. Depends: R (>= 3.0), diff --git a/NEWS b/NEWS index 8d79a8e..1ab457a 100644 --- a/NEWS +++ b/NEWS @@ -3,9 +3,21 @@ change log. From 09/09/2015. Most recent changes first / on top. Guillermo OLMEDO ----------------------------------------------------------------- -VERSION 0.5.1 +VERSION 0.6 +* Added a new function loadImageSR to load surface reflectance from + Landsat 8 from ESPA files +* calcSR only works for L7 +* calcTOAr() now estimates TOA reflectance for Landsat 8 +* surfaceTemperature() uses the scene in DN and estimates the brightness + temperature for Landsat 7 or 8. Argument thermalband is deprecated. +* Added a new example of weather station for the new Landsat 8 example +* Added a Landsa 8 scene as example dataset in raw format complete with the + surface reflectance estimated by ESPA * Added a new vignette describing how to use Landsat 8 data in water package + +VERSION 0.5.1 + * Fixed checkSRTMgrids for positives values of lat/long. * Small improvement in waterWeatherStation plot. Now the time axis is always complete. diff --git a/README.md b/README.md index e44928c..fa3066d 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,6 @@ Depends: R (>= 3.2.1), raster (>= 2.1), sp (>= 1.1-1), proj4, stringr License: GPL (>= 2) - -## Style Guide - -I (try) to follow this [style guide](https://google-styleguide.googlecode.com/svn/trunk/Rguide.xml) - ## Contributing Contributions are accepted by [fork](https://help.github.com/articles/fork-a-repo/) and [pull-request](https://help.github.com/articles/using-pull-requests/) diff --git a/inst/extdata/LC82320832016040LGN00_band1.tif b/inst/extdata/LC82320832016040LGN00_band1.tif deleted file mode 100644 index 29ae698..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_band1.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_band9.tif b/inst/extdata/LC82320832016040LGN00_band9.tif deleted file mode 100644 index a80afb6..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_band9.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_sr_band1.tif b/inst/extdata/LC82320832016040LGN00_sr_band1.tif deleted file mode 100644 index 86fd437..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_sr_band1.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band1.tif b/inst/extdata/LC82320832016040LGN00_toa_band1.tif deleted file mode 100644 index e9ba718..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band1.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band10.tif b/inst/extdata/LC82320832016040LGN00_toa_band10.tif deleted file mode 100644 index 356309f..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band10.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band11.tif b/inst/extdata/LC82320832016040LGN00_toa_band11.tif deleted file mode 100644 index 809eaf6..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band11.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band2.tif b/inst/extdata/LC82320832016040LGN00_toa_band2.tif deleted file mode 100644 index ed0a42e..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band2.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band3.tif b/inst/extdata/LC82320832016040LGN00_toa_band3.tif deleted file mode 100644 index c31b698..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band3.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band4.tif b/inst/extdata/LC82320832016040LGN00_toa_band4.tif deleted file mode 100644 index 35172c8..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band4.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band5.tif b/inst/extdata/LC82320832016040LGN00_toa_band5.tif deleted file mode 100644 index 20322ba..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band5.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band6.tif b/inst/extdata/LC82320832016040LGN00_toa_band6.tif deleted file mode 100644 index 3667c16..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band6.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band7.tif b/inst/extdata/LC82320832016040LGN00_toa_band7.tif deleted file mode 100644 index 360fe9a..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band7.tif and /dev/null differ diff --git a/inst/extdata/LC82320832016040LGN00_toa_band9.tif b/inst/extdata/LC82320832016040LGN00_toa_band9.tif deleted file mode 100644 index 1025f0d..0000000 Binary files a/inst/extdata/LC82320832016040LGN00_toa_band9.tif and /dev/null differ diff --git a/vignettes/Landsat8.R b/vignettes/Landsat8.R index 3507634..19bd878 100644 --- a/vignettes/Landsat8.R +++ b/vignettes/Landsat8.R @@ -2,13 +2,13 @@ library(water) aoi <- createAoi(topleft = c(500000, -3644000), bottomright = c(526000, -3660000)) -## ---- warning=FALSE, fig.width = 5--------------------------------------- +## ---- warning=FALSE, fig.width = 7--------------------------------------- raw_data_folder <- system.file("extdata", package="water") image <- loadImage(path=raw_data_folder, aoi=aoi, sat="L8") image.SR <- loadImageSR(path=raw_data_folder, aoi=aoi) plot(image) -## ---- warning=FALSE, fig.width = 5--------------------------------------- +## ---- warning=FALSE, fig.width = 7--------------------------------------- csvfile <- system.file("extdata", "INTA.csv", package="water") MTLfile <- system.file("extdata", "LC82320832016040LGN00_MTL.txt", package="water") WeatherStation <- read.WSdata(WSdata = csvfile, diff --git a/vignettes/Landsat8.Rmd b/vignettes/Landsat8.Rmd index 32e50e5..ce4940d 100644 --- a/vignettes/Landsat8.Rmd +++ b/vignettes/Landsat8.Rmd @@ -9,7 +9,7 @@ vignette: > %\VignetteEncoding{UTF-8} --- -Landsat 8 has better radiometric resolution, a two bands in the thermal region. In water package we do not provide a method for the estimation of surface reflectace. However, [USGS](usgs.gov) offers surface reflectance processed trought [ESPA](espa.cr.usgs.gov). water package uses ESPA products when running METRIC algorithm with Landsat 8 data. In this vignette we describe how to use Landsat 8 data with METRIC and water package. +Landsat 8 has better radiometric resolution, a two bands in the thermal region. In water package we do not provide a method for the estimation of surface reflectace. However, [USGS](http://usgs.gov) offers surface reflectance processed trought [ESPA](http://espa.cr.usgs.gov). water package uses ESPA products when running METRIC algorithm with Landsat 8 data. In this vignette we describe how to use Landsat 8 data with METRIC and water package. ## Differences between Landsat 7 and 8 @@ -27,7 +27,7 @@ aoi <- createAoi(topleft = c(500000, -3644000), bottomright = c(526000, -3660000 To be able to run METRIC with Landsat 8 data, the ESPA surface reflectance products must be available in the working directory. If we list the contents of the L8 example files provided with water, we can see we have 38 files: 2 metadata files, the original and the one from ESPA and 14 tif files with the raw data. The Landsat scene can loaded using `loadImage()` function. And the SR data with `loadImage.SR`: -```{r, warning=FALSE, fig.width = 5} +```{r, warning=FALSE, fig.width = 7} raw_data_folder <- system.file("extdata", package="water") image <- loadImage(path=raw_data_folder, aoi=aoi, sat="L8") image.SR <- loadImageSR(path=raw_data_folder, aoi=aoi) @@ -36,7 +36,7 @@ plot(image) Finally, the simple procedure for estimating METRIC can be applied to the image: -```{r, warning=FALSE, fig.width = 5} +```{r, warning=FALSE, fig.width = 7} csvfile <- system.file("extdata", "INTA.csv", package="water") MTLfile <- system.file("extdata", "LC82320832016040LGN00_MTL.txt", package="water") WeatherStation <- read.WSdata(WSdata = csvfile,