'things'

Author: rhijmans

.Rbuildignore

@@ -1,3 +1,4 @@
 .gitignore
 LICENSE
-README.md
+README.md
+revdep

.gitignore

@@ -8,3 +8,4 @@
 *.dll
 *.zip
 .Rproj.user
+revdep

R/bind.R

@@ -351,3 +351,13 @@ setMethod('bind', signature(x='SpatialPoints', y='SpatialPoints'),
 )
 
 
+
+setMethod('bind', signature(x='list', y='missing'),
+	function(x, y, ..., keepnames=FALSE) {
+		if (length(x) < 2) { return(unlist(x)) }
+		names(x)[1:2] <- c('x', 'y')
+		x$keepnames <- keepnames
+		do.call(bind, x)
+	}
+)
+

R/rasterOptions.R

@@ -416,8 +416,12 @@ tmpDir <- function(create=TRUE) {
 }
 
 
-.datatype <- function(..., datatype) {
-	if (missing(datatype)) { 
+.datatype <- function(..., datatype, dataType) {
+
+	if (missing(datatype) && !missing(dataType)) { 
+		warning('argument "datatype" misspelled as "dataType"')
+		datatype <- dataType
+	} else if (missing(datatype)) { 
 		datatype <- getOption('rasterDatatype')
 		if (is.null(datatype)) {
 			return('FLT4S') 

README.md

@@ -14,7 +14,7 @@ If you are windows, you need to first install [Rtools](https://cran.r-project.or
 
 On [rspatial.org](http://rspatial.org/) you can learn about spatial data analysis with R.
 
-[stackoverflow](https://stackoverflow.com/) is the best place to ask questions of you get stuck. Make sure to include a simple reproducible example. 
+[stackoverflow](https://stackoverflow.com/) is the best place to ask questions of you get stuck. Make sure to include a [https://stackoverflow.com/questions/5963269/how-to-make-a-great-r-reproducible-example](simple reproducible example). 
 
 Please send me an email if you have a bug report. See `maintainer("raster")` for the email address.
 

man/Rcpp-classes.Rd

@@ -3,15 +3,16 @@
 \docType{class}
 
 
-\alias{SpExtent}
 \alias{SpPoly}
 \alias{SpPolyPart}
 \alias{SpPolygons}
 \alias{SpExtent}
+
 \alias{SpPoly-class}
 \alias{SpPolyPart-class}
 \alias{SpPolygons-class}
 \alias{Rcpp_SpExtent-class}
+
 \alias{Rcpp_SpPolygons-class}
 \alias{Rcpp_SpPoly-class}
 \alias{Rcpp_SpPolyPart-class}

man/bind.Rd

@@ -3,13 +3,16 @@
 \docType{methods}
 
 \alias{bind}
+
 \alias{bind,SpatialPolygons,SpatialPolygons-method}
 \alias{bind,SpatialLines,SpatialLines-method}
 \alias{bind,SpatialPoints,SpatialPoints-method}
 \alias{bind,matrix,matrix-method}
 \alias{bind,matrix,missing-method}
 \alias{bind,data.frame,data.frame-method}
 \alias{bind,data.frame,missing-method}
+\alias{bind,list,missing-method}
+
 
 \title{ 
 Bind Spatial* objects
@@ -27,12 +30,14 @@ Bind (append) Spatial* objects into a single object. All objects must be of the
 \S4method{bind}{SpatialPoints,SpatialPoints}(x, y, ..., keepnames=FALSE)
 
 \S4method{bind}{data.frame,data.frame}(x, y, ..., variables=NULL)
+
+\S4method{bind}{list,missing}(x, y, ..., keepnames=FALSE)
 }
 
 
 \arguments{
- \item{x}{Spatial* object or data.frame}
- \item{y}{Spatial* object or data.frame}
+ \item{x}{Spatial* object or data.frame, or a list of Spatial* objects}
+ \item{y}{Spatial* object or data.frame, or missing}
  \item{...}{Additional Spatial* objects}
  \item{keepnames}{Logical. If \code{TRUE} the row.names are kept (if unique)} 
  \item{variables}{character. Variable (column) names to keep, If \code{NULL}, all variables are kept} 

src/rasterize.cpp

@@ -1,4 +1,6 @@
 /* Robert Hijmans, June 2011, July 2016
+// Based on  public-domain code by Darel Rex Finley, 2007
+// http://alienryderflex.com/polygon_fill/
 
 */
 #include <Rcpp.h>
@@ -36,9 +38,9 @@ std::vector<double> rasterize_polygon(std::vector<double> r, double value, std::
 			if (nCol[i] >= ncols) break;
 			if (nCol[i+1] > 0) {
 				if (nCol[i] < 0) nCol[i]=0 ;
-				if (nCol[i+1] >= ncols) nCol[i+1] = ncols-1;
+				if (nCol[i+1] >= ncols) nCol[i+1] = ncols;
 				int ncell = ncols * row;
-				for (size_t col = nCol[i]; col <= nCol[i+1]; col++) {
+				for (size_t col = nCol[i]; col < nCol[i+1]; col++) {
 					r[col + ncell] = value;
 				}
 			}