[r-cran-maps] 29/64: Import Upstream version 2.1-3
Andreas Tille
tille at debian.org
Thu Sep 7 07:32:31 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-maps.
commit 39e561011518effec31a7bd4bd58dadb8885eb56
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 7 09:26:39 2017 +0200
Import Upstream version 2.1-3
---
DESCRIPTION | 12 ++++++------
R/map.r | 9 +++++----
R/polygon.r | 1 +
man/map.Rd | 12 ++++++------
src/world.name | 8 ++++----
5 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index c0b0234..383fac3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,9 +1,9 @@
Package: maps
Title: Draw Geographical Maps
-Version: 2.1-1
-Date: 2009-10-19
+Version: 2.1-3
+Date: 2010-05-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>
+ version by Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
Enhancements by Thomas P Minka <surname at stat.cmu.edu>
Description: Display of maps. Projection code and larger maps are in
separate packages (mapproj and mapdata).
@@ -11,7 +11,7 @@ Depends: R (>= 2.7.0)
LazyLoad: yes
Suggests: mapproj
License: GPL-2
-Maintainer: Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
-Packaged: Mon Oct 19 14:16:49 2009; ray
+Maintainer: Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
+Packaged: 2010-05-17 01:47:32 UTC; ray
Repository: CRAN
-Date/Publication: 2010-02-08 09:03:36
+Date/Publication: 2010-05-17 09:00:05
diff --git a/R/map.r b/R/map.r
index b007fab..f1078c1 100644
--- a/R/map.r
+++ b/R/map.r
@@ -93,7 +93,7 @@ function(database = "world", regions = ".", exact = FALSE,
col = 1, plot = TRUE, add = FALSE, namesonly = FALSE,
xlim = NULL, ylim = NULL, wrap = FALSE,
resolution = if (plot) 1 else 0, type = "l", bg = par("bg"),
- mar = c(0, 0, par("mar")[3], 0.1), border = 0.01, ...)
+ mar = c(4.1, 4.1, par("mar")[3], 0.1), border = 0.01, ...)
{
# parameter checks
if (resolution>0 && !plot)
@@ -153,6 +153,7 @@ function(database = "world", regions = ".", exact = FALSE,
plot.window(xrange, yrange, asp = 1/aspect[1])
} else {
# must have par(xpd = FALSE) for limits to have an effect ??!
+ par(mar = mar) # set mai if user-defined mar
p <- par("fin") -
as.vector(matrix(c(0, 1, 1, 0, 0, 1, 1, 0), nrow = 2) %*% par("mai"))
par(pin = p)
@@ -227,13 +228,13 @@ closed.polygon <- function(p) {
ends <- c(breaks - 1, n)
x[ends + 1] = x[starts]
y[ends + 1] = y[starts]
- x = insert(x, breaks + 1)
- y = insert(y, breaks + 1)
+ x = maps::insert(x, breaks + 1)
+ y = maps::insert(y, breaks + 1)
list(x = x, y = y)
}
insert <- function(x, i, v = NA) {
# insert v into an array x, at positions i
- # e.g. insert(1:7, c(2, 5, 8))
+ # e.g. maps::insert(1:7, c(2, 5, 8))
n = length(x)
new.n = n + length(i)
m = logical(new.n)
diff --git a/R/polygon.r b/R/polygon.r
index 88fd98e..d74af26 100644
--- a/R/polygon.r
+++ b/R/polygon.r
@@ -128,6 +128,7 @@ map.text <- function(database, regions = ".", labels, cex = 0.75, add = FALSE,
cc[[1]] = as.name("map")
cc$fill = TRUE
cc$plot = FALSE
+ cc$regions = regions
cc$move = cc$add = cc$cex = cc$labels = NULL
cc$resolution = 0
m = eval(cc)
diff --git a/man/map.Rd b/man/map.Rd
index bb074d9..0cdb43e 100644
--- a/man/map.Rd
+++ b/man/map.Rd
@@ -9,7 +9,7 @@ map(database = "world", regions = ".", exact = FALSE, boundary = TRUE,
interior = TRUE, projection = "", parameters = NULL, orientation = NULL,
fill = FALSE, col = 1, plot = TRUE, add = FALSE, namesonly = FALSE,
xlim = NULL, ylim = NULL, wrap = FALSE, resolution = if(plot) 1 else 0,
- type = "l", bg = par("bg"), mar = c(0, 0, par("mar")[3], 0.1),
+ type = "l", bg = par("bg"), mar = c(4.1, 4.1, par("mar")[3], 0.1),
border = 0.01, ...)
}
\usage{
@@ -18,7 +18,7 @@ map(database = "world", regions = ".", exact = FALSE, boundary = TRUE,
interior = TRUE, projection = "", parameters = NULL, orientation = NULL,
fill = FALSE, col = 1, plot = TRUE, add = FALSE, namesonly = FALSE,
xlim = NULL, ylim = NULL, wrap = FALSE, resolution = if(plot) 1 else 0,
- type = "l", bg = par("bg"), mar = c(0, 0, par("mar")[3], 0.1),
+ type = "l", bg = par("bg"), mar = c(4.1, 4.1, par("mar")[3], 0.1),
border = 0.01, ...)
}
\arguments{
@@ -123,7 +123,7 @@ map(database = "world", regions = ".", exact = FALSE, boundary = TRUE,
\item{xlim}{
two element numeric
vector giving a range of longitudes, expressed
- in degreees, to which drawing
+ in degrees, to which drawing
should be restricted.
Longitude is measured in degrees east of Greenwich, so that, in particular,
locations in the USA have negative longitude.
@@ -167,7 +167,7 @@ map(database = "world", regions = ".", exact = FALSE, boundary = TRUE,
background color.
}
\item{mar}{
- margins, as in \code{\link{par}}.
+ margins, as in \code{\link{par}}. Defaults allow for map.axes().
}
\item{border}{
scalar or vector of length 2 specifying the porportion of the plot
@@ -233,12 +233,12 @@ box()
\references{
Richard A. Becker, and Allan R. Wilks,
"Maps in S",
- \emph{AT\&T Bell Laboratories Statistics Research Report [93.2], 1993.}
+ \emph{AT&T Bell Laboratories Statistics Research Report [93.2], 1993.}
\url{http://public.research.att.com/areas/stat/doc/93.2.ps}
Richard A. Becker, and Allan R. Wilks,
"Constructing a Geographical Database",
- \emph{AT\&T Bell Laboratories Statistics Research Report [95.2], 1995.}
+ \emph{AT&T Bell Laboratories Statistics Research Report [95.2], 1995.}
\url{http://public.research.att.com/areas/stat/doc/95.2.ps}
}
\keyword{hplot}
diff --git a/src/world.name b/src/world.name
index 46c575b..5fade45 100644
--- a/src/world.name
+++ b/src/world.name
@@ -124,7 +124,7 @@ Central African Republic 123
Zaire 124
Congo 125
Gabon 126
-Rio Muni 127
+Equatorial Guinea:Rio Muni 127
Angola:Cabinda 128
Uganda 129
Rwanda 130
@@ -534,7 +534,7 @@ Andaman Islands:Middle Andaman 533
Andaman Islands:Baratang Island 534
Andaman Islands:South Andaman 535
China:Haitan Dao 536
-Washington:Orcas Island 537
+USA:Washington:Orcas Island 537
Chile:Isle Ipun 538
USSR:Ostrov Bol'shevik 539
Maldives:? 540
@@ -792,7 +792,7 @@ Mexico:Angeleda la Guarda Island 791
French Polynesia:Rimatara 792
Indonesia:Siau 793
Maldives:? 794
-Washington:San Juan Island 795
+USA:Washington:San Juan Island 795
Bahamas:Great Inagua Island 796
USSR:? 797
USA:Alaska:Afognak Island 798
@@ -1150,7 +1150,7 @@ Solomon Islands:Bellona Island 1149
Kiribati:Arorae 1150
Denmark:Vagar 1151
Philippines:Sulu 1152
-Washington:Whidbey Island 1153
+USA:Washington:Whidbey Island 1153
Hawaii:Sand Island 1154
Vanuatu:Efate 1155
Thailand:Ko Lanta Yai 1156
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maps.git
More information about the debian-science-commits
mailing list