[r-cran-maps] 50/64: Import Upstream version 2.3-10
Andreas Tille
tille at debian.org
Thu Sep 7 07:32:34 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 c57fa4e4d569844a0c96ad2b21a9e4aab2404f57
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 7 09:27:39 2017 +0200
Import Upstream version 2.3-10
---
DESCRIPTION | 15 ++++++++-------
MD5 | 22 +++++++++++-----------
NAMESPACE | 3 +++
R/db.r | 10 +++++-----
R/map.r | 5 ++---
R/misc.r | 10 +++++-----
R/polygon.r | 2 +-
man/map.axes.Rd | 7 +++++--
man/map.cities.Rd | 6 +++---
man/smooth.map.Rd | 4 ++--
man/state.carto.Rd | 2 +-
src/world.name | 4 ++--
12 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index fbe7278..639bd4a 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,18 +1,19 @@
Package: maps
Title: Draw Geographical Maps
-Version: 2.3-9
-Date: 2014-09-22
+Version: 2.3-10
+Date: 2015-07-08
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>
Description: Display of maps. Projection code and larger maps are in
separate packages (mapproj and mapdata).
-Depends: R (>= 2.10.0)
-LazyLoad: yes
-Suggests: mapproj (>= 1.2-0)
+Depends: R (>= 2.14.0)
+Imports: graphics, utils
+LazyData: yes
+Suggests: mapproj (>= 1.2-0), mapdata (>= 2.2-4)
License: GPL-2
Maintainer: Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
-Packaged: 2014-09-22 03:27:30 UTC; ray
NeedsCompilation: yes
+Packaged: 2015-07-09 00:40:38 UTC; ray
Repository: CRAN
-Date/Publication: 2014-09-22 08:37:18
+Date/Publication: 2015-07-09 14:47:52
diff --git a/MD5 b/MD5
index 3ffd050..0baced6 100644
--- a/MD5
+++ b/MD5
@@ -1,9 +1,9 @@
-e8cfae7ed39383c1030b8394cbb51e03 *DESCRIPTION
-a7f0b8524eb866e5c1637c2bb26a6e6d *NAMESPACE
-541be685a010ed74e9f33aeaf491abad *R/db.r
-e7b747bc196353936d98e95797a2dfc1 *R/map.r
-719aa5696d879a83cb1896deaaf3d65f *R/misc.r
-fde3fa1c0a45d395b1ef633701becaef *R/polygon.r
+f19370ddd5c7aa284e4db8d3d3218681 *DESCRIPTION
+42425e043669a0938da7c5bdcc883568 *NAMESPACE
+f6888fbe63ceb0cccff4a98d15bbfe91 *R/db.r
+3ec4dfac38ac1e0c1d29ebc6a2a55f23 *R/map.r
+837883de008d4070429e52ffb9e86000 *R/misc.r
+94cc9c6961116bae1a2ed624cf931b81 *R/polygon.r
45bb5cad9ffc203d8e62dae784725f37 *R/smooth.r
e0c9fa51a95a955a46f92e6ee2f0e1bc *R/zzz.R
6d3acd6bf8fe0501140653a66952a160 *data/canada.cities.rda
@@ -36,8 +36,8 @@ b39d593d4b02815c823f555cf8599ee5 *man/internal.Rd
56766404494d261648f09393180151dc *man/internal2.Rd
b26a115b2797ec918ad277ce680dcd8a *man/italy.Rd
c1937dd13e8a86bf0e503f6dd1b48977 *man/map.Rd
-f590ca3d82f3a60d0714c70bf6bdffb6 *man/map.axes.Rd
-075d0bdab24034a7afc7cbabda65f70a *man/map.cities.Rd
+f44d0c508a2f2b6cbaac31597eebb5a3 *man/map.axes.Rd
+908aea312e86dc8781af88eafcc4f966 *man/map.cities.Rd
7154c4758c1f712f926af93e5fce1c60 *man/map.scale.Rd
28a52f9b58db4a0f743ec06b483d8700 *man/map.text.Rd
631a40fee9c727336502266f76e644a1 *man/map.where.Rd
@@ -45,9 +45,9 @@ f590ca3d82f3a60d0714c70bf6bdffb6 *man/map.axes.Rd
a775ac2a16cfe73efc6f6865c110121b *man/nz.Rd
dc4256b7510c06529ade1c14c58cd5c7 *man/ozone.Rd
e368efb53ad4d9a95938eb078ca68fd8 *man/polygon.Rd
-fc2661fa4e7119cae77f7c937205bab3 *man/smooth.map.Rd
+11d10d1d5b1e25ce239b68c8495188fd *man/smooth.map.Rd
805125518fa07c22f1116266bfdb270b *man/state.Rd
-6f697331a4eaa960a3d7afac01825f52 *man/state.carto.Rd
+ef6f7abc6e542d08a72e9cc67d5c4ce0 *man/state.carto.Rd
fa354b69c9d9ca135a97133f00bd0024 *man/state.fips.Rd
1b19074afcafe8e0d1aa8464fbb6b0d6 *man/state.vbm.Rd
4772854c8b17ec1604f5e099e4375c8a *man/us.cities.Rd
@@ -111,4 +111,4 @@ f1a1b6c9257c30aed9625a01dcec660b *src/world.gon
0902fc2c7b181fbf40673b9d9748ad00 *src/world.gonstats
76e802969266838ed27ee0a27f05ba80 *src/world.line
a92ae175e549ef37cdcd565b97dac430 *src/world.linestats
-2abd839acc105d625c51d6c3d9287a6b *src/world.name
+68f03e9284badbce449db64b3f2c0370 *src/world.name
diff --git a/NAMESPACE b/NAMESPACE
index f860ac9..c71c743 100755
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1 +1,4 @@
+import("graphics")
+importFrom("utils", "read.delim")
export(area.map, identify.map, map, map.axes, map.cities, map.scale, map.text, map.where, map.wrap, match.map, smooth.map, .map.range)
+S3method(identify, map)
diff --git a/R/db.r b/R/db.r
index ebcb6ba..4437590 100644
--- a/R/db.r
+++ b/R/db.r
@@ -5,7 +5,7 @@ function(database = "world", gons, fill = FALSE, xlim = c(-1e30, 1e30),
ngon <- length(gons)
gnames <- names(gons)
dbname <- paste(database, "MapEnv", sep = "")
- data(list = dbname, envir = environment())
+ # data(list = dbname)
mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "")
z <- .C("mapgetg", PACKAGE="maps",
as.character(mapbase),
@@ -42,7 +42,7 @@ function(database = "world", lines, xlim = c(-1e30, 1e30), ylim = c(-1e30,
if(nline == 0)
return(integer(0))
dbname <- paste(database, "MapEnv", sep = "")
- data(list = dbname, envir = environment())
+ # data(list = dbname)
mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "")
z <- .C("mapgetl", PACKAGE="maps",
as.character(mapbase),
@@ -87,7 +87,7 @@ function(database = "world", lines, xlim = c(-1e30, 1e30), ylim = c(-1e30,
function(database = "world", patterns, exact = FALSE)
{
dbname <- paste(database, "MapEnv", sep = "")
- data(list = dbname, envir = environment())
+ # data(list = dbname)
mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "")
# rewritten by Tom Minka
fname <- paste(sep = "", mapbase, ".N")
@@ -111,7 +111,7 @@ function(database = "world")
{
if(is.character(database)) {
dbname <- paste(database, "MapEnv", sep = "")
- data(list = dbname, envir = environment())
+ # data(list = dbname)
mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "")
# minka: maptypes are now 1,2 instead of 0,1
switch(.C("maptype", PACKAGE="maps",
@@ -145,7 +145,7 @@ match.map <- function(database, regions, exact = FALSE, warn = TRUE) {
}
if(is.character(database)) {
dbname <- paste(database, "MapEnv", sep = "")
- data(list = dbname, envir = environment())
+ # data(list = dbname)
mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "")
fname <- paste(sep = "", mapbase, ".N")
x <- read.delim(fname, header = FALSE)
diff --git a/R/map.r b/R/map.r
index 2cccad1..6077638 100644
--- a/R/map.r
+++ b/R/map.r
@@ -124,8 +124,7 @@ function(database = "world", regions = ".", exact = FALSE,
}
if (doproj) {
nam <- coord$names
- require(mapproj)
- coord <- mapproject(coord, projection = projection,
+ coord <- mapproj::mapproject(coord, projection = projection,
parameters = parameters, orientation = orientation)
coord$projection = projection
coord$parameters = parameters
@@ -135,7 +134,7 @@ function(database = "world", regions = ".", exact = FALSE,
stop("projection failed for all data")
else warning("projection failed for some data")
coord$names <- nam
- } else mapproject <- function() {} # Keep R CMD check quiet
+ }
# do the plotting, if requested
if (plot) {
# for new plots, set up the coordinate system;
diff --git a/R/misc.r b/R/misc.r
index 0f06f5c..35c9e6b 100644
--- a/R/misc.r
+++ b/R/misc.r
@@ -17,11 +17,11 @@ function(xy, delta, symmetric = TRUE)
# add axes to a map
"map.axes" <-
-function()
+function(...)
{
- axis(1)
- axis(2)
- box()
+ axis(1, ...)
+ axis(2, ...)
+ box(...)
invisible()
}
@@ -31,7 +31,7 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
parameters = NULL, orientation = NULL, pch = 1, ...)
{
if (missing(x)) {
- data("world.cities", package = "maps", envir = environment()) # uses lazy evaluation
+ # data("world.cities", package = "maps") # uses lazy evaluation
world.cities <- get("world.cities")
}
usr <- par("usr")
diff --git a/R/polygon.r b/R/polygon.r
index 91d8f7b..0c91953 100644
--- a/R/polygon.r
+++ b/R/polygon.r
@@ -7,7 +7,7 @@ map.where <- function(database = "world", x, y)
}
if(is.character(database)) {
dbname <- paste(database, "MapEnv", sep = "")
- data(list = dbname, envir = environment())
+ # data(list = dbname)
mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "")
gon <- .C("map_where", PACKAGE="maps",
as.character(mapbase),
diff --git a/man/map.axes.Rd b/man/map.axes.Rd
index b3c2a3a..58271da 100644
--- a/man/map.axes.Rd
+++ b/man/map.axes.Rd
@@ -5,7 +5,10 @@
}
\description{Draws a set of axes on an existing map.}
\usage{
-map.axes()
+map.axes(...)
+}
+\arguments{
+ \item{...}{Extra arguments passed to \code{axis} or \code{box}.}
}
\section{Side Effects}{
x- and y-axes are drawn for the currently displayed map. These will
@@ -14,7 +17,7 @@ specified in the map() call).
}
\examples{
map("state")
-map.axes()
+map.axes(cex.axis=0.8)
}
\keyword{hplot}
diff --git a/man/map.cities.Rd b/man/map.cities.Rd
index 1c560c4..9a7c3b8 100644
--- a/man/map.cities.Rd
+++ b/man/map.cities.Rd
@@ -84,9 +84,9 @@ and fitting within the limits of the plot currently displayed. The
default database is of all cities that have a population greater than a
certain threshold or which are capital cities of a country or island
territory. The threshold varies from country to country, but in
-general is no higher than about 40,000. The data are copyright Stefan
-Helders but freely available from his website
-\url{http://www.world-gazetteer.com}.
+general is no higher than about 40,000. The data are available from
+originally obtained from Stefan Elders' website, which now redirects to
+\url{http://www.populationmondiale.com}
There are three supplied databases, world.cities (the default), us.cities
and canada.cities. The latter two, which need to be made available by
diff --git a/man/smooth.map.Rd b/man/smooth.map.Rd
index b8ef805..00b9360 100644
--- a/man/smooth.map.Rd
+++ b/man/smooth.map.Rd
@@ -77,10 +77,10 @@ smooth.map(m, z, res = 50, span = 1/10, averages = FALSE, type = c("smooth",
\references{
W.F. Eddy and A. Mockus.
An example of the estimation and display of a smoothly varying
- function of time and space - the incidence of mumps disease.
+ function of time and space - the incidence of disease mumps.
\emph{Journal of the American Society for Information Science},
45(9):686-693, 1994.
- \url{http://www.research.avayalabs.com/user/audris/papers/jasis.pdf}
+ \url{http://web.eecs.utk.edu/~audris/papers/jasis.pdf}
W. R. Tobler. Smooth pycnophylactic interpolation for
geographical regions. \emph{Journal of the American Statistical
diff --git a/man/state.carto.Rd b/man/state.carto.Rd
index 1a6e411..6bd3e96 100644
--- a/man/state.carto.Rd
+++ b/man/state.carto.Rd
@@ -44,6 +44,6 @@ Richard A. Becker, and Allan R. Wilks,
\emph{AT\&T Bell Laboratories Statistics Research Report [95.2], 1995.}
CartoDraw,
-\url{http://infovis.uni-konstanz.de/~panse/CartoDraw/CartoDrawIndex.php}
+\url{http://www.computer.org/csdl/trans/tg/2004/01/v0095-abs.html}
}
\keyword{datasets}
diff --git a/src/world.name b/src/world.name
index 5fade45..f29eed3 100644
--- a/src/world.name
+++ b/src/world.name
@@ -1895,7 +1895,7 @@ Norway:Bremangerland 1894
Kiribati:Kanton Island 1895
India:Trinkat Island 1896
French Polynesia:Makatea 1897
-China:Taiwan:Lan yu 1898
+Taiwan:Lan yu 1898
Antarctica:Dundee Island 1899
Norway:Moskenesoya 1900
Indonesia:Batanta 1901
@@ -2243,7 +2243,7 @@ Greenland:? 2242
Yemen:Abd al Kurl 2243
Canada:North Kent Island 2244
Greenland:Herbert O 2245
-China:Taiwan 2246
+Taiwan 2246
New Zealand:Pitt Island 2247
Canada:Random Island 2248
Canada:Gilford Island 2249
--
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