[Raster-commits] r178 - in pkg/raster: . R man

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sun Jan 25 07:24:08 CET 2009


Author: rhijmans
Date: 2009-01-25 07:24:08 +0100 (Sun, 25 Jan 2009)
New Revision: 178

Removed:
   pkg/raster/R/brick.create.R
   pkg/raster/man/create.brick.Rd
   pkg/raster/man/makeBrick.Rd
Modified:
   pkg/raster/DESCRIPTION
   pkg/raster/NAMESPACE
   pkg/raster/R/all.classes.R
   pkg/raster/R/conversion.R
   pkg/raster/R/group.generic.functions.R
   pkg/raster/R/properties.R
   pkg/raster/R/set.R
   pkg/raster/R/show.R
   pkg/raster/R/standard.generic.functions.R
   pkg/raster/R/writeGDAL.R
   pkg/raster/man/cell.values.Rd
   pkg/raster/man/classes.Rd
   pkg/raster/man/coerce.Rd
   pkg/raster/man/mCalc.Rd
   pkg/raster/man/properties.Rd
   pkg/raster/man/read.Rd
   pkg/raster/man/values.Rd
Log:
remove RasterBrick class

Modified: pkg/raster/DESCRIPTION
===================================================================
--- pkg/raster/DESCRIPTION	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/DESCRIPTION	2009-01-25 06:24:08 UTC (rev 178)
@@ -1,8 +1,8 @@
 Package: raster
 Type: Package
 Title: Raster data handling for geographic data analysis and modeling
-Version: 0.8.6-6
-Date: 24-Jan-2009
+Version: 0.8.7
+Date: 25-Jan-2009
 Depends: methods, sp, rgdal (>= 0.5-33), R (>= 2.8.0)
 Author: Robert J. Hijmans & Jacob van Etten
 Maintainer: Robert J. Hijmans <r.hijmans at gmail.com> 

Modified: pkg/raster/NAMESPACE
===================================================================
--- pkg/raster/NAMESPACE	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/NAMESPACE	2009-01-25 06:24:08 UTC (rev 178)
@@ -1,6 +1,6 @@
 importFrom("methods", Arith, Compare, Logic, Math)
 importFrom("graphics", hist, plot)
 importFrom("sp", bbox, overlay, Spatial, SpatialPixels, SpatialPixelsDataFrame, SpatialGrid, SpatialGridDataFrame)
-exportClasses(BoundingBox, BasicRaster, Raster, RasterLayer, RasterBrick, RasterStack)
+exportClasses(BoundingBox, BasicRaster, Raster, RasterLayer, RasterStack)
 exportMethods(show, summary, plot, hist, ncol, nrow, dim, overlay, bbox)
 exportPattern("^[^\\.]")
\ No newline at end of file

Modified: pkg/raster/R/all.classes.R
===================================================================
--- pkg/raster/R/all.classes.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/all.classes.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -151,27 +151,7 @@
 )
 
 
-setClass ('RasterBrick',
-	contains = 'Raster',
-	representation (
-		data = 'MultipleRasterData',
-		title = 'character',
-		file = 'RasterFile',
-		sparse = 'logical',
-		history = 'vector'
-		),
-	prototype (
-		sparse = FALSE,
-		history = vector(mode='character')
-		),
-	validity = function(object)
-	{
-	}
-)
-	
 
