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

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

Author: rhijmans
Date: 2009-08-05 03:09:06 +0200 (Wed, 05 Aug 2009)
New Revision: 466

Modified:
   pkg/raster/DESCRIPTION
   pkg/raster/R/map.R
   pkg/raster/R/plot.R
Log:


Modified: pkg/raster/DESCRIPTION
===================================================================
--- pkg/raster/DESCRIPTION	2009-08-05 00:46:22 UTC (rev 465)
+++ pkg/raster/DESCRIPTION	2009-08-05 01:09:06 UTC (rev 466)
@@ -1,8 +1,8 @@
 Package: raster
 Type: Package
 Title: Raster data handling for geographic data analysis and modeling
-Version: 0.8.9-21
-Date: 23-May-2009
+Version: 0.8.9-22
+Date: 4-August-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/R/map.R
===================================================================
--- pkg/raster/R/map.R	2009-08-05 00:46:22 UTC (rev 465)
+++ pkg/raster/R/map.R	2009-08-05 01:09:06 UTC (rev 466)
@@ -64,7 +64,7 @@
 	
 	z[is.infinite(z)] <- NA
 	
-	.imageplot(x, y, z, col=col, axes = axes, xlab=xlab, ylab=ylab, ...)
+	.imageplot(x, y, z, col=col, axes=axes, xlab=xlab, ylab=ylab, ...)
 	if (addbox) {box()}
 }	
 

Modified: pkg/raster/R/plot.R
===================================================================
--- pkg/raster/R/plot.R	2009-08-05 00:46:22 UTC (rev 465)
+++ pkg/raster/R/plot.R	2009-08-05 01:09:06 UTC (rev 466)
@@ -6,11 +6,8 @@
 
 
 setMethod("plot", signature(x='RasterStack', y='ANY'), 
-	function(x, y, col=rev(terrain.colors(255)), subsample=TRUE, maxdim=500, addbox=TRUE, ...)  {
-	if(axes == NULL){axes <- TRUE}
-	if(xlab == NULL) {xlab <- ""} 
-	if(ylab == NULL) {ylab <- ""}
-	if (missing(y)) {
+	function(x, y, col=rev(terrain.colors(255)), subsample=TRUE, maxdim=500, addbox=TRUE, axes = TRUE, xlab="", ylab="", ...)  {
+		if (missing(y)) {
 			nl <- nlayers(x)
 			if (nl > 12) {
 				warning('only first 12 layers are plotted')