[r-cran-maps] 48/64: Import Upstream version 2.3-9

[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 65f8b097617e2f91f97caa09e1e6fc1825e7a86d
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:27:34 2017 +0200

    Import Upstream version 2.3-9
---
 DESCRIPTION           |   8 ++++----
 MD5                   |   6 +++---
 R/misc.r              |  14 +++++++-------
 data/world.cities.rda | Bin 510620 -> 509268 bytes
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 44a88f7..fbe7278 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.3-7
-Date: 2014-06-03
+Version: 2.3-9
+Date: 2014-09-22
 Author: Original S code by Richard A. Becker and Allan R. Wilks.
 	R version by Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>.
         Enhancements by Thomas P Minka <tpminka at media.mit.edu>
@@ -12,7 +12,7 @@ LazyLoad: yes
 Suggests: mapproj (>= 1.2-0)
 License: GPL-2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
-Packaged: 2014-06-03 00:23:44 UTC; ray
+Packaged: 2014-09-22 03:27:30 UTC; ray
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2014-06-03 07:13:43
+Date/Publication: 2014-09-22 08:37:18
diff --git a/MD5 b/MD5
index 0d7e604..3ffd050 100644
--- a/MD5
+++ b/MD5
@@ -1,8 +1,8 @@
-d7a5ae3ed874f0bd68501ffe28146510 *DESCRIPTION
+e8cfae7ed39383c1030b8394cbb51e03 *DESCRIPTION
 a7f0b8524eb866e5c1637c2bb26a6e6d *NAMESPACE
 541be685a010ed74e9f33aeaf491abad *R/db.r
 e7b747bc196353936d98e95797a2dfc1 *R/map.r
-e3c0a0e61f5804c6847cc1023979dba0 *R/misc.r
+719aa5696d879a83cb1896deaaf3d65f *R/misc.r
 fde3fa1c0a45d395b1ef633701becaef *R/polygon.r
 45bb5cad9ffc203d8e62dae784725f37 *R/smooth.r
 e0c9fa51a95a955a46f92e6ee2f0e1bc *R/zzz.R
@@ -23,7 +23,7 @@ e5e971cef422bb733644791ebdc05547 *data/state.fips.rda
 47260e722f73cdedba76a2cc1e6a3205 *data/us.cities.rda
 39f427ea30add5d209453cc4482cd3bf *data/usaMapEnv.rda
 0f1a65d78161fb00e86d5386a2f883cd *data/votes.repub.rda
-fb505a42d9e27ca368e51ff909948214 *data/world.cities.rda
+5c911aec44edd98c83aca470f8fbfa77 *data/world.cities.rda
 da4b00d5bd1ea2f96e2dbcc3483d856f *data/world2MapEnv.rda
 b185cd4a3e87254f46636e75d986c7a9 *data/worldMapEnv.rda
 5f9fab4844ba7d6a1ad6f65e8f684355 *man/area.map.Rd
diff --git a/R/misc.r b/R/misc.r
index c455d2e..0f06f5c 100644
--- a/R/misc.r
+++ b/R/misc.r
@@ -36,13 +36,13 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
   }
   usr <- par("usr")
   if (!missing(projection) && projection != FALSE) {
-    if (require(mapproj)) {
+    if (requireNamespace("mapproj", quietly = TRUE)) {
       if (is.character(projection)) {
-        projx <- mapproject(x$long, x$lat, projection = projection,
+        projx <- mapproj::mapproject(x$long, x$lat, projection = projection,
           parameters = parameters, orientation = orientation)
       } else {
-        if (nchar(.Last.projection()$projection) > 0) {
-          projx <- mapproject(x$long, x$lat)
+        if (nchar(mapproj::.Last.projection()$projection) > 0) {
+          projx <- mapproj::mapproject(x$long, x$lat)
         } else stop("No projection defined\n")
       }
       x$long <- projx$x
@@ -73,22 +73,22 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
       text(x$long[selection0], x$lat[selection0] + cxy[2] * cex * 0.7,
         paste(" ", x$name[selection0], sep = ""), cex = cex * 0.7, ...)
   if (sum(selection1) > 0) {
+    points(x$long[selection1], x$lat[selection1], pch = pch, cex = cex, ...)
     if (label) {
-      points(x$long[selection1], x$lat[selection1], pch = pch, cex = cex, ...)
       text(x$long[selection1], x$lat[selection1] + cxy[2] * cex,
         paste(" ", x$name[selection1], sep = ""), cex = cex * 1.2, ...)
     }
   }
   if (sum(selection2) > 0) {
+    points(x$long[selection2], x$lat[selection2], pch = pch, cex = cex, ...)
     if (label) {
-      points(x$long[selection2], x$lat[selection2], pch = pch, cex = cex, ...)
       text(x$long[selection2], x$lat[selection2] + cxy[2] * cex * 1.1,
         paste(" ", x$name[selection2], sep = ""), cex = cex * 1.1, ...)
     }
   }
   if (sum(selection3) > 0) {
+    points(x$long[selection3], x$lat[selection3], pch = pch, cex = cex, ...)
     if (label) {
-      points(x$long[selection3], x$lat[selection3], pch = pch, cex = cex, ...)
       text(x$long[selection3], x$lat[selection3] + cxy[2] * cex * 0.9,
         paste(" ", x$name[selection3], sep = ""), cex = cex * 0.9, ...)
     }
diff --git a/data/world.cities.rda b/data/world.cities.rda
index 7c925ac..9a1297a 100644
Binary files a/data/world.cities.rda and b/data/world.cities.rda differ

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