Skip to content

Commit a199b09

Browse files
committed
next
1 parent 789bea9 commit a199b09

File tree

7 files changed

+21
-23
lines changed

7 files changed

+21
-23
lines changed

ChangeLog

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Improved estimation of available RAM with contributions by Lorenzo Busetto. RAM
1616
testthat unit tests introduced by Mike Sumner and Jakub Nowosad
1717
as.character() for Raster objects to create the R code to re-create the Raster skeleton in examples.
1818

19-
reading point values via GDAL has become slower in 2.7-15, reverted to previous function
19+
Reading point values via GDAL has become slower in 2.7-15, reverted to previous function.
2020

2121
Bug fixes:
2222
fixed the link for GADM countries download. Bug reported by Loic Dutrieux

DESCRIPTION

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
Package: raster
22
Type: Package
33
Title: Geographic Data Analysis and Modeling
4-
Version: 2.8-4
4+
Version: 2.8-5
55
Date: 2018-11-02
66
Depends: methods, sp (>= 1.2-0), R (>= 3.0.0)
77
Suggests: rgdal (>= 0.9-1), rgeos (>= 0.3-8), ncdf4, igraph, tcltk, parallel, rasterVis, MASS, sf, testthat
88
LinkingTo: Rcpp
99
Imports: Rcpp
1010
SystemRequirements: C++11
1111
Authors@R: c(
12-
person("Robert J.", "Hijmans", role = c("cre", "aut"), email = "[email protected]"),
12+
person("Robert J.", "Hijmans", role = c("cre", "aut"),
13+
email = "[email protected]",
14+
comment = c(ORCID = "0000-0001-5872-2872")),
1315
person("Jacob", "van Etten", role = "ctb"),
1416
person("Joe", "Cheng", role = "ctb"),
1517
person("Michael", "Sumner", role = "ctb"),

inst/external/lux.dbf

169 Bytes
Binary file not shown.

inst/external/lux.rds

37.4 KB
Binary file not shown.

man/bind.Rd

+8-10
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ Spatial* object
5252

5353

5454
\examples{
55-
if (require(rgdal) & require(rgeos)) {
56-
p <- shapefile(system.file("external/lux.shp", package="raster"))
57-
mersch <- p[p$NAME_2=='Mersch', ]
58-
diekirch <- p[p$NAME_2=='Diekirch', ]
59-
remich <- p[p$NAME_2=='Remich', ]
60-
remich$NAME_1 <- NULL
61-
x <- bind(mersch, diekirch, remich)
62-
plot(x)
63-
data.frame(x)
64-
}
55+
p <- readRDS(system.file("external/lux.rds", package="raster"))
56+
mersch <- p[p$NAME_2=='Mersch', ]
57+
diekirch <- p[p$NAME_2=='Diekirch', ]
58+
remich <- p[p$NAME_2=='Remich', ]
59+
remich$NAME_1 <- NULL
60+
x <- bind(mersch, diekirch, remich)
61+
plot(x)
62+
data.frame(x)
6563
}
6664

6765
\keyword{methods}

man/geom.Rd

+7-9
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@ Matrix with 6, (5 SpatialLines), or 3 (SpatialPoints) columns. object (sequentia
3333

3434

3535
\examples{
36-
if (require(rgdal) & require(rgeos)) {
37-
p <- shapefile(system.file("external/lux.shp", package="raster"))
38-
x <- geom(p)
39-
head(x)
36+
p <- readRDS(system.file("external/lux.rds", package="raster"))
37+
x <- geom(p)
38+
head(x)
4039

4140
# and back to a SpatialPolygonsDataFrame
42-
x <- data.frame(x)
43-
sp <- as(x, "SpatialPolygons")
44-
crs(sp) <- crs(p)
45-
spdf <- SpatialPolygonsDataFrame(sp, data.frame(p), match.ID=FALSE)
46-
}
41+
x <- data.frame(x)
42+
sp <- as(x, "SpatialPolygons")
43+
crs(sp) <- crs(p)
44+
spdf <- SpatialPolygonsDataFrame(sp, data.frame(p), match.ID=FALSE)
4745
}
4846

4947
\keyword{methods}

man/spEasy.Rd

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ a <- spLines(x1, x2, x3)
3535
b <- spLines(x1, list(x2, x3), attr=data.frame(id=1:2), crs='+proj=longlat +datum=WGS84')
3636
b
3737

38-
hole <- rbind(c(-150,-20), c(-100,-10), c(-110,20))
38+
hole <- rbind(c(-150,-20), c(-100,-10), c(-110,20), c(-130,10))
3939
d <- spPolygons(list(x1,hole), x2, list(x3, x4))
4040

4141
att <- data.frame(ID=1:3, name=c('a', 'b', 'c'))

0 commit comments

Comments
 (0)