-
-
 	
 setClass ('RasterStack',
 	contains = 'Raster',
@@ -195,6 +175,3 @@
 
 
 
-setClassUnion("RasterStackBrick", c("RasterStack", "RasterBrick"))
-
-#setClassUnion("SpatialPixelsGrid", c("SpatialPixels", "SpatialGrid"))

Deleted: pkg/raster/R/brick.create.R
===================================================================
--- pkg/raster/R/brick.create.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/brick.create.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -1,52 +0,0 @@
-
-
-newBrick <- function(xmn=-180, xmx=180, ymn=-90, ymx=90, nrows=180, ncols=360, projstring="+proj=longlat +datum=WGS84") {
-	bb <- newBbox(xmn, xmx, ymn, ymx)
-	return(brickFromBbox(bb, nrows=nrows, ncols=ncols, projstring))
-}
-
-brickFromBbox <- function(bndbox, nrows=1, ncols=1, projstring="") {
-	nrows = as.integer(round(nrows))
-	ncols = as.integer(round(ncols))
-	if (ncols < 1) { stop("ncols should be > 0") }
-	if (nrows < 1) { stop("nrows should be > 0") }
-	crs <- newCRS(projstring)
-	brick <- new("RasterBrick", bbox = getBbox(bndbox), crs=crs, ncols = ncols, nrows = nrows )
-	return(brick) 
-}
-
-brickFromStack <- function(stack) {
-	stop("not implemented yet")
-}
-
-brickFromFile <- function(filename, values=FALSE) {
-	stop("not implemented yet")
-}
-
-setGeneric("makeBrick", function(object, ...) standardGeneric("makeBrick"))
-
-setMethod('makeBrick', signature(object='RasterLayer'), function(object, ...)
-	{ 
-		RLlist <- list(...)
-		if (dataContent(object) != 'all'){stop("rasterBricks can only be created from RasterLayers with all data in memory")}
-		for (i in seq(along=object))
-		{
-			if (as(RLlist[[i]],"BasicRaster") != as(RLlist[[i]],"BasicRaster")){stop("RasterLayer objects are not equal in extent, resolution and/or projection")}
-			if (class(RLlist[[i]]) != "RasterLayer"){stop("function only implemented for objects of same class")}
-			if (dataContent(RLlist[[i]]) != 'all'){stop("rasterBricks can only be created when all RasterLayer data are in memory")}
-		}
-		datavalues <- matrix(nrow=ncell(object),ncol=1+length(RLlist))
-		datavalues[,1] <- values(object)
-		for (j in seq(along=object))
-		{
-			datavalues[,j+1] <- values(RLlist[[j]])		
-		}
-		brick <- new("RasterBrick", bbox = getBbox(object), crs=projection(object, asText = FALSE), ncols = ncol(object), nrows = nrow(object))
-		brick at data@values <- datavalues
-		brick at data@nlayers <- as.integer(1+length(RLlist))
-		brick at data@content <- "all"
-		return(brick)
-	}
-)
-
-#makeBrick should also be defined for signature Bbox, RasterStack, and even filename  could be considered.

Modified: pkg/raster/R/conversion.R
===================================================================
--- pkg/raster/R/conversion.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/conversion.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -3,17 +3,15 @@
 	function(from){ return(asSpGrid (from)) }
 )
 
-setAs('SpatialGridDataFrame', 'RasterBrick',
-	function(from){ return(asRasterBrick (from)) }
+
+setAs('SpatialGridDataFrame', 'RasterStack',
+	function(from){ return(asRasterStack (from)) }
 )
 
 setAs('SpatialGridDataFrame', 'RasterLayer', 
 	function(from){ return(asRasterLayer (from)) }
 )
 
-setAs('RasterBrick', 'RasterLayer', 
-	function(from){ return(asRasterLayer (from)) }
-)
 
 setAs('RasterStack', 'RasterLayer', 
 	function(from){ return(asRasterLayer (from)) }
@@ -61,7 +59,7 @@
 	}
 )
 
