Skip to content

Commit

Permalink
Minor changes for release 0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
midraed committed Mar 31, 2017
1 parent 17af8bd commit e48a244
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
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),
Expand Down
14 changes: 13 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
Binary file removed inst/extdata/LC82320832016040LGN00_band1.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_band9.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_sr_band1.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band1.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band10.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band11.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band2.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band3.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band4.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band5.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band6.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band7.tif
Binary file not shown.
Binary file removed inst/extdata/LC82320832016040LGN00_toa_band9.tif
Binary file not shown.
4 changes: 2 additions & 2 deletions vignettes/Landsat8.R
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions vignettes/Landsat8.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand All @@ -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,
Expand Down

0 comments on commit e48a244

Please sign in to comment.