[r-cran-maps] 14/64: Import Upstream version 2.0-36
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 e4307fbaddbed2d011fbef2de52e70a4ef7634b6
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 7 09:25:34 2017 +0200
Import Upstream version 2.0-36
---
DESCRIPTION | 28 ++++++++++++++--------------
R/polygon.r | 2 +-
man/identify.map.Rd | 2 +-
man/match.map.Rd | 2 +-
man/polygon.Rd | 4 ++--
man/smooth.map.Rd | 2 +-
src/world.name | 24 ++++++++++++------------
7 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 67b7238..1c4b996 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,14 +1,14 @@
-Package: maps
-Title: Draw Geographical Maps
-Version: 2.0-33
-Date: 2007-01-29
-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: Mon Jan 29 09:21:49 2007; ray
+Package: maps
+Title: Draw Geographical Maps
+Version: 2.0-36
+Date: 2007-04-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: Thu Apr 26 10:10:53 2007; ray
diff --git a/R/polygon.r b/R/polygon.r
index a388690..0df555a 100644
--- a/R/polygon.r
+++ b/R/polygon.r
@@ -32,7 +32,7 @@ map.where <- function(database = "world", x, y)
database$names[result]
}
}
-as.matrix.polygon <- function(x) {
+as.matrix.polygon <- function(x, ...) {
p = x
if(is.null(p)) return(p)
if(is.list(p) && !is.data.frame(p)) p <- cbind(p$x, p$y)
diff --git a/man/identify.map.Rd b/man/identify.map.Rd
index 0ae92b1..42117ab 100644
--- a/man/identify.map.Rd
+++ b/man/identify.map.Rd
@@ -8,7 +8,7 @@
Identifies the map regions clicked by the user.
}
\usage{
-identify.map(x, n = 1, index = FALSE, ...)
+\method{identify}{map}(x, n = 1, index = FALSE, ...)
}
\arguments{
\item{x}{a map object containing named polygons.}
diff --git a/man/match.map.Rd b/man/match.map.Rd
index 51c31a6..dd896bc 100644
--- a/man/match.map.Rd
+++ b/man/match.map.Rd
@@ -42,7 +42,7 @@ match.map(database, regions, exact = FALSE, warn = TRUE)
\examples{
# filled map showing Republican vote in 1900
# (figure 6 in the reference)
-data(state, package = "base")
+data(state, package = "datasets")
data(votes.repub)
state.to.map <- match.map("state", state.name)
x <- votes.repub[state.to.map, "1900"]
diff --git a/man/polygon.Rd b/man/polygon.Rd
index c5302b5..1078b66 100644
--- a/man/polygon.Rd
+++ b/man/polygon.Rd
@@ -13,12 +13,12 @@
\usage{
area.polygon(p)
centroid.polygon(p)
-as.matrix.polygon(x)
+\method{as.matrix}{polygon}(x, ...)
closed.polygon(p)
in.one.polygon(p, x)
in.polygon(p, x)
num.polygons(p)
-range.polygon(..., na.rm = FALSE)
+\method{range}{polygon}(..., na.rm = FALSE)
sub.polygon(p, i)
}
\description{
diff --git a/man/smooth.map.Rd b/man/smooth.map.Rd
index 5151441..b8ef805 100644
--- a/man/smooth.map.Rd
+++ b/man/smooth.map.Rd
@@ -88,7 +88,7 @@ smooth.map(m, z, res = 50, span = 1/10, averages = FALSE, type = c("smooth",
}
\examples{
# compare to the example for match.map
-data(state, package = "base")
+data(state, package = "datasets")
data(votes.repub)
z = votes.repub[, "1900"]
m = map("state", fill = TRUE, plot = FALSE)
diff --git a/src/world.name b/src/world.name
index e495b38..46c575b 100644
--- a/src/world.name
+++ b/src/world.name
@@ -188,7 +188,7 @@ Norway:Stjernoya 187
Venezuela:Isla de Margarita 188
Canada:Coats Island 189
Hawaii:Lisianski Island 190
-Newfoundland 191
+Canada:Newfoundland 191
Australia:Vanderlin Island 192
French Polynesia:Eiao 193
Australia 194
@@ -308,7 +308,7 @@ Greece:Milos 307
Canada:Opposite Island 308
Montserrat 309
Dominican Republic:Isla Saona 310
-USSR:Ostrov Ol'khon 311
+USSR:Lake Baikal 311
Greenland 312
Antarctica:? 313
Indonesia:Atauro 314
@@ -337,7 +337,7 @@ Tanzania:Zanzibar 336
Ethiopia:Dehalak Deset 337
Canada:Porcher Island 338
Canada:Pitt Island 339
-Svalbard:Edgeoya 340
+Norway:Svalbard:Edgeoya 340
Indonesia:Tarakan 341
Indonesia:Tioor 342
Indonesia:Waar 343
@@ -404,7 +404,7 @@ Norway:Hareidlandet 403
Antarctica:Rothschild Island 404
Maldives:? 405
Canada:Lougheed Island 406
-Svalbard:Nordaustlandet 407
+Norway:Svalbard:Nordaustlandet 407
Marshall Islands:Utirik Atoll 408
Philippines:Panaon 409
Japan:Shikoku 410
@@ -883,7 +883,7 @@ Maldives:? 882
Indonesia:Sawu 883
Solomon Islands:Steward 884
California:San Clemente Island 885
-Svalbard:Spitsbergen 886
+Norway:Svalbard:Spitsbergen 886
Guinea-Bissau:? 887
Indonesia:Tahulandang 888
Myanmar:Bilugyun Island 889
@@ -1188,7 +1188,7 @@ USA:Alaska:Chuginadak Island 1187
USSR:Ostrov Shmidta 1188
Denmark:Laeso 1189
Indonesia:Mendanau 1190
-Svalbard:Jan Mayen 1191
+Norway:Svalbard:Jan Mayen 1191
Azores:Flores 1192
Canada:Manitoulin Island 1193
Indonesia:Serasan 1194
@@ -1235,8 +1235,8 @@ Indonesia:Maratua 1234
Canada:? 1235
USSR:Ostrov Shokal'skogo 1236
New Zealand:Rangitoto Island 1237
-Svalbard:Kvitoya 1238
-Svalbard:Byornoya 1239
+Norway:Svalbard:Kvitoya 1238
+Norway:Svalbard:Byornoya 1239
Papua New Guinea:Liot 1240
Iraq:Lake ? 1241
Philippines:? 1242
@@ -1530,7 +1530,7 @@ Mexico:Isla Maria Magdalena 1529
Solomon Islands:Vanikoro 1530
Micronesia:? 1531
Maldives:? 1532
-Svalbard:Svenskoya 1533
+Norway:Svalbard:Svenskoya 1533
Iraq:? 1534
Japan:Tanega Shima 1535
Greenland:? 1536
@@ -1831,7 +1831,7 @@ Maldives:? 1830
Equatorial Guinea:Annobon 1831
Kiribati:Tarawa 1832
Canada:Jameson Island:West 1833
-Svalbard:Kongsoya 1834
+Norway:Svalbard:Kongsoya 1834
Fiji:Kadavu 1835
Bangladesh:? 1836
USA:Alaska:Mitkof Island 1837
@@ -1970,7 +1970,7 @@ USSR:Ostrov Rasshua 1969
USSR:Lena Delta:6 1970
Antarctica:Snow Island 1971
Canada:Galiano Island 1972
-Svalbard:Barentsoya 1973
+Norway:Svalbard:Barentsoya 1973
Greece:Kithira 1974
USSR:Zemlya Alexsandry 1975
Canada:Meighen Island 1976
@@ -2026,7 +2026,7 @@ USSR:Ostrov Mak-Klintoka 2025
Turks and Caicos:Providenciales Island 2026
India:Nancowry Island 2027
Tuvalu:Nanumanga 2028
-Svalbard:Hopen 2029
+Norway:Svalbard:Hopen 2029
Myanmar:Saurin Island 2030
Vietnam:? 2031
Tonga:Tofua 2032
--
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