Skip to content

Commit

Permalink
version 2.2-2
Browse files Browse the repository at this point in the history
  • Loading branch information
Ray Brownrigg authored and cran-robot committed Nov 9, 2011
1 parent eee8c3e commit f27af72
Show file tree
Hide file tree
Showing 25 changed files with 1,501 additions and 278 deletions.
12 changes: 6 additions & 6 deletions DESCRIPTION
@@ -1,17 +1,17 @@
Package: maps
Title: Draw Geographical Maps
Version: 2.2-1
Date: 2011-11-03
Version: 2.2-2
Date: 2011-11-09
Author: Original S code by Richard A. Becker and Allan R. Wilks.
R version by Ray Brownrigg <Ray.Brownrigg@ecs.vuw.ac.nz>
Enhancements by Thomas P Minka <surname@stat.cmu.edu>
R version by Ray Brownrigg <Ray.Brownrigg@ecs.vuw.ac.nz>.
Enhancements by Thomas P Minka <surname@stat.cmu.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
License: GPL-2
Maintainer: Ray Brownrigg <Ray.Brownrigg@ecs.vuw.ac.nz>
Packaged: 2011-11-03 03:23:57 UTC; ray
Packaged: 2011-11-08 23:37:04 UTC; ray
Repository: CRAN
Date/Publication: 2011-11-03 11:48:16
Date/Publication: 2011-11-09 08:03:02
30 changes: 23 additions & 7 deletions MD5
@@ -1,19 +1,23 @@
13cf847a6d86dc9f38e0731d583a3275 *DESCRIPTION
f4282e8a52723b917f0368dbf73601ab *DESCRIPTION
012592abf4b40a8d741b299df2ded05a *NAMESPACE
80aa05ca421f4b4aafd2aa1c62e5bf2d *R/db.r
4a62baaaeb68b971eba22eb579f4e414 *R/map.r
5f0c0ab48d2ce320c4ba0d0018a57d99 *R/misc.r
89ba2eda91abd2d6fdaebfde9da3f4e9 *R/polygon.r
45bb5cad9ffc203d8e62dae784725f37 *R/smooth.r
6e753ff5cb6ed7189c4e0dcd3eb46758 *R/zzz.R
6f0c8ff18c3b1d87c3fe4687ae7da8da *R/zzz.R
6d3acd6bf8fe0501140653a66952a160 *data/canada.cities.rda
09229fd795049dfd32cba1042ae16c69 *data/county.fips.rda
35d87c916a508fe3c71c917cd1c33cb3 *data/countyMapEnv.r
982a75588059981c75480cabd4d6221f *data/franceMapEnv.r
e905d7c3ec3746a5463aece42a29afce *data/italyMapEnv.r
b8168bd40b33d5493e67a5d2f35d7e67 *data/nzMapEnv.r
8d109b47aa40edeaaa43e7406c0ea3ba *data/ozone.rda
362b6ac3137d24e14ff31545c6bc75e5 *data/state.carto.center.rda
4188c1cf58e79e9ad31f2a828bf3f1aa *data/state.cartoMapEnv.r
e5e971cef422bb733644791ebdc05547 *data/state.fips.rda
0d920fc325a0cbd152019a3ef88adeb7 *data/state.vbm.center.rda
b69d31b3798c90f8daf7739755de1a93 *data/state.vbmMapEnv.r
388d3067e6c9ce642d2dafbb02b8851e *data/stateMapEnv.r
3bbbc17c88b46d5ccfc51cfdc599ce28 *data/unemp.rda
47260e722f73cdedba76a2cc1e6a3205 *data/us.cities.rda
Expand Down Expand Up @@ -43,16 +47,18 @@ dc4256b7510c06529ade1c14c58cd5c7 *man/ozone.Rd
e368efb53ad4d9a95938eb078ca68fd8 *man/polygon.Rd
fc2661fa4e7119cae77f7c937205bab3 *man/smooth.map.Rd
53e2f7fe3c4166e412fdbecab22557fa *man/state.Rd
ba8d5d668beb64222ee0feecc3be1f83 *man/state.fips.Rd
c2bfc2d7a2639dbf64962901f70e4c92 *man/state.carto.Rd
fa354b69c9d9ca135a97133f00bd0024 *man/state.fips.Rd
5634c8781a38aff1c8c5867a2582b504 *man/state.vbm.Rd
4772854c8b17ec1604f5e099e4375c8a *man/us.cities.Rd
f25971f020951d5260292158a6600389 *man/usa.Rd
8f319ab0ebd2fe4d3db27fea8b2e52fc *man/world.Rd
dc4668c3b67ae20d466fdb60c07be88c *man/world.cities.Rd
150ee84eeb7fb26843418b9213468e88 *man/world2.Rd
f684d16afeece0ab0ecdaddd67397466 *src/Gmake.c
9d0c7fa4265c2622840a930b7fa8f67a *src/Lmake.c
b166b91401f14635f63f96152a837baf *src/Makefile
5836a87ca9b464dd87c5cbf401e6344a *src/Makefile.win
7088312f20b1d127d59081a8ea4ce10c *src/Makefile
d1ebffb0e35151ea78870f20b78320d5 *src/Makefile.win
ee000c17ddd154301f679ce267ed4918 *src/README
885521324ea75cdfcea9d91a5afb0ec5 *src/convert.awk
7e6373f288c239e3c4a81dd10347d2c9 *src/county.gon
Expand All @@ -73,19 +79,29 @@ f7c622f74f28e328d3d65f265f0a26c3 *src/italy.gonstats
1ddcc46403193ad474b3934d046f10bf *src/italy.name
28f0356bc9bb3e0b479b9cc916930730 *src/map.h
11fb4709e58d7a684b9c48dbe54fd8b5 *src/mapget.c
8cee9d537960596124350a5aad35f91a *src/maps.def
5e9c4adf4fc41a391e3539fa708961b0 *src/nz.gon
1baecc758797af3a5db79c56f81b16be *src/nz.gonstats
750f995d19363927fdc64f1656f5e6ac *src/nz.line
f4813dcc9e8ace61c3127247d89ca050 *src/nz.linestats
9f6127bc86be1670ef43b54b113a94b9 *src/nz.name
38c841a4ae31088764a4173dea9fb99d *src/smooth.c
6c92393ef3acc69f57b4f872d1c28e47 *src/state.carto.gon
db440c97b18a6344052b56e25b841f4f *src/state.carto.gonstats
165c66a04e6a98fc905ccf2a8f8ecfe2 *src/state.carto.line
89c9babeeb2c2ba537e6c0948abcd038 *src/state.carto.linestats
55f43c464d795dfd9f5c30bd1326a431 *src/state.carto.name
efbdb5e7346ddaae0314aff52661b45f *src/state.gon
8a5f0b214eb18898570b3d3265690c7b *src/state.gonstats
9ec76bff7df86d5e1d1e62b231f57d8c *src/state.line
1cf5afc6966bb36f5bc82eea4b2335c6 *src/state.linestats
54a14292aa6880f6e3760b8f6c559a85 *src/state.name
11c733a2db4704c9e2f13942a4c998fc *src/thin.c
7565197b7181346e1632535bfc36650a *src/thin.c.orig
6c92393ef3acc69f57b4f872d1c28e47 *src/state.vbm.gon
db440c97b18a6344052b56e25b841f4f *src/state.vbm.gonstats
85b0e36ec94dcf8b1b5b39ae324106b1 *src/state.vbm.line
69fd7440de022ae8ff0874b0aa441de7 *src/state.vbm.linestats
55f43c464d795dfd9f5c30bd1326a431 *src/state.vbm.name
7565197b7181346e1632535bfc36650a *src/thin.c
f298493e3329a78ce0931272d511b60f *src/usa.gon
1c1041f7228b105eaaa93d8b3a9bf8d1 *src/usa.gonstats
64612e351ce91a03a2040b0edd64d295 *src/usa.line
Expand Down
2 changes: 0 additions & 2 deletions R/zzz.R
@@ -1,6 +1,4 @@
.onLoad <- function(lib, pkg) {
if(!exists("Sys.setenv", envir = baseenv()))
Sys.setenv <- Sys.putenv
if (Sys.getenv("R_MAP_DATA_DIR") == "")
Sys.setenv("R_MAP_DATA_DIR"=paste(lib, pkg, "mapdata/", sep="/"))
library.dynam("maps", pkg, lib)
Expand Down
Binary file added data/state.carto.center.rda
Binary file not shown.
1 change: 1 addition & 0 deletions data/state.cartoMapEnv.r
@@ -0,0 +1 @@
state.cartoMapEnv <- "R_MAP_DATA_DIR"
Binary file added data/state.vbm.center.rda
Binary file not shown.
1 change: 1 addition & 0 deletions data/state.vbmMapEnv.r
@@ -0,0 +1 @@
state.vbmMapEnv <- "R_MAP_DATA_DIR"
49 changes: 49 additions & 0 deletions man/state.carto.Rd
@@ -0,0 +1,49 @@
\name{state.carto}
\docType{data}
\alias{state.carto}
\alias{state.cartoMapEnv}
\alias{state.carto.center}
\title{
United States State Population Cartogram Map
}
\usage{
data(stateMapEnv)
data(state.carto.center)
}
\description{

This database produces a cartogram of the states of the United States
mainland based on CartoDraw, roughly proportional to population (see
references).

\code{state.carto.center} are coordinates of the state centers
for annotation purposes.
}
\format{
The data file is merely an assignment to a character string which
specifies the name of an environment variable which contains the
base location of the binary files used by the map drawing functions.
This environment variable (\code{R_MAP_DATA_DIR} for the datasets in the
maps package) is set at package load time \emph{if it does not
already exist}. Hence setting the environment variable before loading
the package can override the default location of the binary datasets.
}
\seealso{
\code{\link{map}}.
}
\examples{
map('state.carto', fill = TRUE, col = palette())
}
\references{
Richard A. Becker, and Allan R. Wilks,
"Maps in S",
\emph{AT\&T Bell Laboratories Statistics Research Report [93.2], 1993.}

Richard A. Becker, and Allan R. Wilks,
"Constructing a Geographical Database",
\emph{AT\&T Bell Laboratories Statistics Research Report [95.2], 1995.}

CartoDraw,
\url{http://infovis.uni-konstanz.de/~panse/CartoDraw/CartoDrawIndex.php}
}
\keyword{datasets}
6 changes: 3 additions & 3 deletions man/state.fips.Rd
Expand Up @@ -10,9 +10,9 @@ A database matching FIPS codes to maps package state names.
\usage{data(state.fips)}
\format{
A list with 6 components, namely "fips", "ssa", "region", division",
"abb" and "polyname", containing the FIPS, SSA, REGION and DIVISION
numbers, the standard state abbreviation and the the respective state
polygon name.
"abb" and "polyname", containing the US Census Bureau FIPS, SSA, REGION
and DIVISION numbers, the standard state abbreviation and the respective
state polygon name.
}
\seealso{
\code{\link{county.fips}}
Expand Down
51 changes: 51 additions & 0 deletions man/state.vbm.Rd
@@ -0,0 +1,51 @@
\name{state.vbm}
\docType{data}
\alias{state.vbm}
\alias{state.vbmMapEnv}
\alias{state.vbm.center}
\title{
United States State Visibility Base Map
}
\usage{
data(stateMapEnv)
data(state.vbm.center)
}
\description{

This database produces a map of the states of the United States
mainland. The Visibility Base Map was created by Mark Monmonier
to provide simplified state shapes with sufficient areas to allow
annotations in even the small states.

\code{state.vbm.center} are coordinates of the state centers
for annotation purposes.
}
\format{
The data file is merely an assignment to a character string which
specifies the name of an environment variable which contains the
base location of the binary files used by the map drawing functions.
This environment variable (\code{R_MAP_DATA_DIR} for the datasets in the
maps package) is set at package load time \emph{if it does not
already exist}. Hence setting the environment variable before loading
the package can override the default location of the binary datasets.
}
\seealso{
\code{\link{map}}.
}
\examples{
map('state.vbm', fill = TRUE, col = palette())
}
\references{
Richard A. Becker, and Allan R. Wilks,
"Maps in S",
\emph{AT\&T Bell Laboratories Statistics Research Report [93.2], 1993.}

Richard A. Becker, and Allan R. Wilks,
"Constructing a Geographical Database",
\emph{AT\&T Bell Laboratories Statistics Research Report [95.2], 1995.}

Mark Monmonier and George Schnell,
"The Study of Population",
\emph{Elements, Patterns, Processes. Charles E. Merrill. Columbus, OH. 1982.}
}
\keyword{datasets}
14 changes: 11 additions & 3 deletions src/Makefile
Expand Up @@ -11,9 +11,9 @@ OBJS = mapget.o \
smooth.o \
thin.o

GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G
LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L
NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N
GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G state.vbm.G state.carto.G
LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L state.vbm.L state.carto.L
NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N state.vbm.N state.carto.N

.line.L:
@$(MKDIR) -p ../inst/mapdata
Expand All @@ -30,6 +30,14 @@ NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N

all: gdata ndata $(PKGNAME)$(SHLIB_EXT)

state.carto.L: state.carto.line state.carto.linestats Lmake
@$(MKDIR) -p ../inst/mapdata
./Lmake 0 p b state.carto.line state.carto.linestats ../inst/mapdata/state.carto.L

state.vbm.L: state.vbm.line state.vbm.linestats Lmake
@$(MKDIR) -p ../inst/mapdata
./Lmake 0 p b state.vbm.line state.vbm.linestats ../inst/mapdata/state.vbm.L

gdata: Gmake ldata
$(MAKE) $(GDATA)

Expand Down
14 changes: 11 additions & 3 deletions src/Makefile.win
Expand Up @@ -14,9 +14,9 @@ OBJS = mapget.o \
smooth.o \
thin.o

GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G
LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L
NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N
GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G state.vbm.G state.carto.G
LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L state.vbm.L state.carto.L
NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N state.vbm.N state.carto.N

.line.L:
@$(MKDIR) -p ../inst/mapdata
Expand All @@ -33,6 +33,14 @@ NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N

all: ../libs$(R_ARCH)/$(DLLNAME).dll ldata gdata ndata

state.carto.L: state.carto.line state.carto.linestats Lmake
@$(MKDIR) -p ../inst/mapdata
./Lmake 0 p b state.carto.line state.carto.linestats ../inst/mapdata/state.carto.L

state.vbm.L: state.vbm.line state.vbm.linestats Lmake
@$(MKDIR) -p ../inst/mapdata
./Lmake 0 p b state.vbm.line state.vbm.linestats ../inst/mapdata/state.vbm.L

gdata: Gmake ldata
$(MAKE) -f Makefile.win $(GDATA)

Expand Down
6 changes: 6 additions & 0 deletions src/maps.def
@@ -0,0 +1,6 @@
EXPORTS
_i686.get_pc_thunk.bx
_i686.get_pc_thunk.cx
_i686.get_pc_thunk.bx
_i686.get_pc_thunk.bx
_i686.get_pc_thunk.cx
100 changes: 100 additions & 0 deletions src/state.carto.gon
@@ -0,0 +1,100 @@
1
EOR
2
EOR
3
EOR
4
EOR
5
EOR
6
EOR
7
EOR
8
EOR
9
EOR
10
EOR
11
EOR
12
EOR
13
EOR
14
EOR
15
EOR
16
EOR
17
EOR
18
EOR
19
EOR
20
EOR
21
EOR
22
EOR
23
EOR
24
EOR
25
EOR
26
EOR
27
EOR
28
EOR
29
EOR
30
EOR
31
EOR
32
EOR
33
EOR
34
EOR
35
EOR
36
EOR
37
EOR
38
EOR
39
EOR
40
EOR
41
EOR
42
EOR
43
EOR
44
EOR
45
EOR
46
EOR
47
EOR
48
EOR
49
EOR
50
EOR
1 change: 1 addition & 0 deletions src/state.carto.gonstats
@@ -0,0 +1 @@
50 1

0 comments on commit f27af72

Please sign in to comment.