[r-cran-maps] 10/64: Import Upstream version 2.0-32
Andreas Tille
tille at debian.org
Thu Sep 7 07:32:30 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 98a2c86e866f53cd9bd739ed453f081d30699e3a
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 7 09:25:17 2017 +0200
Import Upstream version 2.0-32
---
DESCRIPTION | 7 ++++---
R/polygon.r | 2 +-
data/canada.cities.rda | Bin 0 -> 18999 bytes
data/ozone.rda | Bin 2025 -> 917 bytes
data/us.cities.rda | Bin 0 -> 21641 bytes
data/votes.repub.rda | Bin 13937 -> 4731 bytes
man/canada.cities.Rd | 28 ++++++++++++++++++++++++++++
man/map.cities.Rd | 16 ++++++++++++++--
man/map.text.Rd | 3 ++-
man/us.cities.Rd | 26 ++++++++++++++++++++++++++
man/world.cities.Rd | 6 +++---
11 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 96c72d8..e6d2740 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,13 +1,14 @@
Package: maps
Title: Draw Geographical Maps
-Version: 2.0-31
-Date: 2006-02-07
+Version: 2.0-32
+Date: 2006-09-26
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>
Description: Display of maps. Projection code and larger maps are in
separate packages (mapproj and mapdata).
Depends: R (>= 1.7.0)
+Suggests: mapproj
License: GPL2
Maintainer: Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
-Packaged: Tue Feb 7 16:40:59 2006; ray
+Packaged: Tue Sep 26 15:24:36 2006; ray
diff --git a/R/polygon.r b/R/polygon.r
index 85ea937..a388690 100644
--- a/R/polygon.r
+++ b/R/polygon.r
@@ -140,7 +140,7 @@ map.text <- function(database, regions = ".", labels, cex = 0.75, add = FALSE,
# convert m into a matrix
x <- t(array(unlist(x), c(2, length(x))))
if(move) {
- library(mining)
+ # require(mining)
w = strwidth(labels, units = "inches", cex = cex)
h = strheight(labels, units = "inches", cex = cex)
x = move.collisions2(x[, 1], x[, 2], w, h)
diff --git a/data/canada.cities.rda b/data/canada.cities.rda
new file mode 100644
index 0000000..88498b9
Binary files /dev/null and b/data/canada.cities.rda differ
diff --git a/data/ozone.rda b/data/ozone.rda
index 689aa90..bb4ce76 100644
Binary files a/data/ozone.rda and b/data/ozone.rda differ
diff --git a/data/us.cities.rda b/data/us.cities.rda
new file mode 100644
index 0000000..9c08557
Binary files /dev/null and b/data/us.cities.rda differ
diff --git a/data/votes.repub.rda b/data/votes.repub.rda
index 92e2a49..cffd259 100644
Binary files a/data/votes.repub.rda and b/data/votes.repub.rda differ
diff --git a/man/canada.cities.Rd b/man/canada.cities.Rd
new file mode 100644
index 0000000..c1c67a7
--- /dev/null
+++ b/man/canada.cities.Rd
@@ -0,0 +1,28 @@
+\name{canada.cities}
+\docType{data}
+\alias{canada.cities}
+\title{
+Database of Canadian cities
+}
+
+\description{
+This database is of Canadian cities of population greater than about 1,000.
+Also included are province capitals of any population size.
+}
+\format{
+A list with 6 components, namely "name", "country.etc", "pop", "lat",
+"long", and "capital", containing the city name, the province
+abbreviation, approximate population (as at January 2006), latitude,
+longitude and capital status indication (0 for non-capital, 1 for
+capital, 2 for provincial
+
+capital.
+}
+\section{NOTE}{
+Some of the city names may be out of date. Please send
+any corrections to the package maintainer.
+}
+\seealso{
+\code{\link{map.cities}}
+}
+\keyword{datasets}
diff --git a/man/map.cities.Rd b/man/map.cities.Rd
index 1ff7ec2..96dcc24 100644
--- a/man/map.cities.Rd
+++ b/man/map.cities.Rd
@@ -19,7 +19,8 @@ the database.
}
\item{country}{
If the string country is specified, limit the displayed cities to be
-from within the specified country.
+from within the specified country, province or state (depending on how
+the database has been constructed).
}
\item{label}{
If \code{TRUE}, label all cities. If \code{NULL},
@@ -83,15 +84,26 @@ 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}.
+There are three supplied databases, world.cities (the default),
+us.cities and canada.cities. The latter two (which need to be made
+available by using a \code{data()} call, include the state or
+province name with the city name (thanks to John Woodruff
+\email{jpwoodruff at irisinternet.net} for the state and province
+information).
+
Note that if the underlying map is "Pacific-centric", i.e. longitudes
exceed 180 degrees, and a projection is used, then the map.cities data
must be transformed appropriately.
}
\seealso{
-\code{\link{world.cities}}
+\code{\link{world.cities}}, \code{\link{canada.cities}},
+\code{\link{us.cities}}
}
\examples{
map("world", "China")
map.cities(country = "China", capitals = 2)
+map("state", "New Jersey")
+data(us.cities)
+map.cities(us.cities, country="NJ")
}
\keyword{hplot}
diff --git a/man/map.text.Rd b/man/map.text.Rd
index cf2074f..2ac71f4 100644
--- a/man/map.text.Rd
+++ b/man/map.text.Rd
@@ -22,7 +22,8 @@ move = FALSE, ...)
\item{add}{If \code{FALSE}, a map is drawn, then labels placed on top. If
\code{TRUE}, labels are added to the existing map.}
\item{move}{If \code{TRUE}, labels are moved so that they don't
- overlap. Requires the \code{mining} library.}
+ overlap. Requires the \code{mining} library (not in CRAN, contact
+ tpminka at media.mit.edu).}
\item{...}{Other arguments are the same as in \code{\link{map}}.}
}
\value{
diff --git a/man/us.cities.Rd b/man/us.cities.Rd
new file mode 100644
index 0000000..9cd9e1d
--- /dev/null
+++ b/man/us.cities.Rd
@@ -0,0 +1,26 @@
+\name{us.cities}
+\docType{data}
+\alias{us.cities}
+\title{
+Database of US cities
+}
+
+\description{
+This database is of us cities of population greater than about 40,000.
+Also included are state capitals of any population size.
+}
+\format{
+A list with 6 components, namely "name", "country.etc", "pop", "lat",
+"long", and "capital", containing the city name, the state abbreviation,
+approximate population (as at January 2006), latitude, longitude and
+capital status indication (0 for non-capital, 1 for capital, 2 for state
+capital.
+}
+\section{NOTE}{
+Some of the city names may be out of date. Please send
+any corrections to the package maintainer.
+}
+\seealso{
+\code{\link{map.cities}}
+}
+\keyword{datasets}
diff --git a/man/world.cities.Rd b/man/world.cities.Rd
index 087e441..367630b 100644
--- a/man/world.cities.Rd
+++ b/man/world.cities.Rd
@@ -11,9 +11,9 @@ about 40,000. Also included are capital cities of any population size, and
many smaller towns.
}
\format{
-A list with 6 components, namely "name", "country.etc", "lat", "long",
-"pop", and "capital", containing the city name, the country name,
-latitude, longitude, approximate population (as at January 2006), and
+A list with 6 components, namely "name", "country.etc", "pop", "lat",
+"long", and "capital", containing the city name, the country name,
+approximate population (as at January 2006), latitude, longitude and
capital status indication (0 for non-capital, 1 for capital, 2 for China
Municipalities, and 3 for China Provincial capitals)
}
--
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