[Raster-commits] r174 - pkg/raster/R

[noreply at r-forge.r-project.org]

Author: rhijmans
Date: 2009-01-22 10:50:02 +0100 (Thu, 22 Jan 2009)
New Revision: 174

Modified:
   pkg/raster/R/Merge.R
   pkg/raster/R/aggregate.R
   pkg/raster/R/calc.R
   pkg/raster/R/crop.R
   pkg/raster/R/neighborhood.R
   pkg/raster/R/writeRaster.R
Log:


Modified: pkg/raster/R/Merge.R
===================================================================
--- pkg/raster/R/Merge.R	2009-01-22 08:04:22 UTC (rev 173)
+++ pkg/raster/R/Merge.R	2009-01-22 09:50:02 UTC (rev 174)
@@ -78,7 +78,7 @@
 		}
 		if (filename(outraster) != '') {
 			outraster <- setValues(outraster, rd, r)
-			outraster <- writeRaster(outraster, overwrite)
+			outraster <- writeRaster(outraster, overwrite=overwrite)
 		} else {
 			v <- c(v, rd)
 		}

Modified: pkg/raster/R/aggregate.R
===================================================================
--- pkg/raster/R/aggregate.R	2009-01-22 08:04:22 UTC (rev 173)
+++ pkg/raster/R/aggregate.R	2009-01-22 09:50:02 UTC (rev 174)
@@ -78,7 +78,7 @@
 				v <- c(v, vals)
 			} else {
 				outraster <- setValues(outraster, vals, r)
-				outraster <- writeRaster(outraster, overwrite)
+				outraster <- writeRaster(outraster, overwrite=overwrite)
 			}
 		} 
 		if (filename(outraster) == "") { 

Modified: pkg/raster/R/calc.R
===================================================================
--- pkg/raster/R/calc.R	2009-01-22 08:04:22 UTC (rev 173)
+++ pkg/raster/R/calc.R	2009-01-22 09:50:02 UTC (rev 174)
@@ -60,7 +60,7 @@
 			object <- readRow(object, r)
 			vals <- apply(values(object), 1, fun)
 			outraster <- setValues(outraster, vals, r) 
-			outraster <- writeRaster(outraster, overwrite)
+			outraster <- writeRaster(outraster, overwrite=overwrite)
 		}
 	}		
 	return(outraster)

Modified: pkg/raster/R/crop.R
===================================================================
--- pkg/raster/R/crop.R	2009-01-22 08:04:22 UTC (rev 173)
+++ pkg/raster/R/crop.R	2009-01-22 09:50:02 UTC (rev 174)
@@ -44,7 +44,7 @@
 				v <- c(v, values(raster))
 			} else {
 				outraster <- setValues(outraster, values(raster), rownr)
-				outraster <- writeRaster(outraster, overwrite)
+				outraster <- writeRaster(outraster, overwrite=overwrite)
 			}	
 			rownr <- rownr + 1
 		} 

Modified: pkg/raster/R/neighborhood.R
===================================================================
--- pkg/raster/R/neighborhood.R	2009-01-22 08:04:22 UTC (rev 173)
+++ pkg/raster/R/neighborhood.R	2009-01-22 09:50:02 UTC (rev 174)
@@ -68,7 +68,7 @@
 			ngbvals <- .calc.ngb(ngbdata, ngb, fun, keepdata)
 			if (filename != "") {
 				ngbgrid <- setValues(ngbgrid, ngbvals, rr)
-				ngbgrid <- writeRaster(ngbgrid, overwrite)
+				ngbgrid <- writeRaster(ngbgrid, overwrite=overwrite)
 			} else {
 				v <- c(v, ngbvals)
 			}
@@ -82,7 +82,7 @@
 		ngbvals <- .calc.ngb(ngbdata, ngb, fun, keepdata)
 		if (filename != "") {
 			ngbgrid <- setValues(ngbgrid, ngbvals, rr)
-			ngbgrid <- writeRaster(ngbgrid, overwrite)
+			ngbgrid <- writeRaster(ngbgrid, overwrite=overwrite)
 		} else {
 			v <- c(v, ngbvals)
 		}

Modified: pkg/raster/R/writeRaster.R
===================================================================
--- pkg/raster/R/writeRaster.R	2009-01-22 08:04:22 UTC (rev 173)
+++ pkg/raster/R/writeRaster.R	2009-01-22 09:50:02 UTC (rev 174)
@@ -35,12 +35,12 @@
 
 	if (format=='raster') {
 		if (dataContent(raster) == 'row' ) {
-			raster <- .writeRasterRow(raster, overwrite)
+			raster <- .writeRasterRow(raster, overwrite=overwrite)
 		} else {
-			raster <- .writeRasterAll(raster, overwrite)
+			raster <- .writeRasterAll(raster, overwrite=overwrite)
 		}  
 	} else if (format=='ascii') {
-		raster <- .writeAscii(raster, overwrite)
+		raster <- .writeAscii(raster, overwrite=overwrite)
 	} else { 
 		.isSupportedGDALFormat(format)
 		if (dataContent(raster) == 'row' ) {
@@ -104,7 +104,7 @@
 	}
 
 	if (raster at data@content == 'sparse') { 
-		raster <- .writeSparse(raster, overwrite) 
+		raster <- .writeSparse(raster, overwrite=overwrite) 
 	} else {
 		binraster <- .setFileExtensionValues(filename(raster))
 		con <- file(binraster, "wb")
@@ -156,7 +156,7 @@
 		raster at data@values  <- as.numeric(values(raster)) 
 	}
 	if (dataIndices(raster)[1] == 1) { 
-		raster <- ..startWriting(raster, overwrite)
+		raster <- ..startWriting(raster, overwrite=overwrite)
  	} 
 	
 	raster at data@values[is.nan(raster at data@values)] <- NA