[r-cran-maps] 56/64: Import Upstream version 3.0.1
Andreas Tille
tille at debian.org
Thu Sep 7 07:32:36 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 d1d65caeaf2050b177c0dc8bdd97f14512d1385f
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 7 09:27:59 2017 +0200
Import Upstream version 3.0.1
---
DESCRIPTION | 8 ++++----
MD5 | 18 +++++++++---------
R/db.r | 35 +++++++++++++++++++----------------
inst/NEWS.Rd | 8 ++++++++
man/legacy_world.Rd | 2 +-
man/map.Rd | 4 ++--
man/match.map.Rd | 2 +-
man/world.Rd | 2 +-
man/world2.Rd | 2 +-
src/world.name | 8 ++++----
10 files changed, 50 insertions(+), 39 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index d755e13..aa062be 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: maps
Title: Draw Geographical Maps
-Version: 3.0.0-2
-Date: 2015-10-02
+Version: 3.0.1
+Date: 2015-11-30
Author: Original S code by Richard A. Becker and Allan R. Wilks.
R version by Ray Brownrigg.
Enhancements by Thomas P Minka and Alex Deckmyn.
@@ -15,5 +15,5 @@ License: GPL-2
Maintainer: Alex Deckmyn <alex.deckmyn at meteo.be>
NeedsCompilation: yes
Repository: CRAN
-Packaged: 2015-10-02 08:29:37 UTC; dalex
-Date/Publication: 2015-10-02 22:01:25
+Packaged: 2015-12-03 20:17:30 UTC; dalex
+Date/Publication: 2015-12-04 08:40:37
diff --git a/MD5 b/MD5
index e3cd933..e49d028 100644
--- a/MD5
+++ b/MD5
@@ -1,6 +1,6 @@
-57144f77925973be438cf445b2a47822 *DESCRIPTION
+4b84cf22ef9b518d9dce5fa7752d9039 *DESCRIPTION
f0606d720da62d981c3fe5f3097cd888 *NAMESPACE
-c36bed0c32d29a8f4231fcee7215746b *R/db.r
+024c9440c4f04266b91cdeb63a1af36f *R/db.r
b47ae9aa3c8ee795873776c237cf8ee4 *R/iso.r
0dad35ac55bb83ddd34ab57ccb2efe3a *R/legacy.r
6266fc6577e30c7c2c1ccbb4b1608669 *R/map.r
@@ -32,7 +32,7 @@ e5e971cef422bb733644791ebdc05547 *data/state.fips.rda
5c911aec44edd98c83aca470f8fbfa77 *data/world.cities.rda
e338da5c189460e1ec63cf396799830b *data/world2MapEnv.rda
a46b3243710a9eb7369556ca8a9bb0cc *data/worldMapEnv.rda
-dfdeb88027cdbe264e213f0dac61801e *inst/NEWS.Rd
+b818bd52922ec259d3d4a93d472eb401 *inst/NEWS.Rd
90e421f1285e36de5dfeb481bc611438 *inst/README_v3
5f9fab4844ba7d6a1ad6f65e8f684355 *man/area.map.Rd
bcd90a5871cfbca677d5e2590d308d87 *man/canada.cities.Rd
@@ -45,14 +45,14 @@ b39d593d4b02815c823f555cf8599ee5 *man/internal.Rd
703eae24f3c9c5d409c03b132f530a58 *man/iso.expand.Rd
bd84406a4911f08ea727c1a0e86ea214 *man/iso3166.Rd
b26a115b2797ec918ad277ce680dcd8a *man/italy.Rd
-f99fc61b5e58fb7340e5c4553d0030c3 *man/legacy_world.Rd
-276bd49afab74c0b90a29bbf8fdc0e50 *man/map.Rd
+14acb7101174d168d25a26f1a6932d64 *man/legacy_world.Rd
+1ffff556f8f8ef6448ad4e18cc87c5af *man/map.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
-42b367151050df253705fa17c2d8e1a1 *man/match.map.Rd
+4d98494b0ba2bdfebb2e9f8086bb684b *man/match.map.Rd
a775ac2a16cfe73efc6f6865c110121b *man/nz.Rd
dc4256b7510c06529ade1c14c58cd5c7 *man/ozone.Rd
e368efb53ad4d9a95938eb078ca68fd8 *man/polygon.Rd
@@ -63,10 +63,10 @@ fa354b69c9d9ca135a97133f00bd0024 *man/state.fips.Rd
1b19074afcafe8e0d1aa8464fbb6b0d6 *man/state.vbm.Rd
4772854c8b17ec1604f5e099e4375c8a *man/us.cities.Rd
ba6071e86450424b7b2ef124f177e447 *man/usa.Rd
-e67929400e7ff9c7035f24827fce590c *man/world.Rd
+f3402bdb34c9655b8e882a43a7d8fc23 *man/world.Rd
dc4668c3b67ae20d466fdb60c07be88c *man/world.cities.Rd
555e262690ca6cad69813337e0ace695 *man/world.legacy.Rd
-561ad7b85c6694d0a45f98f7a2a78b62 *man/world2.Rd
+487ed06dcd2e8a9425cc66459e161aac *man/world2.Rd
eccd234607d07a4bb8470fb29acdac41 *src/Gmake.c
4e6736aa698e81a165bbe6052ae3bf8e *src/Lmake.c
5971ab51893c0f7b1050b1dde17ea7e3 *src/Makefile
@@ -129,4 +129,4 @@ e00687fd8b955d445553fb401bf2bf3a *src/usa.linestats
b7364358afb7427a4aa05d7c60b67fff *src/world.gonstats
ed19bd00182b514c7a58bbc93d09d710 *src/world.line
dcd3e4d2e362b988705782f84022ae45 *src/world.linestats
-842425bd803daeaffda959c0dea5c5c3 *src/world.name
+7d0a96c6dffb129a8b07b25778acc4f1 *src/world.name
diff --git a/R/db.r b/R/db.r
index bd0451e..f514116 100644
--- a/R/db.r
+++ b/R/db.r
@@ -170,6 +170,8 @@ match.map <- function(database, regions, exact = FALSE, warn = TRUE) {
ip[p] = 1:length(p)
ip
}
+ regions = tolower(regions)
+
if(is.character(database)) {
dbname <- paste(database, "MapEnv", sep = "")
# data(list = dbname)
@@ -177,22 +179,23 @@ match.map <- function(database, regions, exact = FALSE, warn = TRUE) {
fname <- paste(sep = "", mapbase, ".N")
x <- read.delim(fname, header = FALSE)
nam <- as.character(x[[1]])
+
+# this is a quick-and-dirty fix for "uk" matching "ukrain"
+# it must also trigger the use of match.map.grep
+# We replace "uk" by "uk but not followed a letter"
+# So Ukrain doesn't fit "uk" anymore, but "uk:scotland" is OK
+ if (database=="world") {
+ iexp <- which(regions %in% world.exceptions)
+ if (length(iexp)>0) {
+ ibase <- regions[iexp]
+ regions[iexp] <- paste(ibase,"(?![[:alpha:]])",sep="")
+ }
+ }
}
else {
nam <- database$names
}
nam = tolower(nam)
- regions = tolower(regions)
-# this is the quick-and-dirty fix:
-# it must also trigger the use of match.map.grep
-# nam[nam=="uk"] <- "uk[^r]"
- if (database=="world") {
- iexp <- which(tolower(patterns) %in% world.exceptions)
- if (length(iexp)>0) {
- ibase <- patterns[iexp]
- patterns[iexp] <- paste(ibase,"(?![:alpha:])",sep="")
- }
- }
if(!exact && any(is.regexp(regions))) {
match.map.grep(nam, regions, warn)
@@ -202,13 +205,13 @@ match.map <- function(database, regions, exact = FALSE, warn = TRUE) {
#so we temporarily move to ASCII style ordering
lcc <- Sys.getlocale("LC_COLLATE")
Sys.setlocale(category = "LC_COLLATE", locale = "C")
- ord.nam = order(nam)
- nam = nam[ord.nam]
- ord.regions = order(regions)
- regions = regions[ord.regions]
+ ord.nam <- order(nam)
+ nam <- nam[ord.nam]
+ ord.regions <- order(regions)
+ regions <- regions[ord.regions]
Sys.setlocale(category = "LC_COLLATE", locale = lcc)
- result = .C("map_match", PACKAGE="maps",
+ result <- .C("map_match", PACKAGE="maps",
as.integer(length(nam)), as.character(nam),
as.integer(length(regions)), as.character(regions),
result = integer(length(nam)), as.integer(exact))[["result"]]
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
index b56a529..40c09f3 100644
--- a/inst/NEWS.Rd
+++ b/inst/NEWS.Rd
@@ -1,5 +1,13 @@
\name{NEWS}
\title{News for package 'maps'}
+\section{Changes in maps version 3.0.1 (2015-11-30)}{
+ \itemize{
+ \item Fix match.map() for world map
+ \item Add some more island names to the world database
+ \item Updated a few web references in man pages.
+ }
+}
+
\section{Changes in maps version 3.0.0 (2015-09-24)}{
\itemize{
\item MAJOR:
diff --git a/man/legacy_world.Rd b/man/legacy_world.Rd
index cccd3e7..98e1de2 100644
--- a/man/legacy_world.Rd
+++ b/man/legacy_world.Rd
@@ -23,7 +23,7 @@ During a transition period (\code{maps} version 3.0) it is possible to switch to
}
\source{
The CIA World Data Bank II is currently (2015) still available from
-\url{http://www.evl.uic.edu/pape/data/WDB/}.
+\url{https://www.evl.uic.edu/pape/data/WDB/}.
}
\seealso{
\code{\link{map}},\code{\link{world.legacy}},\code{\link{world}}
diff --git a/man/map.Rd b/man/map.Rd
index 227f2c1..535291f 100644
--- a/man/map.Rd
+++ b/man/map.Rd
@@ -271,12 +271,12 @@ if(require(mapproj)) { # mapproj is used for projection="polyconic"
Richard A. Becker, and Allan R. Wilks,
"Maps in S",
\emph{AT&T Bell Laboratories Statistics Research Report [93.2], 1993.}
- \url{http://public.research.att.com/areas/stat/doc/93.2.ps}
+ \url{http://ect.bell-labs.com/sl/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.}
- \url{http://public.research.att.com/areas/stat/doc/95.2.ps}
+ \url{http://ect.bell-labs.com/sl/doc/95.2.ps}
}
\keyword{hplot}
% Converted by Sd2Rd version 0.3-3.
diff --git a/man/match.map.Rd b/man/match.map.Rd
index dd896bc..302c911 100644
--- a/man/match.map.Rd
+++ b/man/match.map.Rd
@@ -54,6 +54,6 @@ map("state", fill = TRUE, col = color); map("state", add = TRUE)
Richard A. Becker, and Allan R. Wilks,
"Maps in S",
\emph{AT\&T Bell Laboratories Statistics Research Report, 1991.}
-\url{http://www.research.att.com/areas/stat/doc/93.2.ps}
+\url{http://ect.bell-labs.com/sl/doc/93.2.ps}
}
\keyword{dplot}
diff --git a/man/world.Rd b/man/world.Rd
index 14fe160..6ab9e49 100644
--- a/man/world.Rd
+++ b/man/world.Rd
@@ -25,7 +25,7 @@ During a transition period (\code{maps} version 3.0) it is possible to switch to
The Natural Earth data set is available from \url{http://www.naturalearthdata.com}.
The legacy CIA World Data Bank II is currently (mid-2003) available from
-\url{http://www.evl.uic.edu/pape/data/WDB/}.
+\url{https://www.evl.uic.edu/pape/data/WDB/}.
}
\seealso{
\code{\link{map}},\code{\link{world.legacy}},\code{\link{legacy_world}}
diff --git a/man/world2.Rd b/man/world2.Rd
index 3bb8254..d548ca1 100644
--- a/man/world2.Rd
+++ b/man/world2.Rd
@@ -43,7 +43,7 @@ It is also (during a transition phase) possible to switch to the old legacy worl
The Natural Earth data set is available from \url{http://www.naturalearthdata.com}.
The legacy CIA World Data Bank II is currently (mid-2003) available from
-\url{http://www.evl.uic.edu/pape/data/WDB/}.
+\url{https://www.evl.uic.edu/pape/data/WDB/}.
}
\seealso{
\code{\link{map}}, \code{\link{world}},\code{\link{world.legacy}}
diff --git a/src/world.name b/src/world.name
index 544ec0a..c108a5e 100644
--- a/src/world.name
+++ b/src/world.name
@@ -585,7 +585,7 @@ UK:Northern Ireland 584
UK:Scotland:Island of Arran 585
UK:Scotland:Islay 586
UK:Scotland:Jura 587
-UK:7 588
+UK:Scotland:Isle of Mull 588
UK:Scotland:Coll 589
UK:Scotland:Barra 590
UK:Scotland:Ruhm 591
@@ -594,11 +594,11 @@ UK:Scotland:Island of Skye 593
UK:Scotland:North Uist 594
UK:Scotland:Isle of Lewis 595
UK:Great Britain 596
-UK:16 597
+UK:Scotland:Orkney Islands:South Ronaldsay 597
UK:Scotland:Orkney Islands:Hoy 598
UK:Scotland:Orkney Islands:Mainland 599
-UK:19 600
-UK:20 601
+UK:Scotland:Orkney Islands:Sanday 600
+UK:Scotland:Orkney Islands:Westray 601
UK:Scotland:Shetland Islands:Mainland 602
UK:Scotland:Shetland Islands:Yell 603
UK:Scotland:Shetland Islands:Unst 604
--
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