-setMethod('asRasterLayer', signature(object='RasterStackBrick', index='numeric'), 
+setMethod('asRasterLayer', signature(object='RasterStack', index='numeric'), 
 	function(object, index){
 		rs <- newRaster(xmn = xmin(object), xmx = xmax(object), ymn = ymin(object), ymx = ymax(object), nrows=nrow(object), ncols=ncol(object), projstring=projection(object))
 		if (dataContent(object) == 'all') {
@@ -109,11 +107,11 @@
 )
 
 
-asRasterBrick <- function(spgrid) {
-	brick <- newBrick()
-	brick <- setBbox(brick, getBbox(spgrid))
-	brick <- setProjection(brick, spgrid at proj4string)
-	brick <- setRowCol(brick, spgrid at grid@cells.dim[2], spgrid at grid@cells.dim[1])
+asRasterStack <- function(spgrid) {
+	stk <- new("RasterStack")
+	stk <- setBbox(stk, getBbox(spgrid))
+	stk <- setProjection(stk, spgrid at proj4string)
+	stk <- setRowCol(stk, spgrid at grid@cells.dim[2], spgrid at grid@cells.dim[1])
 
 	if (class(spgrid)=='SpatialPixels') {
 		# do noting, there is no data
@@ -121,16 +119,16 @@
 	} else if (class(spgrid)=='SpatialPixelsDataFrame') {
 		cells <- spgrid at grid.index
 		if (length(cells)==0) {
-			cells <- cellFromXY(brick, spgrid at coords)
+			cells <- cellFromXY(stk, spgrid at coords)
 		}
 		vals <- as.matrix(spgrid at data)
-		brick <- setValuesSparse(brick, cells, vals)
+		stk <- setValuesSparse(stk, cells, vals)
 	} else if ( class(spgrid)=='SpatialGrid' ) {
 		# do nothing, there is no data
 	} else if (class(spgrid)=='SpatialGridDataFrame' ) {
-		brick <- setValues(brick, as.matrix(spgrid at data))
+		stk <- setValues(stk, as.matrix(spgrid at data))
 	}
-	return(brick)
+	return(stk)
 }
 
 

Modified: pkg/raster/R/group.generic.functions.R
===================================================================
--- pkg/raster/R/group.generic.functions.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/group.generic.functions.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -67,7 +67,7 @@
 }
 
 .getAllTypeOfValues <- function(x, y, i) {
-	if ( (class(y) == 'RasterLayer' | class(y) == 'RasterStack' | class(y) == 'RasterBrick') & compare(c(x, y)) ) {			
+	if ( extends(class(y), "Raster") & compare(c(x, y)) ) {			
 		return(.getRasterValues(y))
 	} else if (is.atomic(y)) {
 		return(rep(y, ncell(x)))

Modified: pkg/raster/R/properties.R
===================================================================
--- pkg/raster/R/properties.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/properties.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -107,18 +107,11 @@
     }
 )
 
-setMethod('nlayers', signature(object='RasterBrick'), 
-	function(object){
-		return(object at data@nlayers) 
-    }
-)
 
 
 layers <- function(object) {
 	if (class(object) == "RasterLayer") {
 		return(filename(object))
-	} else 	if (class(object) == "RasterBrick") {
-		return(paste(filename(object), "with", nlayers(object), "layers"))
 	} else if (class(object) == "RasterStack") {
 		l <- vector('character')
 		for (i in 1:nlayers(object)) {
@@ -130,10 +123,10 @@
 
 
 band <- function(object) {
-	if (class(object) == "RasterBrick") {
-		return(-1)
-	} else {
+	if (class(object) == "RasterLayer") {
 		return(object at file@band)
+	} else {
+		stop("only implemented for RasterLayer objects")
 	}	
 }
 

Modified: pkg/raster/R/set.R
===================================================================
--- pkg/raster/R/set.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/set.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -30,8 +30,8 @@
 }
 
 setRaster <- function(object, filename="", values=NA) {
+
 	if (class(object) == 'RasterStack') { object <- asRasterLayer(object, 1) }
-	if (class(object) == 'RasterBrick') { object <- asRasterLayer(object, 1) }
 	if (class(object) != 'RasterLayer') { stop('the first argument should be a RasterLayer or a RasterStack object') }
 
 	filename <- trim(filename)

Modified: pkg/raster/R/show.R
===================================================================
--- pkg/raster/R/show.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/show.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -69,26 +69,6 @@
 )
 
 
-setMethod ('show' , 'RasterBrick',
-	function ( object ){
-		cat ('class     :' , class ( object ) , '\n')
-		cat ('filename  :' , filename(object), '\n')
-		cat ('nlayers   :' , nlayers(object), '\n')
-		cat ('nrow      :' , nrow(object), '\n')
-		cat ('ncol      :' , ncol(object), '\n')
-		cat ('ncells    :' , ncell(object), '\n')
-		cat ('projection:' , projection(object, TRUE), '\n')
-		cat ('xmin      :' , xmin(object), '\n')
-		cat ('xmax      :' , xmax(object), '\n')
-		cat ('ymin      :' , ymin(object), '\n')
-		cat ('ymax      :' , ymax(object), '\n')
-		cat ('xres      :' , xres(object) , '\n')
-		cat ('yres      :' , yres(object) , '\n')
-		cat ('\n')
-	}
-)
-
-
 setMethod ('show' , 'RasterStack',
 	function ( object ){
 		cat ('class     :' , class ( object ) , '\n')

Modified: pkg/raster/R/standard.generic.functions.R
===================================================================
--- pkg/raster/R/standard.generic.functions.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/standard.generic.functions.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -19,7 +19,7 @@
 
 
 
-setMethod('summary', signature(object='RasterStackBrick'), 
+setMethod('summary', signature(object='RasterStack'), 
 	function(object, ...) {
 		if (dataContent(object) == 'all') {
 			for (n in 1:nlayers(object)) {

Modified: pkg/raster/R/writeGDAL.R
===================================================================
--- pkg/raster/R/writeGDAL.R	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/R/writeGDAL.R	2009-01-25 06:24:08 UTC (rev 178)
@@ -16,7 +16,7 @@
 	
 # this is a RasterLayer hence nbands = 1:
     nbands = nlayers(raster)
-# but we keep this for later (stack, brick)
+# but we keep this for later (RatserStack)
 
 	raster <- setFilename(raster, trim(filename(raster)))
 	if (filename(raster) == "") {	stop('first provide a filename. E.g.: raster <- setFilename(raster, "c:/myfile")')	}

Modified: pkg/raster/man/cell.values.Rd
===================================================================
--- pkg/raster/man/cell.values.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/cell.values.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -12,7 +12,7 @@
 \title{Get raster properties}
 \description{
   cellValues and xyValues return a vector of values for specified cells or xy coordiates
-  minValue and maxValue return the extreme data values for a RasterLayer (or layer in a RasterStack or Brick)
+  minValue and maxValue return the extreme data values for a RasterLayer (or layer in a RasterStack)
 }
 
 \usage{

Modified: pkg/raster/man/classes.Rd
===================================================================
--- pkg/raster/man/classes.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/classes.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -7,18 +7,16 @@
 \alias{Raster-class}
 \alias{RasterLayer-class}
 \alias{RasterStack-class}
-\alias{RasterBrick-class}
 \alias{show,BoundingBox-method}
 \alias{show,BasicRaster-method}
 \alias{show,RasterLayer-method}
 \alias{show,RasterStack-method}
-\alias{show,RasterBrick-method}
 \alias{hist,Raster-method}
 \alias{plot,Raster,missing-method}
 \alias{plot,Raster,numeric-method}
 \alias{dim,BasicRaster-method}
 \alias{summary,RasterLayer-method}
-\alias{summary,RasterStackBrick-method}
+\alias{summary,RasterStack-method}
 \alias{[,RasterLayer-method}
 \alias{[<-,RasterLayer-method}
 \alias{[,RasterStack-method}
@@ -26,23 +24,22 @@
 \alias{[[<-,RasterLayer,ANY,missing-method}
 
 \title{Classes for handling raster data }
-\description{ \code{RasterLayer}, \code{RasterStack}, and \code{RasterBrick} (Raster* in short) are all classes for handling spatial raster (grid) data.
+\description{ \code{RasterLayer}, \code{RasterStack} (Raster* in short) are all classes for handling spatial raster (grid) data.
 
  RasterLayer represents a single layer raster.
- RasterStack represents a collection of RasterLayers with the same extent and resolution. 
- RasterBrick represents a single multi-layer raster.
+ RasterStack represents a collection of RasterLayers with the same extent and resolution; for example a multi-band remote sensing image. 
  
- The difference between a RasterStack is that it typically points to several seperate data files on disk, whereas a RasterBrick points to a single file on disk. (But both can also not point to any file at all)
+ The difference between a RasterStack is that it typically points to several seperate data files on disk, but it could also point to different bands from a single file (or not not point to any file at all)
  
  Apart from with the normal new(" ") method, objects can be created with the following functions (among others)
- newRaster(), RasterFromFile(), newBrick(), BrickFromFile(), StackFromFile(), StackFromRasters(), StackFromFiles()
+ newRaster(), RasterFromFile(), StackFromFile(), StackFromRasters(), StackFromFiles()
  
- RasterLayer and RasterBrick objects can also be created from SpatialPixels* and SpatialGrid* objects from the sp package: asRasterLayer(), asRasterBrick()
+ RasterLayer and RasterStack objects can also be created from SpatialPixels* and SpatialGrid* objects from the sp package: asRasterLayer(), asRasterStack()
  Vice versa, Raster* objects can be coerced into a sp type oject with asSpGrid(). You can also use SetAs() 
  
  generic methods implemented for these classes are: 
  \code{summary}, \code{show}, \code{dim}, \code{hist}, \code{plot} (with a single object as argument, and in the case of hist and plot, with additional ... parameters)
- \code{plot} can also be supplied with an additional numeric argument indicating the layer in a RasterStack or RasterBrick object that should be plotted (mapped)
+ \code{plot} can also be supplied with an additional numeric argument indicating the layer in a RasterStack object that should be plotted (mapped)
  \code{plot} can also be supplied with the two RasterLayer objects, creating a scatter plot (if they have matching extent and resolution)
  \code{[} is implemented for RasterLayer. It is equivalent to setValues() 
  
@@ -52,7 +49,7 @@
  In case you really want a Raster object, rather than one of its decendants, to work with you can easily create your own class that is the same (but not virtual) with a command like this:
 \code{setClass ('BasicRaster', contains = 'Raster')}
  Raster includes the \code{BoundingBox} class that is not virtual (e.g. see newBbox() )
- RasterLayer includes the classes \code{RasterFile} and \code{SingleLayerData}, whereas RasterStack and RasterBrick contain \code{RasterFile} and \code{MultipleLayerData}
+ RasterLayer includes the classes \code{RasterFile} and \code{SingleLayerData}, whereas RasterStack contains \code{RasterFile} and \code{MultipleLayerData}
  These classes are not further described here, because users should not need to directly access the slots in these classes. There are functions for that. Using these functions
  is much safer because a change in one slot should often affect the values in other slots. The 'setter' functions such as setValues take care of that. 
 

Modified: pkg/raster/man/coerce.Rd
===================================================================
--- pkg/raster/man/coerce.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/coerce.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -3,33 +3,33 @@
 \alias{asRasterLayer,character,missing-method}
 \alias{asRasterLayer,Raster,missing-method}
 \alias{asRasterLayer,RasterLayer,numeric-method}
-\alias{asRasterLayer,RasterStackBrick,numeric-method}
+\alias{asRasterLayer,RasterStack,numeric-method}
 \alias{asRasterLayer,SpatialPixels,missing-method}
 \alias{asRasterLayer,SpatialPixels,numeric-method}
 \alias{asRasterLayer,SpatialPixelsDataFrame,numeric-method}
 \alias{asRasterLayer,SpatialGridDataFrame,numeric-method}
 
 \alias{asRasterLayer}
-\alias{asRasterBrick}
+\alias{asRasterStack}
 \alias{asSpGrid}
 
 \title{ Coercion of Raster*, SpatialGrid and SpatialPixels* objects. }
 
 \description{  
 	Functions to coerce a Raster* objects into an sp SpatialGridDataFrame object and 
-	to coerce a RasterLayer or RasterBrick object from a sp SpatialPixels* or SpatialGrid* object
+	to coerce a RasterLayer or RasterStack object from a sp SpatialPixels* or SpatialGrid* object
 }
 
 \usage{
 asRasterLayer(object, index) 
-asRasterBrick(spgrid) 
+asRasterStack(spgrid) 
 asSpGrid(object, type='grid') 
 }
 
 \arguments{
   \item{object}{ a Raster* type object (SpatialPixel, SpatialPixelDataFrame , SpatialGrid, or SpatialGridDataFrame }
   \item{spgrid}{ a sp raster type object (SpatialPixel, SpatialPixelDataFrame , SpatialGrid, or SpatialGridDataFrame }
-  \item{index}{integer values >= 1 indicating the layer in the RasterStack or RasterBrick, or the column in the sp object dataframe to take the values from}
+  \item{index}{integer values >= 1 indicating the layer in the RasterStack, or the column in the sp object dataframe to take the values from}
   \item{type}{character. Indicating what type of sp object to return. Should be 'pixel' or 'grid'.}
 }
 

Deleted: pkg/raster/man/create.brick.Rd
===================================================================
--- pkg/raster/man/create.brick.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/create.brick.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -1,48 +0,0 @@
-\name{brick create}
-\alias{newBrick}
-\alias{brickFromBbox}
-\alias{brickFromFile}
-\alias{brickFromStack}
-
-\title{ Create a new RasterBrick object }
-\description{
-  These functions create new RasterBrick objects, either from scratch or from file.
-  The created object does not contain any cell (pixel) values, it only has the parameters that describe it.
-  See read* and values() for access to the values
-}
-\usage{
-	newBrick(xmn = -180, xmx = 180, ymn = -90, ymx = 90, nrows = 180, ncols = 360, projstring = "+proj=longlat +datum=WGS84")
-	brickFromBbox(bndbox, nrows = 1, ncols = 1, projstring="")
-	brickFromFile(filename, values=FALSE)
-	brickFromStack(stack)
-}
-
-\arguments{
-  \item{filename}{ name of raster data file  }
-  \item{xmn}{ minimum x coordinate or raster (left border) }
-  \item{xmx}{ maximum x coordinate of raster (right border) }
-  \item{ymn}{ minimum y coordinate or raster (bottom border) }
-  \item{ymx}{ maximum y coordinate of raster (top border) }
-  \item{nrows}{ number of rows on raster }
-  \item{ncols}{ number of columns on raster }
-  \item{projstring}{ PROJ4 type description of a map projection}
-  \item{bndbox}{bounding box used to create a brick. Can be any object that is or has a bounding box (see below) }
-  \item{values}{logical. If \code{TRUE}, RasterBrick values will be read into memory with 'readAll()'}
-  \item{stack}{ RasterStack object }
- }
-\details{
-  rasterFromFile uses "GDALinfo" from the rgdal package
-  see the rgdal help for supported file types
-}
-
-\value{
-  RasterBrick object
-}
-\author{Robert J. Hijmans \email{r.hijmans at gmail.com}}
-
-\seealso{  \code{\link[gdal]{rgdal}} }
-\examples{
-  b1 <- newBrick(nrows=1080, ncols=2160)
-  b1
-}
-\keyword{ spatial }

Modified: pkg/raster/man/mCalc.Rd
===================================================================
--- pkg/raster/man/mCalc.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/mCalc.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -3,7 +3,7 @@
 
 \title{ multiple layers calculate }
 \description{
-  Calculate values for a new raster, from multiple existing RasterLayers (RasterStack or RasterBrick)
+  Calculate values for a new raster from the layers in a RasterStack
 }
 
 \usage{
@@ -11,7 +11,7 @@
 }
 
 \arguments{
-  \item{object}{ a RasterStack or RasterBrick object }
+  \item{object}{ a RasterStack object }
   \item{fun}{ the function to be applied }
   \item{filename}{ output filename for a new raster; if NA the result is not written to a file but returned with the RasterLayer object, in the data slot }
   \item{overwrite}{ logical to indicate whether an existing output file should be overwritten }

Deleted: pkg/raster/man/makeBrick.Rd
===================================================================
--- pkg/raster/man/makeBrick.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/makeBrick.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -1,16 +0,0 @@
-\name{makeBrick}
-\docType{methods}
-\alias{makeBrick}
-\alias{makeBrick-methods}
-\alias{makeBrick,RasterLayer-method}
-\title{ Create a RasterBrick object}
-\description{
- RasterBrick can be created from several objects.
-}
-\section{Methods}{
-\describe{
-
-\item{object = "RasterLayer"}{ make a RasterBrick from one or more RasterLayers }
-}}
-\keyword{methods}
-\keyword{spatial}

Modified: pkg/raster/man/properties.Rd
===================================================================
--- pkg/raster/man/properties.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/properties.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -24,7 +24,6 @@
 \alias{nlayers}
 \alias{nlayers,BasicRaster-method}
 \alias{nlayers,Raster-method}
-\alias{nlayers,RasterBrick-method}
 \alias{nlayers,RasterStack-method}
 \alias{layers}
 \alias{band}

Modified: pkg/raster/man/read.Rd
===================================================================
--- pkg/raster/man/read.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/read.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -17,7 +17,7 @@
 
 
 \title{Read values from disk}
-\description{Read values from a raster file associated with a RasterLayer, RasterStack or RasterBrick object into memory.
+\description{Read values from a raster file associated with a RasterLayer or RasterStack object into memory.
 You can either read all the data (memory permitting), or read data by row, part of row, block, by cellnumber, or for (x,y) coordinates. Data can be read from 'native raster' binary files, as well as for other formats that are supported by the rgdal package.
 }
 

Modified: pkg/raster/man/values.Rd
===================================================================
--- pkg/raster/man/values.Rd	2009-01-24 09:20:28 UTC (rev 177)
+++ pkg/raster/man/values.Rd	2009-01-25 06:24:08 UTC (rev 178)
@@ -9,7 +9,7 @@
 \description{
   values returns cell values for a Raster* object (typically after read* has been used). 
   valuesRow returns values for a row of values in the case that all values are in memory (if they are on disk, use readRow() and values())
-  minValue and maxValue return the extreme data values for a RasterLayer (or layer in a RasterStack or Brick)
+  minValue and maxValue return the extreme data values for a RasterLayer (or layer in a RasterStack)
 }
 
 \usage{
@@ -25,7 +25,7 @@
   \item{format}{use \code{vector} to get the data as a single vector or \code{matrix} to get them as a matrix}
   \item{names}{If TRUE, row and col names are provided}
   \item{rownr}{The rownumber for which values are returned}
-  \item{layer}{layer number (for RasterStack and RasterBrick objects}
+  \item{layer}{layer number (for RasterStack objects}
 }
   
 



More information about the Raster-commits mailing list