[r-cran-maps] 33/64: Import Upstream version 2.1-5

[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 f3a49be1ba4da54ace96056f1bfad4ebfe8985da
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:26:50 2017 +0200

    Import Upstream version 2.1-5
---
 DESCRIPTION       |  8 ++++----
 R/misc.r          | 10 +++++-----
 man/map.cities.Rd |  6 +++++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 689915c..7d761cf 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.1-4
-Date: 2010-05-25
+Version: 2.1-5
+Date: 2010-09-24
 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 <surname at stat.cmu.edu>
@@ -12,6 +12,6 @@ LazyLoad: yes
 Suggests: mapproj
 License: GPL-2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
-Packaged: 2010-05-25 03:23:08 UTC; ray
+Packaged: 2010-09-23 20:55:40 UTC; ray
 Repository: CRAN
-Date/Publication: 2010-05-25 17:09:05
+Date/Publication: 2010-09-24 06:46:08
diff --git a/R/misc.r b/R/misc.r
index 3c3be5a..3cf692e 100644
--- a/R/misc.r
+++ b/R/misc.r
@@ -28,7 +28,7 @@ function()
 "map.cities" <-
 function (x = world.cities, country = "", label = NULL, minpop = 0, 
     maxpop = Inf, capitals = 0, cex = par("cex"), projection = FALSE,
-    parameters = NULL, orientation = NULL, ...) 
+    parameters = NULL, orientation = NULL, pch = 1, ...) 
 {
     if (missing(x)) {
         data("world.cities", package = "maps")	# uses lazy evaluation
@@ -64,7 +64,7 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
         label <- sum(selection) < 20
     cxy <- par("cxy")
     if (sum(selection01) > 0) 
-        points(x$long[selection01], x$lat[selection01], pch = 1, 
+        points(x$long[selection01], x$lat[selection01], pch = pch, 
             cex = cex * 0.6, ...)
     if (sum(selection0) > 0) 
         if (label) 
@@ -72,21 +72,21 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
                 cex * 0.7, paste(" ", x$name[selection0], sep = ""), 
                 cex = cex * 0.7, ...)
     if (sum(selection1) > 0) {
-        points(x$long[selection1], x$lat[selection1], pch = 1, 
+        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 = 1, 
+        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 = 1, 
+        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 = ""), 
diff --git a/man/map.cities.Rd b/man/map.cities.Rd
index 96dcc24..2a258c6 100644
--- a/man/map.cities.Rd
+++ b/man/map.cities.Rd
@@ -6,7 +6,7 @@ Add Cities to Existing Map
 \usage{
 map.cities(x = world.cities, country = "", label = NULL, minpop = 0,
 maxpop = Inf, capitals = 0, cex = par("cex"), projection = FALSE,
-parameters = NULL, orientation = NULL, \dots)
+parameters = NULL, orientation = NULL, pch = 1, \dots)
 }
 \description{
   Adds city locations and (optionally) names to an existing map using a
@@ -61,6 +61,10 @@ a vector \code{c(latitude, longitude, rotation)} describing where
 the map should be centered and a clockwise rotation (in degrees)
 about this center.
 }
+\item{pch}{
+plotting character to use for marking city location. See
+\code{\link{points}} for options.
+}
 \item{...}{
 Further plotting parameters may be specified as for the commands
 \code{\link{points}} and \code{\link{text}}.

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