[r-cran-maptools] 17/20: Import Upstream version 0.8-40+dfsg
Andreas Tille
tille at debian.org
Sun Jan 15 18:55:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-maptools.
commit 344deecc6de760c900e1632c348c01e2aeebb2e9
Author: Andreas Tille <tille at debian.org>
Date: Sun Jan 15 19:53:32 2017 +0100
Import Upstream version 0.8-40+dfsg
---
ChangeLog | 9 +++++++++
DESCRIPTION | 10 +++++-----
MD5 | 16 ++++++++--------
R/AAA.R | 11 +++++++++--
build/vignette.rds | Bin 223 -> 225 bytes
inst/ChangeLog | 9 +++++++++
inst/doc/combine_maptools.pdf | Bin 451411 -> 444303 bytes
man/nowrapSpatialLines.Rd | 2 +-
8 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c705e72..ac7da39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-11-13 19:29 rsbivand
+
+ * DESCRIPTION, R/AAA.R, data/wrld_simpl.rda: cache on load not
+ attach; Untied ...
+
+2016-01-29 08:38 rsbivand
+
+ * ChangeLog, inst/ChangeLog: tidy
+
2016-01-28 13:48 rsbivand
* DESCRIPTION, R/kmlPoints.R, man/kmlPoints.Rd, man/wrld_simpl.Rd,
diff --git a/DESCRIPTION b/DESCRIPTION
index f710061..19b291d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
Package: maptools
-Version: 0.8-39
-Date: 2016-01-28
+Version: 0.8-40
+Date: 2016-11-14
Title: Tools for Reading and Handling Spatial Objects
Authors at R: c(
person("Roger", "Bivand", role = c("cre", "aut"), email = "Roger.Bivand at nhh.no"),
@@ -40,11 +40,11 @@ Imports: foreign (>= 0.8), methods, grid, lattice, stats, utils,
Suggests: rgeos (>= 0.1-8), spatstat (>= 1.18), PBSmapping, maps,
RColorBrewer, raster, polyclip
Enhances: gpclib, RArcInfo
-Description: Set of tools for manipulating and reading geographic data, in particular ESRI shapefiles; C code used from shapelib. It includes binary access to GSHHG shoreline files. The package also provides interface wrappers for exchanging spatial objects with packages such as PBSmapping, spatstat, maps, RArcInfo, Stata tmap, WinBUGS, Mondrian, and others.
+Description: Set of tools for manipulating and reading geographic data, in particular 'ESRI Shapefiles'; C code used from 'shapelib'. It includes binary access to 'GSHHG' shoreline files. The package also provides interface wrappers for exchanging spatial objects with packages such as 'PBSmapping', 'spatstat', 'maps', 'RArcInfo', 'Stata tmap', 'WinBUGS', 'Mondrian', and others.
License: GPL (>= 2)
URL: http://r-forge.r-project.org/projects/maptools/
NeedsCompilation: yes
-Packaged: 2016-01-29 08:38:18 UTC; rsb
+Packaged: 2016-11-15 10:52:21 UTC; rsb
Author: Roger Bivand [cre, aut],
Nicholas Lewin-Koh [aut],
Edzer Pebesma [ctb],
@@ -77,4 +77,4 @@ Author: Roger Bivand [cre, aut],
Rolf Turner [ctb]
Maintainer: Roger Bivand <Roger.Bivand at nhh.no>
Repository: CRAN
-Date/Publication: 2016-01-30 00:08:33
+Date/Publication: 2016-11-15 14:17:59
diff --git a/MD5 b/MD5
index 0fb74c5..ac30753 100644
--- a/MD5
+++ b/MD5
@@ -1,7 +1,7 @@
-88bb01d7ff9cbe9670db7e17ae7823ef *ChangeLog
-14ca7484164b6e375571b2c3f3d32d1b *DESCRIPTION
+dd6a2179f11be8986db63276df27700d *ChangeLog
+931ac5299c8cf7e180ac92289a2c5890 *DESCRIPTION
4d4a9bdb4985c6a95a4b81c62a35a446 *NAMESPACE
-c7584403c09826f9a2f952d28541b2ec *R/AAA.R
+3e564b20f31570f99adea4d0d58ee09f *R/AAA.R
1399d0064b46e6e6c90600b1b64a5e19 *R/CCmaps.R
d7210b92daad70dc7a3f7b10f676ccff *R/DP.R
b52e6bfd6272c6c26bec32d86332d830 *R/GE_png.R
@@ -52,17 +52,17 @@ beb695c582d1c3aaa519cedd375e2c38 *R/subset.R
7149e328828e259e39b14f0a2bdf5c1b *R/sun.R
7abdc8ab97cb14f48d1c2fd8962148a2 *R/union.R
89e84c8fec40a5e2d0482ae8642a5244 *R/zzz.R
-e76534459020e69c4f18f90ee36a470d *build/vignette.rds
+b4a69fb18edaede01414e495b4b89cba *build/vignette.rds
d0b8c2ac5cb2ac40fff68a7b329df381 *data/SplashDams.rda
ad794d2bb004f79c29d6d20a9341a0ec *data/gpcholes.rda
f58d7bbadb55463c773ef91b74f7e6cf *data/state.vbm.rda
-6986d6b0b1be13fff069ed7ad55c6184 *data/wrld_simpl.rda
-88bb01d7ff9cbe9670db7e17ae7823ef *inst/ChangeLog
+09ee055ece6058a49d5146c6ced84325 *data/wrld_simpl.rda
+dd6a2179f11be8986db63276df27700d *inst/ChangeLog
9dcaa361f3f79d17885b738121fc669e *inst/README
0d1e185186bdb70959760c0a63f7be4f *inst/changes
b358c2168f0fb80129000e8a46943a49 *inst/doc/combine_maptools.R
2e20fa712d38ce5c0670ee48a2459ee3 *inst/doc/combine_maptools.Rnw
-ac3e9abb1871d168c679b7f3cf979c74 *inst/doc/combine_maptools.pdf
+12140e3903670d9eabee2947cd07eeec *inst/doc/combine_maptools.pdf
ef247b6c335e75e48f81da7ef7554fa6 *inst/grids/simple.ag
15c2101eb916ea116f400d560f73dd7c *inst/grids/test.ag
17238eca9084a1321e2dc9a719ef8dd6 *inst/shapes/Testing.kml
@@ -129,7 +129,7 @@ c5f20bfb6b29271ed4868200d37d5b95 *man/lineLabel.Rd
faeaff841d01f23c46e359dcac2f95e0 *man/nearestPointOnLine.Rd
4c4dfe73ec4e6c87be454a6f0cb53f0a *man/nearestPointOnSegment.Rd
c36646e1bfddab22e519229756e230d2 *man/nowrapRecenter.Rd
-c7076249d8e47f81debbb586b017e12d *man/nowrapSpatialLines.Rd
+62d2ebe7e9ebeaf23e448d53397fd250 *man/nowrapSpatialLines.Rd
e941e4c0fe856263cca3eeafd3a81c09 *man/pal2SpatialPolygons.Rd
2192d5eded3e8cea9af4c39a6c90fb50 *man/pointLabelBase.Rd
742213470de35c3663880b6e44dc6479 *man/pointLabelLattice.Rd
diff --git a/R/AAA.R b/R/AAA.R
index 7b4a189..ecad65b 100644
--- a/R/AAA.R
+++ b/R/AAA.R
@@ -4,10 +4,17 @@
# assign("gpclib", FALSE, envir=.MAPTOOLS_CACHE)
#}
-.onAttach <- function(lib, pkg) {
+.onLoad <- function(lib, pkg) {
assign("gpclib", FALSE, envir=.MAPTOOLS_CACHE)
- Smess <- paste("Checking rgeos availability: ")
rgeosI <- setRgeosStatus()
+ invisible(NULL)
+}
+
+.onAttach <- function(lib, pkg) {
+# assign("gpclib", FALSE, envir=.MAPTOOLS_CACHE)
+ Smess <- paste("Checking rgeos availability: ")
+# rgeosI <- setRgeosStatus()
+ rgeosI <- rgeosStatus()
Smess <- paste(Smess, rgeosI, "\n", sep="")
if (!rgeosI) Smess <- paste(Smess,
"\tNote: when rgeos is not available, polygon geometry",
diff --git a/build/vignette.rds b/build/vignette.rds
index d64f01f..c2e5c5c 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/inst/ChangeLog b/inst/ChangeLog
index c705e72..ac7da39 100644
--- a/inst/ChangeLog
+++ b/inst/ChangeLog
@@ -1,3 +1,12 @@
+2016-11-13 19:29 rsbivand
+
+ * DESCRIPTION, R/AAA.R, data/wrld_simpl.rda: cache on load not
+ attach; Untied ...
+
+2016-01-29 08:38 rsbivand
+
+ * ChangeLog, inst/ChangeLog: tidy
+
2016-01-28 13:48 rsbivand
* DESCRIPTION, R/kmlPoints.R, man/kmlPoints.Rd, man/wrld_simpl.Rd,
diff --git a/inst/doc/combine_maptools.pdf b/inst/doc/combine_maptools.pdf
index ae2fad0..2ca804e 100644
Binary files a/inst/doc/combine_maptools.pdf and b/inst/doc/combine_maptools.pdf differ
diff --git a/man/nowrapSpatialLines.Rd b/man/nowrapSpatialLines.Rd
index e72a957..c4d27ca 100644
--- a/man/nowrapSpatialLines.Rd
+++ b/man/nowrapSpatialLines.Rd
@@ -26,13 +26,13 @@ nowrapSpatialLines(obj, offset = 0, eps = rep(.Machine$double.eps^(1/2.5), 2))
Sl <- SpatialLines(list(Lines(list(Line(cbind(sin(seq(-4,4,0.4)),
seq(1,21,1)))), "1")), proj4string=CRS("+proj=longlat +ellps=WGS84"))
summary(Sl)
+if (require(rgeos)) {
nwSL <- nowrapSpatialLines(Sl)
summary(nwSL)
if(require(maps)) {
worldmap <- map("world", plot=FALSE)
worldmapLines <- map2SpatialLines(worldmap, proj4string=CRS("+proj=longlat +datum=WGS84"))
bbox(worldmapLines)
-if (require(rgeos)) {
t0 <- nowrapSpatialLines(worldmapLines, offset=180)
bbox(t0)
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maptools.git
More information about the debian-science-commits
mailing list