[r-cran-maps] 23/64: Import Upstream version 2.0-40

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-maps.

commit 814b105dfdaf2dd57db0a0c296ebfc5a2a339d99
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:26:18 2017 +0200

    Import Upstream version 2.0-40
---
 DESCRIPTION | 6 +++---
 R/misc.r    | 3 ++-
 R/polygon.r | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 9afc3ad..c0c59b1 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.0-39
-Date: 2007-10-14
+Version: 2.0-40
+Date: 2008-04-17
 Author: Original S code by Richard A. Becker and Allan R. Wilks.
 	R version by Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
         Enhancements by Thomas P Minka <surname at stat.cmu.edu>
@@ -12,4 +12,4 @@ LazyLoad: yes
 Suggests: mapproj
 License: GPL2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
-Packaged: Sun Oct 14 11:00:16 2007; root
+Packaged: Thu Apr 17 09:52:34 2008; ray
diff --git a/R/misc.r b/R/misc.r
index 0a1b17e..3c3be5a 100644
--- a/R/misc.r
+++ b/R/misc.r
@@ -31,7 +31,8 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
     parameters = NULL, orientation = NULL, ...) 
 {
     if (missing(x)) {
-        data(world.cities, package = "maps")	# uses lazy evaluation
+        data("world.cities", package = "maps")	# uses lazy evaluation
+	world.cities <- get("world.cities")
     }
     usr <- par("usr")
     if (!missing(projection) && projection != FALSE) {
diff --git a/R/polygon.r b/R/polygon.r
index 69adbaa..88fd98e 100644
--- a/R/polygon.r
+++ b/R/polygon.r
@@ -141,6 +141,7 @@ map.text <- function(database, regions = ".", labels, cex = 0.75, add = FALSE,
   x <- t(array(unlist(x), c(2, length(x))))
   if(move) {
     # require(mining)
+    move.collisions2 <- get("move.collisions2")	# to prevent check NOTE
     w = strwidth(labels, units = "inches", cex = cex)
     h = strheight(labels, units = "inches", cex = cex)
     x = move.collisions2(x[, 1], x[, 2], w, h)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maps.git