diff -Nru r-cran-maps-2.2-1/DESCRIPTION r-cran-maps-2.3-2/DESCRIPTION --- r-cran-maps-2.2-1/DESCRIPTION 2011-11-03 11:48:16.000000000 +0000 +++ r-cran-maps-2.3-2/DESCRIPTION 2013-03-13 06:24:49.000000000 +0000 @@ -1,17 +1,18 @@ Package: maps Title: Draw Geographical Maps -Version: 2.2-1 -Date: 2011-11-03 -Author: Original S code by Richard A. Becker and Allan R. Wilks. - R version by Ray Brownrigg - Enhancements by Thomas P Minka +Version: 2.3-2 +Date: 2013-03-13 +Author: Original S code by Richard A. Becker and Allan R. Wilks. R + version by Ray Brownrigg . + Enhancements by Thomas P Minka Description: Display of maps. Projection code and larger maps are in - separate packages (mapproj and mapdata). + separate packages (mapproj and mapdata). Depends: R (>= 2.10.0) LazyLoad: yes -Suggests: mapproj +Suggests: mapproj (>= 1.2-0) License: GPL-2 Maintainer: Ray Brownrigg -Packaged: 2011-11-03 03:23:57 UTC; ray +Packaged: 2013-03-13 01:09:30 UTC; ray +NeedsCompilation: yes Repository: CRAN -Date/Publication: 2011-11-03 11:48:16 +Date/Publication: 2013-03-13 07:24:49 diff -Nru r-cran-maps-2.2-1/MD5 r-cran-maps-2.3-2/MD5 --- r-cran-maps-2.2-1/MD5 2011-11-03 11:48:17.000000000 +0000 +++ r-cran-maps-2.3-2/MD5 2013-03-13 06:24:49.000000000 +0000 @@ -1,70 +1,76 @@ -13cf847a6d86dc9f38e0731d583a3275 *DESCRIPTION -012592abf4b40a8d741b299df2ded05a *NAMESPACE -80aa05ca421f4b4aafd2aa1c62e5bf2d *R/db.r -4a62baaaeb68b971eba22eb579f4e414 *R/map.r -5f0c0ab48d2ce320c4ba0d0018a57d99 *R/misc.r -89ba2eda91abd2d6fdaebfde9da3f4e9 *R/polygon.r +6c4d65684cae1c2cd102da68ac6cf4ea *DESCRIPTION +a7f0b8524eb866e5c1637c2bb26a6e6d *NAMESPACE +541be685a010ed74e9f33aeaf491abad *R/db.r +8c730804e871f486c499b98b0a6dba32 *R/map.r +87ee42928e3da1330378b83a4f90b61e *R/misc.r +5ed05e6301c8134792b4913684dd6756 *R/polygon.r 45bb5cad9ffc203d8e62dae784725f37 *R/smooth.r -6e753ff5cb6ed7189c4e0dcd3eb46758 *R/zzz.R +d761cb0e87098ffd6c692723e9bba355 *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 +44b4c90c5a48be9b0df22f8672ba1ae6 *data/countyMapEnv.rda +7aa906b92f0c66ffd54bcb0b725bb777 *data/franceMapEnv.rda +926cb2485b60731c462ee03838a2b6ba *data/italyMapEnv.rda +1eade030b5a550e75be6e376270166d0 *data/nzMapEnv.rda 8d109b47aa40edeaaa43e7406c0ea3ba *data/ozone.rda +362b6ac3137d24e14ff31545c6bc75e5 *data/state.carto.center.rda +bdc41fee0d78aa55dd1cc5e9cd1f17eb *data/state.cartoMapEnv.rda e5e971cef422bb733644791ebdc05547 *data/state.fips.rda -388d3067e6c9ce642d2dafbb02b8851e *data/stateMapEnv.r +0d920fc325a0cbd152019a3ef88adeb7 *data/state.vbm.center.rda +2fe186e0e6b7d64def9a8d64a087db1f *data/state.vbmMapEnv.rda +770e4cfa68e598f60308e067b3eea267 *data/stateMapEnv.rda 3bbbc17c88b46d5ccfc51cfdc599ce28 *data/unemp.rda 47260e722f73cdedba76a2cc1e6a3205 *data/us.cities.rda -c65f0fd76cf1705827c27ef6d6bf646a *data/usaMapEnv.r +39f427ea30add5d209453cc4482cd3bf *data/usaMapEnv.rda 0f1a65d78161fb00e86d5386a2f883cd *data/votes.repub.rda -bc55cff7e2a132d415275bade4846303 *data/world.cities.rda -d92fb72bdbea7946860c1a851e230b23 *data/world2MapEnv.r -af1a98ea280598ed1cd85d00551cba98 *data/worldMapEnv.r +0b7f7d6b698d6ad3bb20a15083765313 *data/world.cities.rda +da4b00d5bd1ea2f96e2dbcc3483d856f *data/world2MapEnv.rda +b185cd4a3e87254f46636e75d986c7a9 *data/worldMapEnv.rda 5f9fab4844ba7d6a1ad6f65e8f684355 *man/area.map.Rd bcd90a5871cfbca677d5e2590d308d87 *man/canada.cities.Rd -40b9c294d387d360981778a6856a6503 *man/county.Rd +06453aa651694d62330ddf9cb23f83bf *man/county.Rd a71b764c02af9ac06851c03ac063a192 *man/county.fips.Rd -9a0baabe36fda722dd13221279189a19 *man/france.Rd +aabfc891bf0e9ae20a418e187df652ec *man/france.Rd f6c4336f6614dabf3573895a38ea1099 *man/identify.map.Rd b39d593d4b02815c823f555cf8599ee5 *man/internal.Rd 56766404494d261648f09393180151dc *man/internal2.Rd -b80ddc48b7415d5f4122b9ef598279b0 *man/italy.Rd -fb972de4b0386b6cdcc42aae735212ea *man/map.Rd +b26a115b2797ec918ad277ce680dcd8a *man/italy.Rd +90c6f61c1ae32563fe8969bd5a2f003d *man/map.Rd f590ca3d82f3a60d0714c70bf6bdffb6 *man/map.axes.Rd -5a6345e78e10197ba4db0ffa550670cf *man/map.cities.Rd +075d0bdab24034a7afc7cbabda65f70a *man/map.cities.Rd 7154c4758c1f712f926af93e5fce1c60 *man/map.scale.Rd 9e3bf07d05f43ff69672df274da89943 *man/map.text.Rd 631a40fee9c727336502266f76e644a1 *man/map.where.Rd 42b367151050df253705fa17c2d8e1a1 *man/match.map.Rd -d6455f76d2c29928bc9aa7950528e3be *man/nz.Rd +a775ac2a16cfe73efc6f6865c110121b *man/nz.Rd dc4256b7510c06529ade1c14c58cd5c7 *man/ozone.Rd e368efb53ad4d9a95938eb078ca68fd8 *man/polygon.Rd fc2661fa4e7119cae77f7c937205bab3 *man/smooth.map.Rd -53e2f7fe3c4166e412fdbecab22557fa *man/state.Rd -ba8d5d668beb64222ee0feecc3be1f83 *man/state.fips.Rd +805125518fa07c22f1116266bfdb270b *man/state.Rd +6f697331a4eaa960a3d7afac01825f52 *man/state.carto.Rd +fa354b69c9d9ca135a97133f00bd0024 *man/state.fips.Rd +1b19074afcafe8e0d1aa8464fbb6b0d6 *man/state.vbm.Rd 4772854c8b17ec1604f5e099e4375c8a *man/us.cities.Rd -f25971f020951d5260292158a6600389 *man/usa.Rd -8f319ab0ebd2fe4d3db27fea8b2e52fc *man/world.Rd +ba6071e86450424b7b2ef124f177e447 *man/usa.Rd +faa77f6cbf5f22717cce65cf9067a97b *man/world.Rd dc4668c3b67ae20d466fdb60c07be88c *man/world.cities.Rd -150ee84eeb7fb26843418b9213468e88 *man/world2.Rd +f8d6628f3fd04780afafbd5143d39b6b *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 +5046e7c59a58b0cad2b45cceb029a0ab *src/county.gon 42d31544ad47078bf51d2d43cd125658 *src/county.gonstats -d12c98250b5ebfb76d373848f2dfe17c *src/county.line -013879757feaded46183178af9dbf262 *src/county.linestats -8a1b5889411471d7694d97ebdf783356 *src/county.name +83e6208927194a37954576191c968ba9 *src/county.line +3840bd593493aff0a8a09564772ca1ce *src/county.linestats +71b3af1d063b50d18d5cc3325f312537 *src/county.name 39cb343519f464aa76c254763e420890 *src/france.gon 0ea34241398d4f8b1512e52d9039917e *src/france.gonstats fc3a0c540e31cc2d6c92579fd0ee9bd1 *src/france.line 23035dcc6ed0cf83bb7b50bbb650f0b8 *src/france.linestats -b60fcb42009e8dff53911077e8b96107 *src/france.name +c519dfb2145d59b4115d713399761a2a *src/france.name 98edece48bd5a0d8669d54dbbbfdf5d8 *src/getstats.sh a804b957f9000f0e9ca74483fbb66df6 *src/italy.gon f7c622f74f28e328d3d65f265f0a26c3 *src/italy.gonstats @@ -72,20 +78,30 @@ 1495aafdb361a79248ca9c2950c57d90 *src/italy.linestats 1ddcc46403193ad474b3934d046f10bf *src/italy.name 28f0356bc9bb3e0b479b9cc916930730 *src/map.h -11fb4709e58d7a684b9c48dbe54fd8b5 *src/mapget.c +c618f6bb1a25250d0132a989894906b8 *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 @@ -93,6 +109,6 @@ 9d7b8808ac4036ebb98e4f94a5ec8281 *src/usa.name f1a1b6c9257c30aed9625a01dcec660b *src/world.gon 0902fc2c7b181fbf40673b9d9748ad00 *src/world.gonstats -0dd8f14ca75749c2fa3fdf834100f0e9 *src/world.line -46c6d5c6021921b44d3edb8c5946f5b0 *src/world.linestats +76e802969266838ed27ee0a27f05ba80 *src/world.line +a92ae175e549ef37cdcd565b97dac430 *src/world.linestats 2abd839acc105d625c51d6c3d9287a6b *src/world.name diff -Nru r-cran-maps-2.2-1/NAMESPACE r-cran-maps-2.3-2/NAMESPACE --- r-cran-maps-2.2-1/NAMESPACE 2011-11-02 23:14:26.000000000 +0000 +++ r-cran-maps-2.3-2/NAMESPACE 2012-12-10 21:34:02.000000000 +0000 @@ -1 +1 @@ -exportPattern("^[^\\.]") +export(area.map, identify.map, map, map.axes, map.cities, map.scale, map.text, map.where, map.wrap, match.map, smooth.map, .map.range) diff -Nru r-cran-maps-2.2-1/R/db.r r-cran-maps-2.3-2/R/db.r --- r-cran-maps-2.2-1/R/db.r 2006-10-08 22:41:07.000000000 +0000 +++ r-cran-maps-2.3-2/R/db.r 2013-03-13 00:32:39.000000000 +0000 @@ -5,7 +5,7 @@ ngon <- length(gons) gnames <- names(gons) dbname <- paste(database, "MapEnv", sep = "") - data(list = dbname) + data(list = dbname, envir = environment()) mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "") z <- .C("mapgetg", PACKAGE="maps", as.character(mapbase), @@ -42,7 +42,7 @@ if(nline == 0) return(integer(0)) dbname <- paste(database, "MapEnv", sep = "") - data(list = dbname) + data(list = dbname, envir = environment()) mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "") z <- .C("mapgetl", PACKAGE="maps", as.character(mapbase), @@ -87,7 +87,7 @@ function(database = "world", patterns, exact = FALSE) { dbname <- paste(database, "MapEnv", sep = "") - data(list = dbname) + data(list = dbname, envir = environment()) mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "") # rewritten by Tom Minka fname <- paste(sep = "", mapbase, ".N") @@ -111,7 +111,7 @@ { if(is.character(database)) { dbname <- paste(database, "MapEnv", sep = "") - data(list = dbname) + data(list = dbname, envir = environment()) 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 @@ } if(is.character(database)) { dbname <- paste(database, "MapEnv", sep = "") - data(list = dbname) + data(list = dbname, envir = environment()) mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "") fname <- paste(sep = "", mapbase, ".N") x <- read.delim(fname, header = FALSE) diff -Nru r-cran-maps-2.2-1/R/map.r r-cran-maps-2.3-2/R/map.r --- r-cran-maps-2.2-1/R/map.r 2011-11-02 23:57:06.000000000 +0000 +++ r-cran-maps-2.3-2/R/map.r 2012-12-10 20:27:15.000000000 +0000 @@ -86,6 +86,12 @@ list(x = coord$x, y = coord$y, range = coord$range, names = nam) } +.map.range <- +local({ + val <- NULL + function(new) if(!missing(new)) val <<- new else val +}) + map <- function(database = "world", regions = ".", exact = FALSE, boundary = TRUE, interior = TRUE, projection = "", @@ -93,7 +99,7 @@ col = 1, plot = TRUE, add = FALSE, namesonly = FALSE, xlim = NULL, ylim = NULL, wrap = FALSE, resolution = if (plot) 1 else 0, type = "l", bg = par("bg"), - mar = c(4.1, 4.1, par("mar")[3], 0.1), border = 0.01, ...) + mar = c(4.1, 4.1, par("mar")[3], 0.1), myborder = 0.01, ...) { # parameter checks if (resolution>0 && !plot) @@ -114,7 +120,7 @@ boundary, interior, fill, as.polygon) if (is.na(coord$x[1])) stop("first coordinate is NA. bad map data?") if (plot) { - assign(".map.range", coord$range, envir = globalenv()) + .map.range(coord$range) } if (doproj) { nam <- coord$names @@ -148,7 +154,7 @@ aspect <- c(1, 1) } else aspect <- c(cos((mean(yrange) * pi)/180), 1) - d <- c(diff(xrange), diff(yrange)) * (1 + 2 * border) * aspect + d <- c(diff(xrange), diff(yrange)) * (1 + 2 * myborder) * aspect if (coordtype != "spherical" || doproj) { plot.window(xrange, yrange, asp = 1/aspect[1]) } else { @@ -160,7 +166,7 @@ p <- par("pin") p <- d * min(p/d) par(pin = p) - d <- d * border + ((p/min(p/d) - d)/2)/aspect + d <- d * myborder + ((p/min(p/d) - d)/2)/aspect usr <- c(xrange, yrange) + rep(c(-1, 1), 2) * rep(d, c(2, 2)) par(usr = usr) } @@ -228,8 +234,8 @@ ends <- c(breaks - 1, n) x[ends + 1] = x[starts] y[ends + 1] = y[starts] - x = maps::insert(x, breaks + 1) - y = maps::insert(y, breaks + 1) + x = maps:::insert(x, breaks + 1) + y = maps:::insert(y, breaks + 1) list(x = x, y = y) } insert <- function(x, i, v = NA) { diff -Nru r-cran-maps-2.2-1/R/misc.r r-cran-maps-2.3-2/R/misc.r --- r-cran-maps-2.2-1/R/misc.r 2011-11-02 23:31:42.000000000 +0000 +++ r-cran-maps-2.3-2/R/misc.r 2013-03-11 21:31:10.000000000 +0000 @@ -31,24 +31,24 @@ parameters = NULL, orientation = NULL, pch = 1, ...) { if (missing(x)) { - data("world.cities", package = "maps") # uses lazy evaluation + data("world.cities", package = "maps", envir = environment()) # uses lazy evaluation world.cities <- get("world.cities") } usr <- par("usr") if (!missing(projection) && projection != FALSE) { - require(mapproj) - if (is.character(projection)) { - projx <- mapproject(x$long, x$lat, projection = projection, - parameters = parameters, orientation = orientation) - } else { - if (exists(".Last.projection")) { - projx <- mapproject(x$long, x$lat) - } else stop("No projection defined\n") - } - x$long <- projx$x - x$lat <- projx$y + if (require(mapproj)) { + if (is.character(projection)) { + projx <- mapproject(x$long, x$lat, projection = projection, + parameters = parameters, orientation = orientation) + } else { + if (nchar(.Last.projection()$projection) > 0) { + projx <- mapproject(x$long, x$lat) + } else stop("No projection defined\n") + } + x$long <- projx$x + x$lat <- projx$y + } else stop("mapproj package not available\n") } else { - mapproject <- function() {} # Keep R CMD check quiet if (usr[2] > (180 + 0.04*(usr[2] - usr[1]))) x$long[x$long < 0] <- 360 + x$long[x$long < 0] } diff -Nru r-cran-maps-2.2-1/R/polygon.r r-cran-maps-2.3-2/R/polygon.r --- r-cran-maps-2.2-1/R/polygon.r 2010-04-19 22:19:22.000000000 +0000 +++ r-cran-maps-2.3-2/R/polygon.r 2013-03-13 00:35:42.000000000 +0000 @@ -7,7 +7,7 @@ } if(is.character(database)) { dbname <- paste(database, "MapEnv", sep = "") - data(list = dbname) + data(list = dbname, envir = environment()) mapbase <- paste(Sys.getenv(get(dbname)), database, sep = "") gon <- .C("map_where", PACKAGE="maps", as.character(mapbase), diff -Nru r-cran-maps-2.2-1/R/zzz.R r-cran-maps-2.3-2/R/zzz.R --- r-cran-maps-2.2-1/R/zzz.R 2011-11-02 02:34:40.000000000 +0000 +++ r-cran-maps-2.3-2/R/zzz.R 2012-12-03 22:35:31.000000000 +0000 @@ -1,7 +1,5 @@ -.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) -} +.onLoad <- function(lib, pkg) { + if (Sys.getenv("R_MAP_DATA_DIR") == "") + Sys.setenv("R_MAP_DATA_DIR"=paste(lib, pkg, "mapdata/", sep="/")) + library.dynam("maps", pkg, lib) +} diff -Nru r-cran-maps-2.2-1/data/countyMapEnv.r r-cran-maps-2.3-2/data/countyMapEnv.r --- r-cran-maps-2.2-1/data/countyMapEnv.r 2003-09-29 05:14:03.000000000 +0000 +++ r-cran-maps-2.3-2/data/countyMapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -countyMapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/countyMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/countyMapEnv.rda differ diff -Nru r-cran-maps-2.2-1/data/franceMapEnv.r r-cran-maps-2.3-2/data/franceMapEnv.r --- r-cran-maps-2.2-1/data/franceMapEnv.r 2004-02-26 04:19:53.000000000 +0000 +++ r-cran-maps-2.3-2/data/franceMapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -franceMapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/franceMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/franceMapEnv.rda differ diff -Nru r-cran-maps-2.2-1/data/italyMapEnv.r r-cran-maps-2.3-2/data/italyMapEnv.r --- r-cran-maps-2.2-1/data/italyMapEnv.r 2004-02-23 00:26:26.000000000 +0000 +++ r-cran-maps-2.3-2/data/italyMapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -italyMapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/italyMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/italyMapEnv.rda differ diff -Nru r-cran-maps-2.2-1/data/nzMapEnv.r r-cran-maps-2.3-2/data/nzMapEnv.r --- r-cran-maps-2.2-1/data/nzMapEnv.r 2003-09-29 05:17:49.000000000 +0000 +++ r-cran-maps-2.3-2/data/nzMapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -nzMapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/nzMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/nzMapEnv.rda differ Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/state.carto.center.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/state.carto.center.rda differ Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/state.cartoMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/state.cartoMapEnv.rda differ Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/state.vbm.center.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/state.vbm.center.rda differ Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/state.vbmMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/state.vbmMapEnv.rda differ diff -Nru r-cran-maps-2.2-1/data/stateMapEnv.r r-cran-maps-2.3-2/data/stateMapEnv.r --- r-cran-maps-2.2-1/data/stateMapEnv.r 2003-09-29 05:17:58.000000000 +0000 +++ r-cran-maps-2.3-2/data/stateMapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -stateMapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/stateMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/stateMapEnv.rda differ diff -Nru r-cran-maps-2.2-1/data/usaMapEnv.r r-cran-maps-2.3-2/data/usaMapEnv.r --- r-cran-maps-2.2-1/data/usaMapEnv.r 2003-09-29 05:18:07.000000000 +0000 +++ r-cran-maps-2.3-2/data/usaMapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usaMapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/usaMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/usaMapEnv.rda differ Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/world.cities.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/world.cities.rda differ diff -Nru r-cran-maps-2.2-1/data/world2MapEnv.r r-cran-maps-2.3-2/data/world2MapEnv.r --- r-cran-maps-2.2-1/data/world2MapEnv.r 2003-09-29 05:18:16.000000000 +0000 +++ r-cran-maps-2.3-2/data/world2MapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -world2MapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/world2MapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/world2MapEnv.rda differ diff -Nru r-cran-maps-2.2-1/data/worldMapEnv.r r-cran-maps-2.3-2/data/worldMapEnv.r --- r-cran-maps-2.2-1/data/worldMapEnv.r 2003-09-29 05:18:23.000000000 +0000 +++ r-cran-maps-2.3-2/data/worldMapEnv.r 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -worldMapEnv <- "R_MAP_DATA_DIR" Binary files /tmp/EDIB8B1ivz/r-cran-maps-2.2-1/data/worldMapEnv.rda and /tmp/wMkLt3a_In/r-cran-maps-2.3-2/data/worldMapEnv.rda differ diff -Nru r-cran-maps-2.2-1/debian/changelog r-cran-maps-2.3-2/debian/changelog --- r-cran-maps-2.2-1/debian/changelog 2011-11-04 17:07:28.000000000 +0000 +++ r-cran-maps-2.3-2/debian/changelog 2013-05-07 02:47:21.000000000 +0000 @@ -1,3 +1,23 @@ +r-cran-maps (2.3-2-1precise0) precise; urgency=low + + * Compilation for Ubuntu 12.04.2 LTS + + -- Michael Rutter Tue, 07 May 2013 02:47:21 +0000 + +r-cran-maps (2.3-2-1) unstable; urgency=low + + * New upstream release. + * Rebuild for R 3.0.0. + + -- Chris Lawrence Sun, 31 Mar 2013 20:36:19 -0400 + +r-cran-maps (2.2-5-1) unstable; urgency=low + + * New upstream release. + * Finally use r-cran.mk. + + -- Chris Lawrence Thu, 22 Mar 2012 14:19:33 -0400 + r-cran-maps (2.2-1-1) unstable; urgency=low * New upstream release. diff -Nru r-cran-maps-2.2-1/debian/control r-cran-maps-2.3-2/debian/control --- r-cran-maps-2.2-1/debian/control 2011-10-21 01:26:03.000000000 +0000 +++ r-cran-maps-2.3-2/debian/control 2013-04-01 00:40:40.000000000 +0000 @@ -2,12 +2,13 @@ Section: gnu-r Priority: optional Maintainer: Chris Lawrence -Build-Depends: debhelper (>> 7), r-base-dev (>= 2.14), cdbs -Standards-Version: 3.9.2 +Build-Depends: debhelper (>> 7), r-base-dev (>= 3.0), cdbs +Standards-Version: 3.9.3 +Homepage: http://cran.r-project.org/package=maps Package: r-cran-maps Architecture: any -Depends: r-base-core (>= 2.14), ${shlibs:Depends}, ${misc:Depends} +Depends: ${R:Depends}, ${shlibs:Depends}, ${misc:Depends} Suggests: r-cran-mapproj, r-cran-mapdata Description: GNU R support for producing geographic maps This package provides facilities for easily producing maps based on diff -Nru r-cran-maps-2.2-1/debian/rules r-cran-maps-2.3-2/debian/rules --- r-cran-maps-2.2-1/debian/rules 2010-04-26 00:42:02.000000000 +0000 +++ r-cran-maps-2.3-2/debian/rules 2012-03-22 18:31:10.000000000 +0000 @@ -3,25 +3,7 @@ # debian/rules file for the Debian/GNU Linux r-cran-car package # Copyright 2003 by Dirk Eddelbuettel -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/langcore.mk - -## We need the CRAN (upstream) name -cranName := $(shell grep Package: DESCRIPTION | cut -f2 -d" ") -## and we need to build a Debian Policy-conformant lower-case package name -cranNameLC := $(shell echo $(cranName) | tr "[A-Z]" "[a-z]" | tr "." "-" ) -## which we can use to build the package directory -package := r-cran-$(cranNameLC) -## which we use for the to-be-installed-in directory -debRlib := $(CURDIR)/debian/$(package)/usr/lib/R/site-library - -common-install-indep:: R_any_arch -common-install-arch:: R_any_arch - -R_any_arch: - dh_installdirs usr/lib/R/site-library - AWK=/usr/bin/awk R CMD INSTALL -l $(debRlib) . - rm -vf $(debRlib)/R.css $(debRlib)/$(cranName)/COPYING +include /usr/share/R/debian/r-cran.mk clean:: (cd src; make clean) diff -Nru r-cran-maps-2.2-1/man/county.Rd r-cran-maps-2.3-2/man/county.Rd --- r-cran-maps-2.2-1/man/county.Rd 2003-09-30 03:23:02.000000000 +0000 +++ r-cran-maps-2.3-2/man/county.Rd 2012-12-05 21:31:47.000000000 +0000 @@ -13,7 +13,7 @@ generated from US Department of the Census data (see the reference). } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/man/france.Rd r-cran-maps-2.3-2/man/france.Rd --- r-cran-maps-2.2-1/man/france.Rd 2004-09-19 22:28:16.000000000 +0000 +++ r-cran-maps-2.3-2/man/france.Rd 2012-12-05 21:32:07.000000000 +0000 @@ -19,7 +19,7 @@ UNEP/GRID-Geneva". } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/man/italy.Rd r-cran-maps-2.3-2/man/italy.Rd --- r-cran-maps-2.2-1/man/italy.Rd 2004-09-19 22:27:28.000000000 +0000 +++ r-cran-maps-2.3-2/man/italy.Rd 2012-12-05 21:32:50.000000000 +0000 @@ -19,7 +19,7 @@ UNEP/GRID-Geneva". } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/man/map.Rd r-cran-maps-2.3-2/man/map.Rd --- r-cran-maps-2.2-1/man/map.Rd 2011-11-03 02:35:53.000000000 +0000 +++ r-cran-maps-2.3-2/man/map.Rd 2013-02-28 21:10:54.000000000 +0000 @@ -4,22 +4,13 @@ Draw Geographical Maps } \description{Draw lines and polygons as specified by a map database.} -\synopsis{ -map(database = "world", regions = ".", exact = FALSE, boundary = TRUE, - interior = TRUE, projection = "", parameters = NULL, orientation = NULL, - fill = FALSE, col = 1, plot = TRUE, add = FALSE, namesonly = FALSE, - xlim = NULL, ylim = NULL, wrap = FALSE, resolution = if(plot) 1 else 0, - type = "l", bg = par("bg"), mar = c(4.1, 4.1, par("mar")[3], 0.1), - border = 0.01, ...) -} \usage{ -map(database, regions) # simple form map(database = "world", regions = ".", exact = FALSE, boundary = TRUE, interior = TRUE, projection = "", parameters = NULL, orientation = NULL, fill = FALSE, col = 1, plot = TRUE, add = FALSE, namesonly = FALSE, xlim = NULL, ylim = NULL, wrap = FALSE, resolution = if(plot) 1 else 0, type = "l", bg = par("bg"), mar = c(4.1, 4.1, par("mar")[3], 0.1), - border = 0.01, ...) + myborder = 0.01, ...) } \arguments{ \item{database}{ @@ -169,12 +160,18 @@ \item{mar}{ margins, as in \code{\link{par}}. Defaults allow for map.axes(). } - \item{border}{ + \item{myborder}{ scalar or vector of length 2 specifying the porportion of the plot to add to the defined or computed limits as borders. } \item{...}{Extra arguments passed to \code{polygon} or \code{lines}.} } +\details{ +The simplest form of use of this function is: +\preformatted{map(mymap)} +where \code{mymap} is the returned value from a previous call to +\code{map()}. +} \value{ If \code{plot = TRUE}, a plot is made where the polygons selected from \code{database}, through the @@ -206,8 +203,8 @@ map('usa') # national boundaries map('county', 'new jersey') # county map of New Jersey map('state', region = c('new york', 'new jersey', 'penn')) # map of three states -map("state", ".*dakota", border = 0) # map of the dakotas -map.axes() # show the effect of border = 0 +map("state", ".*dakota", myborder = 0) # map of the dakotas +map.axes() # show the effect of myborder = 0 if(require(mapproj)) map('state', proj = 'bonne', param = 45) # Bonne equal-area projection of states diff -Nru r-cran-maps-2.2-1/man/map.cities.Rd r-cran-maps-2.3-2/man/map.cities.Rd --- r-cran-maps-2.2-1/man/map.cities.Rd 2010-09-23 20:51:29.000000000 +0000 +++ r-cran-maps-2.3-2/man/map.cities.Rd 2012-03-21 19:53:58.000000000 +0000 @@ -88,12 +88,11 @@ 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@irisinternet.net} for the state and province -information). +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@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 diff -Nru r-cran-maps-2.2-1/man/nz.Rd r-cran-maps-2.3-2/man/nz.Rd --- r-cran-maps-2.2-1/man/nz.Rd 2003-09-30 03:33:04.000000000 +0000 +++ r-cran-maps-2.3-2/man/nz.Rd 2012-12-05 21:34:51.000000000 +0000 @@ -12,7 +12,7 @@ coastal islands. } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/man/state.Rd r-cran-maps-2.3-2/man/state.Rd --- r-cran-maps-2.2-1/man/state.Rd 2003-09-30 03:36:32.000000000 +0000 +++ r-cran-maps-2.3-2/man/state.Rd 2012-12-05 21:35:22.000000000 +0000 @@ -12,7 +12,7 @@ generated from US Department of the Census data (see the reference). } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/man/state.carto.Rd r-cran-maps-2.3-2/man/state.carto.Rd --- r-cran-maps-2.2-1/man/state.carto.Rd 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/man/state.carto.Rd 2012-12-05 21:35:29.000000000 +0000 @@ -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 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} diff -Nru r-cran-maps-2.2-1/man/state.fips.Rd r-cran-maps-2.3-2/man/state.fips.Rd --- r-cran-maps-2.2-1/man/state.fips.Rd 2011-11-03 03:00:16.000000000 +0000 +++ r-cran-maps-2.3-2/man/state.fips.Rd 2011-11-08 21:48:56.000000000 +0000 @@ -10,9 +10,9 @@ \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}} diff -Nru r-cran-maps-2.2-1/man/state.vbm.Rd r-cran-maps-2.3-2/man/state.vbm.Rd --- r-cran-maps-2.2-1/man/state.vbm.Rd 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/man/state.vbm.Rd 2012-12-05 21:35:46.000000000 +0000 @@ -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 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} diff -Nru r-cran-maps-2.2-1/man/usa.Rd r-cran-maps-2.3-2/man/usa.Rd --- r-cran-maps-2.2-1/man/usa.Rd 2003-09-30 00:17:59.000000000 +0000 +++ r-cran-maps-2.3-2/man/usa.Rd 2012-12-05 21:35:58.000000000 +0000 @@ -12,7 +12,7 @@ US Department of the Census data (see the reference). } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/man/world.Rd r-cran-maps-2.3-2/man/world.Rd --- r-cran-maps-2.2-1/man/world.Rd 2003-10-07 19:57:18.000000000 +0000 +++ r-cran-maps-2.3-2/man/world.Rd 2012-12-05 21:36:07.000000000 +0000 @@ -15,7 +15,7 @@ } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/man/world2.Rd r-cran-maps-2.3-2/man/world2.Rd --- r-cran-maps-2.2-1/man/world2.Rd 2003-10-07 19:57:40.000000000 +0000 +++ r-cran-maps-2.3-2/man/world2.Rd 2012-12-05 21:36:20.000000000 +0000 @@ -17,7 +17,7 @@ } \format{ -The data file is merely an assignment to a character string which +The data file is merely 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 diff -Nru r-cran-maps-2.2-1/src/Makefile r-cran-maps-2.3-2/src/Makefile --- r-cran-maps-2.2-1/src/Makefile 2011-11-02 21:19:09.000000000 +0000 +++ r-cran-maps-2.3-2/src/Makefile 2013-03-13 01:09:30.000000000 +0000 @@ -11,9 +11,9 @@ 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 @@ -30,6 +30,14 @@ 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) diff -Nru r-cran-maps-2.2-1/src/Makefile.win r-cran-maps-2.3-2/src/Makefile.win --- r-cran-maps-2.2-1/src/Makefile.win 2011-11-02 03:17:18.000000000 +0000 +++ r-cran-maps-2.3-2/src/Makefile.win 2011-11-08 21:32:38.000000000 +0000 @@ -14,9 +14,9 @@ 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 @@ -33,6 +33,14 @@ 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) diff -Nru r-cran-maps-2.2-1/src/county.gon r-cran-maps-2.3-2/src/county.gon --- r-cran-maps-2.2-1/src/county.gon 2004-07-19 04:06:15.000000000 +0000 +++ r-cran-maps-2.3-2/src/county.gon 2012-01-16 19:11:19.000000000 +0000 @@ -3576,7 +3576,7 @@ EOR 1911 8113 -4928 4927 -2379 2380 -1912 EOR - -3656 3657 -5697 5698 -4927 + -3656 8944 3657 -5697 5698 -4927 EOR -3931 3932 8629 -4635 4636 EOR @@ -3584,7 +3584,7 @@ EOR 557 2751 2793 -922 923 -1488 1487 -558 EOR - -598 600 5919 -8582 -3657 3655 -6294 + -598 600 8942 8943 -8944 3655 -6294 EOR 3005 -6919 -5135 5134 -3007 EOR @@ -4786,8 +4786,6 @@ EOR 7733 7767 7972 7987 -7734 EOR - 8698 -8698 -EOR -8842 8843 -8856 -8853 -8848 8850 EOR 7677 7706 8009 -8028 -7679 @@ -6162,3 +6160,5 @@ EOR 1205 -8878 -8875 -8873 -5445 5446 -1207 EOR + -8943 5919 -8582 -3657 +EOR diff -Nru r-cran-maps-2.2-1/src/county.line r-cran-maps-2.3-2/src/county.line --- r-cran-maps-2.2-1/src/county.line 1991-05-17 18:16:43.000000000 +0000 +++ r-cran-maps-2.3-2/src/county.line 2012-01-12 02:23:47.000000000 +0000 @@ -13444,9 +13444,8 @@ -1.8803 0.6032 -1.8803 0.5980 -1.8800 0.5979 -1.8801 0.5905 -1.8799 0.5904 -1.8799 0.5860 -1.8799 0.5843 EOR -1794 1790 - -1.8803 0.6032 -1.8780 0.6034 -1.8673 0.6034 -1.8633 0.6034 -1.8579 0.6006 - -1.8574 0.6006 +3083 1790 + -1.8711 0.6034 -1.8633 0.6034 -1.8579 0.6006 -1.8574 0.6006 EOR 2192 2183 -2.1138 0.7747 -2.1116 0.7748 -2.1116 0.7762 -2.1089 0.7763 -2.1088 0.7776 @@ -21877,8 +21876,8 @@ 1785 1763 -1.8713 0.6147 -1.8543 0.6147 EOR -1763 1794 - -1.8713 0.6147 -1.8682 0.6085 -1.8624 0.6084 -1.8620 0.6089 -1.8567 0.6089 +1763 3083 + -1.8690 0.6101 -1.8682 0.6085 -1.8624 0.6084 -1.8620 0.6089 -1.8567 0.6089 -1.8566 0.6084 EOR 288 1164 @@ -31758,7 +31757,7 @@ -1.6026 0.5193 -1.6019 0.5200 -1.6013 0.5204 -1.6006 0.5209 -1.5999 0.5215 -1.5993 0.5224 -1.5990 0.5228 -1.5988 0.5229 -1.5983 0.5229 -1.5974 0.5227 EOR -1794 1792 +3083 1792 -1.8574 0.6006 -1.8572 0.6024 -1.8582 0.6024 -1.8582 0.6038 -1.8580 0.6039 -1.8580 0.6084 -1.8566 0.6084 EOR @@ -33154,3 +33153,12 @@ -2.1443 0.8465 -2.1448 0.8464 -2.1448 0.8458 -2.1445 0.8455 -2.1439 0.8453 -2.1440 0.8450 -2.1437 0.8448 EOR +1763 1794 + -1.8713 0.6147 -1.8690 0.6101 +EOR +3083 1794 + -1.8690 0.6101 -1.8710 0.6101 -1.8711 0.6034 +EOR +1794 1790 + -1.8803 0.6032 -1.8780 0.6034 -1.8711 0.6034 +EOR diff -Nru r-cran-maps-2.2-1/src/county.linestats r-cran-maps-2.3-2/src/county.linestats --- r-cran-maps-2.2-1/src/county.linestats 2011-04-14 08:17:31.000000000 +0000 +++ r-cran-maps-2.3-2/src/county.linestats 2012-11-27 20:20:23.000000000 +0000 @@ -1 +1 @@ -8941 225 +8944 225 diff -Nru r-cran-maps-2.2-1/src/county.name r-cran-maps-2.3-2/src/county.name --- r-cran-maps-2.2-1/src/county.name 2004-07-19 04:04:47.000000000 +0000 +++ r-cran-maps-2.3-2/src/county.name 2012-01-16 19:42:10.000000000 +0000 @@ -286,7 +286,7 @@ delaware,kent 286 delaware,new castle 287 delaware,sussex 288 -district of columbia,washington 289 +district of columbia,washington 289 florida,alachua 290 florida,baker 291 florida,bay 292 @@ -1791,7 +1791,7 @@ new mexico,taos 1791 new mexico,torrance 1792 new mexico,union 1793 -new mexico,valencia 1794 +new mexico,cibola 1794 new york,albany 1795 new york,allegany 1796 new york,bronx 1797 @@ -2392,691 +2392,691 @@ south dakota,turner 2392 south dakota,union 2393 south dakota,walworth 2394 -south dakota 2395 -south dakota,yankton 2396 -south dakota,ziebach 2397 -tennessee,anderson 2398 -tennessee,bedford 2399 -tennessee,benton 2400 -tennessee,bledsoe 2401 -tennessee,blount 2402 -tennessee,bradley 2403 -tennessee,campbell 2404 -tennessee,cannon 2405 -tennessee,carroll 2406 -tennessee,carter 2407 -tennessee,cheatham 2408 -tennessee,chester 2409 -tennessee,claiborne 2410 -tennessee,clay 2411 -tennessee,cocke 2412 -tennessee,coffee 2413 -tennessee,crockett 2414 -tennessee,cumberland 2415 -tennessee,davidson 2416 -tennessee,decatur 2417 -tennessee,de kalb 2418 -tennessee,dickson 2419 -tennessee,dyer 2420 -tennessee,fayette 2421 -tennessee,fentress 2422 -tennessee,franklin 2423 -tennessee,gibson 2424 -tennessee,giles 2425 -tennessee,grainger 2426 -tennessee,greene 2427 -tennessee,grundy 2428 -tennessee,hamblen 2429 -tennessee,hamilton 2430 -tennessee,hancock 2431 -tennessee,hardeman 2432 -tennessee,hardin 2433 -tennessee,hawkins 2434 -tennessee,haywood 2435 -tennessee,henderson 2436 -tennessee,henry 2437 -tennessee,hickman 2438 -tennessee,houston 2439 -tennessee,humphreys 2440 -tennessee,jackson 2441 -tennessee,jefferson 2442 -tennessee,johnson 2443 -tennessee,knox 2444 -tennessee,lake 2445 -tennessee,lauderdale 2446 -tennessee,lawrence 2447 -tennessee,lewis 2448 -tennessee,lincoln 2449 -tennessee,loudon 2450 -tennessee,mcminn 2451 -tennessee,mcnairy 2452 -tennessee,macon 2453 -tennessee,madison 2454 -tennessee,marion 2455 -tennessee,marshall 2456 -tennessee,maury 2457 -tennessee,meigs 2458 -tennessee,monroe 2459 -tennessee,montgomery 2460 -tennessee,moore 2461 -tennessee,morgan 2462 -tennessee,obion 2463 -tennessee,overton 2464 -tennessee,perry 2465 -tennessee,pickett 2466 -tennessee,polk 2467 -tennessee,putnam 2468 -tennessee,rhea 2469 -tennessee,roane 2470 -tennessee,robertson 2471 -tennessee,rutherford 2472 -tennessee,scott 2473 -tennessee,sequatchie 2474 -tennessee,sevier 2475 -tennessee,shelby 2476 -tennessee,smith 2477 -tennessee,stewart 2478 -tennessee,sullivan 2479 -tennessee,sumner 2480 -tennessee,tipton 2481 -tennessee,trousdale 2482 -tennessee,unicoi 2483 -tennessee,union 2484 -tennessee,van buren 2485 -tennessee,warren 2486 -tennessee,washington 2487 -tennessee,wayne 2488 -tennessee,weakley 2489 -tennessee,white 2490 -tennessee,williamson 2491 -tennessee,wilson 2492 -texas,anderson 2493 -texas,andrews 2494 -texas,angelina 2495 -texas,aransas 2496 -texas,archer 2497 -texas,armstrong 2498 -texas,atascosa 2499 -texas,austin 2500 -texas,bailey 2501 -texas,bandera 2502 -texas,bastrop 2503 -texas,baylor 2504 -texas,bee 2505 -texas,bell 2506 -texas,bexar 2507 -texas,blanco 2508 -texas,borden 2509 -texas,bosque 2510 -texas,bowie 2511 -texas,brazoria 2512 -texas,brazos 2513 -texas,brewster 2514 -texas,briscoe 2515 -texas,brooks 2516 -texas,brown 2517 -texas,burleson 2518 -texas,burnet 2519 -texas,caldwell 2520 -texas,calhoun 2521 -texas,callahan 2522 -texas,cameron 2523 -texas,camp 2524 -texas,carson 2525 -texas,cass 2526 -texas,castro 2527 -texas,chambers 2528 -texas,cherokee 2529 -texas,childress 2530 -texas,clay 2531 -texas,cochran 2532 -texas,coke 2533 -texas,coleman 2534 -texas,collin 2535 -texas,collingsworth 2536 -texas,colorado 2537 -texas,comal 2538 -texas,comanche 2539 -texas,concho 2540 -texas,cooke 2541 -texas,coryell 2542 -texas,cottle 2543 -texas,crane 2544 -texas,crockett 2545 -texas,crosby 2546 -texas,culberson 2547 -texas,dallam 2548 -texas,dallas 2549 -texas,dawson 2550 -texas,deaf smith 2551 -texas,delta 2552 -texas,denton 2553 -texas,de witt 2554 -texas,dickens 2555 -texas,dimmit 2556 -texas,donley 2557 -texas,duval 2558 -texas,eastland 2559 -texas,ector 2560 -texas,edwards 2561 -texas,ellis 2562 -texas,el paso 2563 -texas,erath 2564 -texas,falls 2565 -texas,fannin 2566 -texas,fayette 2567 -texas,fisher 2568 -texas,floyd 2569 -texas,foard 2570 -texas,fort bend 2571 -texas,franklin 2572 -texas,freestone 2573 -texas,frio 2574 -texas,gaines 2575 -texas,galveston:main 2576 -texas,galveston:spit 2577 -texas,garza 2578 -texas,gillespie 2579 -texas,glasscock 2580 -texas,goliad 2581 -texas,gonzales 2582 -texas,gray 2583 -texas,grayson 2584 -texas,gregg 2585 -texas,grimes 2586 -texas,guadalupe 2587 -texas,hale 2588 -texas,hall 2589 -texas,hamilton 2590 -texas,hansford 2591 -texas,hardeman 2592 -texas,hardin 2593 -texas,harris 2594 -texas,harrison 2595 -texas,hartley 2596 -texas,haskell 2597 -texas,hays 2598 -texas,hemphill 2599 -texas,henderson 2600 -texas,hidalgo 2601 -texas,hill 2602 -texas,hockley 2603 -texas,hood 2604 -texas,hopkins 2605 -texas,houston 2606 -texas,howard 2607 -texas,hudspeth 2608 -texas,hunt 2609 -texas,hutchinson 2610 -texas,irion 2611 -texas,jack 2612 -texas,jackson 2613 -texas,jasper 2614 -texas,jeff davis 2615 -texas,jefferson 2616 -texas,jim hogg 2617 -texas,jim wells 2618 -texas,johnson 2619 -texas,jones 2620 -texas,karnes 2621 -texas,kaufman 2622 -texas,kendall 2623 -texas,kenedy 2624 -texas,kent 2625 -texas,kerr 2626 -texas,kimble 2627 -texas,king 2628 -texas,kinney 2629 -texas,kleberg 2630 -texas,knox 2631 -texas,lamar 2632 -texas,lamb 2633 -texas,lampasas 2634 -texas,la salle 2635 -texas,lavaca 2636 -texas,lee 2637 -texas,leon 2638 -texas,liberty 2639 -texas,limestone 2640 -texas,lipscomb 2641 -texas,live oak 2642 -texas,llano 2643 -texas,loving 2644 -texas,lubbock 2645 -texas,lynn 2646 -texas,mcculloch 2647 -texas,mclennan 2648 -texas,mcmullen 2649 -texas,madison 2650 -texas,marion 2651 -texas,martin 2652 -texas,mason 2653 -texas,matagorda 2654 -texas,maverick 2655 -texas,medina 2656 -texas,menard 2657 -texas,midland 2658 -texas,milam 2659 -texas,mills 2660 -texas,mitchell 2661 -texas,montague 2662 -texas,montgomery 2663 -texas,moore 2664 -texas,morris 2665 -texas,motley 2666 -texas,nacogdoches 2667 -texas,navarro 2668 -texas,newton 2669 -texas,nolan 2670 -texas,nueces 2671 -texas,ochiltree 2672 -texas,oldham 2673 -texas,orange 2674 -texas,palo pinto 2675 -texas,panola 2676 -texas,parker 2677 -texas,parmer 2678 -texas,pecos 2679 -texas,polk 2680 -texas,potter 2681 -texas,presidio 2682 -texas,rains 2683 -texas,randall 2684 -texas,reagan 2685 -texas,real 2686 -texas,red river 2687 -texas,reeves 2688 -texas,refugio 2689 -texas,roberts 2690 -texas,robertson 2691 -texas,rockwall 2692 -texas,runnels 2693 -texas,rusk 2694 -texas,sabine 2695 -texas,san augustine 2696 -texas,san jacinto 2697 -texas,san patricio 2698 -texas,san saba 2699 -texas,schleicher 2700 -texas,scurry 2701 -texas,shackelford 2702 -texas,shelby 2703 -texas,sherman 2704 -texas,smith 2705 -texas,somervell 2706 -texas,starr 2707 -texas,stephens 2708 -texas,sterling 2709 -texas,stonewall 2710 -texas,sutton 2711 -texas,swisher 2712 -texas,tarrant 2713 -texas,taylor 2714 -texas,terrell 2715 -texas,terry 2716 -texas,throckmorton 2717 -texas,titus 2718 -texas,tom green 2719 -texas,travis 2720 -texas,trinity 2721 -texas,tyler 2722 -texas,upshur 2723 -texas,upton 2724 -texas,uvalde 2725 -texas,val verde 2726 -texas,van zandt 2727 -texas,victoria 2728 -texas,walker 2729 -texas,waller 2730 -texas,ward 2731 -texas,washington 2732 -texas,webb 2733 -texas,wharton 2734 -texas,wheeler 2735 -texas,wichita 2736 -texas,wilbarger 2737 -texas,willacy 2738 -texas,williamson 2739 -texas,wilson 2740 -texas,winkler 2741 -texas,wise 2742 -texas,wood 2743 -texas,yoakum 2744 -texas,young 2745 -texas,zapata 2746 -texas,zavala 2747 -utah,beaver 2748 -utah,box elder 2749 -utah,cache 2750 -utah,carbon 2751 -utah,daggett 2752 -utah,davis 2753 -utah,duchesne 2754 -utah,emery 2755 -utah,garfield 2756 -utah,grand 2757 -utah,iron 2758 -utah,juab 2759 -utah,kane 2760 -utah,millard 2761 -utah,morgan 2762 -utah,piute 2763 -utah,rich 2764 -utah,salt lake 2765 -utah,san juan 2766 -utah,sanpete 2767 -utah,sevier 2768 -utah,summit 2769 -utah,tooele 2770 -utah,uintah 2771 -utah,utah 2772 -utah,wasatch 2773 -utah,washington 2774 -utah,wayne 2775 -utah,weber 2776 -vermont,addison 2777 -vermont,bennington 2778 -vermont,caledonia 2779 -vermont,chittenden 2780 -vermont,essex 2781 -vermont,franklin 2782 -vermont,grand isle 2783 -vermont,lamoille 2784 -vermont,orange 2785 -vermont,orleans 2786 -vermont,rutland 2787 -vermont,washington 2788 -vermont,windham 2789 -vermont,windsor 2790 -virginia,accomack:main 2791 -virginia,accomack:chincoteague 2792 -virginia,albemarle 2793 -virginia,alleghany 2794 -virginia,amelia 2795 -virginia,amherst 2796 -virginia,appomattox 2797 -virginia,arlington 2798 -virginia,augusta 2799 -virginia,bath 2800 -virginia,bedford 2801 -virginia,bland 2802 -virginia,botetourt 2803 -virginia,brunswick 2804 -virginia,buchanan 2805 -virginia,buckingham 2806 -virginia,campbell 2807 -virginia,caroline 2808 -virginia,carroll 2809 -virginia,charles city 2810 -virginia,charlotte 2811 -virginia,chesterfield 2812 -virginia,clarke 2813 -virginia,craig 2814 -virginia,culpeper 2815 -virginia,cumberland 2816 -virginia,dickenson 2817 -virginia,dinwiddie 2818 -virginia,essex 2819 -virginia,fairfax 2820 -virginia,fauquier 2821 -virginia,floyd 2822 -virginia,fluvanna 2823 -virginia,franklin 2824 -virginia,frederick 2825 -virginia,giles 2826 -virginia,gloucester 2827 -virginia,goochland 2828 -virginia,grayson 2829 -virginia,greene 2830 -virginia,greensville 2831 -virginia,halifax 2832 -virginia,hanover 2833 -virginia,henrico 2834 -virginia,henry 2835 -virginia,highland 2836 -virginia,isle of wight 2837 -virginia,james city 2838 -virginia,king and queen 2839 -virginia,king george 2840 -virginia,king william 2841 -virginia,lancaster 2842 -virginia,lee 2843 -virginia,loudoun 2844 -virginia,louisa 2845 -virginia,lunenburg 2846 -virginia,madison 2847 -virginia,mathews 2848 -virginia,mecklenburg 2849 -virginia,middlesex 2850 -virginia,montgomery 2851 -virginia,suffolk 2852 -virginia,nelson 2853 -virginia,new kent 2854 -virginia,northampton 2855 -virginia,northumberland 2856 -virginia,nottoway 2857 -virginia,orange 2858 -virginia,page 2859 -virginia,patrick 2860 -virginia,pittsylvania 2861 -virginia,powhatan 2862 -virginia,prince edward 2863 -virginia,prince george 2864 -virginia,prince william 2865 -virginia,pulaski 2866 -virginia,rappahannock 2867 -virginia,richmond 2868 -virginia,roanoke 2869 -virginia,rockbridge 2870 -virginia,rockingham 2871 -virginia,russell 2872 -virginia,scott 2873 -virginia,shenandoah 2874 -virginia,smyth 2875 -virginia,southampton 2876 -virginia,spotsylvania 2877 -virginia,stafford 2878 -virginia,surry 2879 -virginia,sussex 2880 -virginia,tazewell 2881 -virginia,warren 2882 -virginia,washington 2883 -virginia,westmoreland 2884 -virginia,wise 2885 -virginia,wythe 2886 -virginia,york 2887 -virginia,hampton 2888 -virginia,newport news 2889 -virginia,norfolk 2890 -virginia,virginia beach 2891 -washington,adams 2892 -washington,asotin 2893 -washington,benton 2894 -washington,chelan 2895 -washington,clallam 2896 -washington,clark 2897 -washington,columbia 2898 -washington,cowlitz 2899 -washington,douglas 2900 -washington,ferry 2901 -washington,franklin 2902 -washington,garfield 2903 -washington,grant 2904 -washington,grays harbor 2905 -washington,island 2906 -washington,jefferson 2907 -washington,king 2908 -washington,kitsap 2909 -washington,kittitas 2910 -washington,klickitat 2911 -washington,lewis 2912 -washington,lincoln 2913 -washington,mason 2914 -washington,okanogan 2915 -washington,pacific 2916 -washington,pend oreille 2917 -washington,pierce:main 2918 -washington,pierce:penrose 2919 -washington,san juan:lopez island 2920 -washington,san juan:orcas island 2921 -washington,san juan:san juan island 2922 -washington,skagit 2923 -washington,skamania 2924 -washington,snohomish 2925 -washington,spokane 2926 -washington,stevens 2927 -washington,thurston 2928 -washington,wahkiakum 2929 -washington,walla walla 2930 -washington,whatcom 2931 -washington,whitman 2932 -washington,yakima 2933 -west virginia,barbour 2934 -west virginia,berkeley 2935 -west virginia,boone 2936 -west virginia,braxton 2937 -west virginia,brooke 2938 -west virginia,cabell 2939 -west virginia,calhoun 2940 -west virginia,clay 2941 -west virginia,doddridge 2942 -west virginia,fayette 2943 -west virginia,gilmer 2944 -west virginia,grant 2945 -west virginia,greenbrier 2946 -west virginia,hampshire 2947 -west virginia,hancock 2948 -west virginia,hardy 2949 -west virginia,harrison 2950 -west virginia,jackson 2951 -west virginia,jefferson 2952 -west virginia,kanawha 2953 -west virginia,lewis 2954 -west virginia,lincoln 2955 -west virginia,logan 2956 -west virginia,mcdowell 2957 -west virginia,marion 2958 -west virginia,marshall 2959 -west virginia,mason 2960 -west virginia,mercer 2961 -west virginia,mineral 2962 -west virginia,mingo 2963 -west virginia,monongalia 2964 -west virginia,monroe 2965 -west virginia,morgan 2966 -west virginia,nicholas 2967 -west virginia,ohio 2968 -west virginia,pendleton 2969 -west virginia,pleasants 2970 -west virginia,pocahontas 2971 -west virginia,preston 2972 -west virginia,putnam 2973 -west virginia,raleigh 2974 -west virginia,randolph 2975 -west virginia,ritchie 2976 -west virginia,roane 2977 -west virginia,summers 2978 -west virginia,taylor 2979 -west virginia,tucker 2980 -west virginia,tyler 2981 -west virginia,upshur 2982 -west virginia,wayne 2983 -west virginia,webster 2984 -west virginia,wetzel 2985 -west virginia,wirt 2986 -west virginia,wood 2987 -west virginia,wyoming 2988 -wisconsin,adams 2989 -wisconsin,ashland 2990 -wisconsin,barron 2991 -wisconsin,bayfield 2992 -wisconsin,brown 2993 -wisconsin,buffalo 2994 -wisconsin,burnett 2995 -wisconsin,calumet 2996 -wisconsin,chippewa 2997 -wisconsin,clark 2998 -wisconsin,columbia 2999 -wisconsin,crawford 3000 -wisconsin,dane 3001 -wisconsin,dodge 3002 -wisconsin,door 3003 -wisconsin,douglas 3004 -wisconsin,dunn 3005 -wisconsin,eau claire 3006 -wisconsin,florence 3007 -wisconsin,fond du lac 3008 -wisconsin,forest 3009 -wisconsin,grant 3010 -wisconsin,green 3011 -wisconsin,green lake 3012 -wisconsin,iowa 3013 -wisconsin,iron 3014 -wisconsin,jackson 3015 -wisconsin,jefferson 3016 -wisconsin,juneau 3017 -wisconsin,kenosha 3018 -wisconsin,kewaunee 3019 -wisconsin,la crosse 3020 -wisconsin,lafayette 3021 -wisconsin,langlade 3022 -wisconsin,lincoln 3023 -wisconsin,manitowoc 3024 -wisconsin,marathon 3025 -wisconsin,marinette 3026 -wisconsin,marquette 3027 -wisconsin,milwaukee 3028 -wisconsin,monroe 3029 -wisconsin,oconto 3030 -wisconsin,oneida 3031 -wisconsin,outagamie 3032 -wisconsin,ozaukee 3033 -wisconsin,pepin 3034 -wisconsin,pierce 3035 -wisconsin,polk 3036 -wisconsin,portage 3037 -wisconsin,price 3038 -wisconsin,racine 3039 -wisconsin,richland 3040 -wisconsin,rock 3041 -wisconsin,rusk 3042 -wisconsin,st croix 3043 -wisconsin,sauk 3044 -wisconsin,sawyer 3045 -wisconsin,shawano 3046 -wisconsin,sheboygan 3047 -wisconsin,taylor 3048 -wisconsin,trempealeau 3049 -wisconsin,vernon 3050 -wisconsin,vilas 3051 -wisconsin,walworth 3052 -wisconsin,washburn 3053 -wisconsin,washington 3054 -wisconsin,waukesha 3055 -wisconsin,waupaca 3056 -wisconsin,waushara 3057 -wisconsin,winnebago 3058 -wisconsin,wood 3059 -wyoming,albany 3060 -wyoming,big horn 3061 -wyoming,campbell 3062 -wyoming,carbon 3063 -wyoming,converse 3064 -wyoming,crook 3065 -wyoming,fremont 3066 -wyoming,goshen 3067 -wyoming,hot springs 3068 -wyoming,johnson 3069 -wyoming,laramie 3070 -wyoming,lincoln 3071 -wyoming,natrona 3072 -wyoming,niobrara 3073 -wyoming,park 3074 -wyoming,platte 3075 -wyoming,sheridan 3076 -wyoming,sublette 3077 -wyoming,sweetwater 3078 -wyoming,teton 3079 -wyoming,uinta 3080 -wyoming,washakie 3081 -wyoming,weston 3082 +south dakota,yankton 2395 +south dakota,ziebach 2396 +tennessee,anderson 2397 +tennessee,bedford 2398 +tennessee,benton 2399 +tennessee,bledsoe 2400 +tennessee,blount 2401 +tennessee,bradley 2402 +tennessee,campbell 2403 +tennessee,cannon 2404 +tennessee,carroll 2405 +tennessee,carter 2406 +tennessee,cheatham 2407 +tennessee,chester 2408 +tennessee,claiborne 2409 +tennessee,clay 2410 +tennessee,cocke 2411 +tennessee,coffee 2412 +tennessee,crockett 2413 +tennessee,cumberland 2414 +tennessee,davidson 2415 +tennessee,decatur 2416 +tennessee,de kalb 2417 +tennessee,dickson 2418 +tennessee,dyer 2419 +tennessee,fayette 2420 +tennessee,fentress 2421 +tennessee,franklin 2422 +tennessee,gibson 2423 +tennessee,giles 2424 +tennessee,grainger 2425 +tennessee,greene 2426 +tennessee,grundy 2427 +tennessee,hamblen 2428 +tennessee,hamilton 2429 +tennessee,hancock 2430 +tennessee,hardeman 2431 +tennessee,hardin 2432 +tennessee,hawkins 2433 +tennessee,haywood 2434 +tennessee,henderson 2435 +tennessee,henry 2436 +tennessee,hickman 2437 +tennessee,houston 2438 +tennessee,humphreys 2439 +tennessee,jackson 2440 +tennessee,jefferson 2441 +tennessee,johnson 2442 +tennessee,knox 2443 +tennessee,lake 2444 +tennessee,lauderdale 2445 +tennessee,lawrence 2446 +tennessee,lewis 2447 +tennessee,lincoln 2448 +tennessee,loudon 2449 +tennessee,mcminn 2450 +tennessee,mcnairy 2451 +tennessee,macon 2452 +tennessee,madison 2453 +tennessee,marion 2454 +tennessee,marshall 2455 +tennessee,maury 2456 +tennessee,meigs 2457 +tennessee,monroe 2458 +tennessee,montgomery 2459 +tennessee,moore 2460 +tennessee,morgan 2461 +tennessee,obion 2462 +tennessee,overton 2463 +tennessee,perry 2464 +tennessee,pickett 2465 +tennessee,polk 2466 +tennessee,putnam 2467 +tennessee,rhea 2468 +tennessee,roane 2469 +tennessee,robertson 2470 +tennessee,rutherford 2471 +tennessee,scott 2472 +tennessee,sequatchie 2473 +tennessee,sevier 2474 +tennessee,shelby 2475 +tennessee,smith 2476 +tennessee,stewart 2477 +tennessee,sullivan 2478 +tennessee,sumner 2479 +tennessee,tipton 2480 +tennessee,trousdale 2481 +tennessee,unicoi 2482 +tennessee,union 2483 +tennessee,van buren 2484 +tennessee,warren 2485 +tennessee,washington 2486 +tennessee,wayne 2487 +tennessee,weakley 2488 +tennessee,white 2489 +tennessee,williamson 2490 +tennessee,wilson 2491 +texas,anderson 2492 +texas,andrews 2493 +texas,angelina 2494 +texas,aransas 2495 +texas,archer 2496 +texas,armstrong 2497 +texas,atascosa 2498 +texas,austin 2499 +texas,bailey 2500 +texas,bandera 2501 +texas,bastrop 2502 +texas,baylor 2503 +texas,bee 2504 +texas,bell 2505 +texas,bexar 2506 +texas,blanco 2507 +texas,borden 2508 +texas,bosque 2509 +texas,bowie 2510 +texas,brazoria 2511 +texas,brazos 2512 +texas,brewster 2513 +texas,briscoe 2514 +texas,brooks 2515 +texas,brown 2516 +texas,burleson 2517 +texas,burnet 2518 +texas,caldwell 2519 +texas,calhoun 2520 +texas,callahan 2521 +texas,cameron 2522 +texas,camp 2523 +texas,carson 2524 +texas,cass 2525 +texas,castro 2526 +texas,chambers 2527 +texas,cherokee 2528 +texas,childress 2529 +texas,clay 2530 +texas,cochran 2531 +texas,coke 2532 +texas,coleman 2533 +texas,collin 2534 +texas,collingsworth 2535 +texas,colorado 2536 +texas,comal 2537 +texas,comanche 2538 +texas,concho 2539 +texas,cooke 2540 +texas,coryell 2541 +texas,cottle 2542 +texas,crane 2543 +texas,crockett 2544 +texas,crosby 2545 +texas,culberson 2546 +texas,dallam 2547 +texas,dallas 2548 +texas,dawson 2549 +texas,deaf smith 2550 +texas,delta 2551 +texas,denton 2552 +texas,de witt 2553 +texas,dickens 2554 +texas,dimmit 2555 +texas,donley 2556 +texas,duval 2557 +texas,eastland 2558 +texas,ector 2559 +texas,edwards 2560 +texas,ellis 2561 +texas,el paso 2562 +texas,erath 2563 +texas,falls 2564 +texas,fannin 2565 +texas,fayette 2566 +texas,fisher 2567 +texas,floyd 2568 +texas,foard 2569 +texas,fort bend 2570 +texas,franklin 2571 +texas,freestone 2572 +texas,frio 2573 +texas,gaines 2574 +texas,galveston:main 2575 +texas,galveston:spit 2576 +texas,garza 2577 +texas,gillespie 2578 +texas,glasscock 2579 +texas,goliad 2580 +texas,gonzales 2581 +texas,gray 2582 +texas,grayson 2583 +texas,gregg 2584 +texas,grimes 2585 +texas,guadalupe 2586 +texas,hale 2587 +texas,hall 2588 +texas,hamilton 2589 +texas,hansford 2590 +texas,hardeman 2591 +texas,hardin 2592 +texas,harris 2593 +texas,harrison 2594 +texas,hartley 2595 +texas,haskell 2596 +texas,hays 2597 +texas,hemphill 2598 +texas,henderson 2599 +texas,hidalgo 2600 +texas,hill 2601 +texas,hockley 2602 +texas,hood 2603 +texas,hopkins 2604 +texas,houston 2605 +texas,howard 2606 +texas,hudspeth 2607 +texas,hunt 2608 +texas,hutchinson 2609 +texas,irion 2610 +texas,jack 2611 +texas,jackson 2612 +texas,jasper 2613 +texas,jeff davis 2614 +texas,jefferson 2615 +texas,jim hogg 2616 +texas,jim wells 2617 +texas,johnson 2618 +texas,jones 2619 +texas,karnes 2620 +texas,kaufman 2621 +texas,kendall 2622 +texas,kenedy 2623 +texas,kent 2624 +texas,kerr 2625 +texas,kimble 2626 +texas,king 2627 +texas,kinney 2628 +texas,kleberg 2629 +texas,knox 2630 +texas,lamar 2631 +texas,lamb 2632 +texas,lampasas 2633 +texas,la salle 2634 +texas,lavaca 2635 +texas,lee 2636 +texas,leon 2637 +texas,liberty 2638 +texas,limestone 2639 +texas,lipscomb 2640 +texas,live oak 2641 +texas,llano 2642 +texas,loving 2643 +texas,lubbock 2644 +texas,lynn 2645 +texas,mcculloch 2646 +texas,mclennan 2647 +texas,mcmullen 2648 +texas,madison 2649 +texas,marion 2650 +texas,martin 2651 +texas,mason 2652 +texas,matagorda 2653 +texas,maverick 2654 +texas,medina 2655 +texas,menard 2656 +texas,midland 2657 +texas,milam 2658 +texas,mills 2659 +texas,mitchell 2660 +texas,montague 2661 +texas,montgomery 2662 +texas,moore 2663 +texas,morris 2664 +texas,motley 2665 +texas,nacogdoches 2666 +texas,navarro 2667 +texas,newton 2668 +texas,nolan 2669 +texas,nueces 2670 +texas,ochiltree 2671 +texas,oldham 2672 +texas,orange 2673 +texas,palo pinto 2674 +texas,panola 2675 +texas,parker 2676 +texas,parmer 2677 +texas,pecos 2678 +texas,polk 2679 +texas,potter 2680 +texas,presidio 2681 +texas,rains 2682 +texas,randall 2683 +texas,reagan 2684 +texas,real 2685 +texas,red river 2686 +texas,reeves 2687 +texas,refugio 2688 +texas,roberts 2689 +texas,robertson 2690 +texas,rockwall 2691 +texas,runnels 2692 +texas,rusk 2693 +texas,sabine 2694 +texas,san augustine 2695 +texas,san jacinto 2696 +texas,san patricio 2697 +texas,san saba 2698 +texas,schleicher 2699 +texas,scurry 2700 +texas,shackelford 2701 +texas,shelby 2702 +texas,sherman 2703 +texas,smith 2704 +texas,somervell 2705 +texas,starr 2706 +texas,stephens 2707 +texas,sterling 2708 +texas,stonewall 2709 +texas,sutton 2710 +texas,swisher 2711 +texas,tarrant 2712 +texas,taylor 2713 +texas,terrell 2714 +texas,terry 2715 +texas,throckmorton 2716 +texas,titus 2717 +texas,tom green 2718 +texas,travis 2719 +texas,trinity 2720 +texas,tyler 2721 +texas,upshur 2722 +texas,upton 2723 +texas,uvalde 2724 +texas,val verde 2725 +texas,van zandt 2726 +texas,victoria 2727 +texas,walker 2728 +texas,waller 2729 +texas,ward 2730 +texas,washington 2731 +texas,webb 2732 +texas,wharton 2733 +texas,wheeler 2734 +texas,wichita 2735 +texas,wilbarger 2736 +texas,willacy 2737 +texas,williamson 2738 +texas,wilson 2739 +texas,winkler 2740 +texas,wise 2741 +texas,wood 2742 +texas,yoakum 2743 +texas,young 2744 +texas,zapata 2745 +texas,zavala 2746 +utah,beaver 2747 +utah,box elder 2748 +utah,cache 2749 +utah,carbon 2750 +utah,daggett 2751 +utah,davis 2752 +utah,duchesne 2753 +utah,emery 2754 +utah,garfield 2755 +utah,grand 2756 +utah,iron 2757 +utah,juab 2758 +utah,kane 2759 +utah,millard 2760 +utah,morgan 2761 +utah,piute 2762 +utah,rich 2763 +utah,salt lake 2764 +utah,san juan 2765 +utah,sanpete 2766 +utah,sevier 2767 +utah,summit 2768 +utah,tooele 2769 +utah,uintah 2770 +utah,utah 2771 +utah,wasatch 2772 +utah,washington 2773 +utah,wayne 2774 +utah,weber 2775 +vermont,addison 2776 +vermont,bennington 2777 +vermont,caledonia 2778 +vermont,chittenden 2779 +vermont,essex 2780 +vermont,franklin 2781 +vermont,grand isle 2782 +vermont,lamoille 2783 +vermont,orange 2784 +vermont,orleans 2785 +vermont,rutland 2786 +vermont,washington 2787 +vermont,windham 2788 +vermont,windsor 2789 +virginia,accomack:main 2790 +virginia,accomack:chincoteague 2791 +virginia,albemarle 2792 +virginia,alleghany 2793 +virginia,amelia 2794 +virginia,amherst 2795 +virginia,appomattox 2796 +virginia,arlington 2797 +virginia,augusta 2798 +virginia,bath 2799 +virginia,bedford 2800 +virginia,bland 2801 +virginia,botetourt 2802 +virginia,brunswick 2803 +virginia,buchanan 2804 +virginia,buckingham 2805 +virginia,campbell 2806 +virginia,caroline 2807 +virginia,carroll 2808 +virginia,charles city 2809 +virginia,charlotte 2810 +virginia,chesterfield 2811 +virginia,clarke 2812 +virginia,craig 2813 +virginia,culpeper 2814 +virginia,cumberland 2815 +virginia,dickenson 2816 +virginia,dinwiddie 2817 +virginia,essex 2818 +virginia,fairfax 2819 +virginia,fauquier 2820 +virginia,floyd 2821 +virginia,fluvanna 2822 +virginia,franklin 2823 +virginia,frederick 2824 +virginia,giles 2825 +virginia,gloucester 2826 +virginia,goochland 2827 +virginia,grayson 2828 +virginia,greene 2829 +virginia,greensville 2830 +virginia,halifax 2831 +virginia,hanover 2832 +virginia,henrico 2833 +virginia,henry 2834 +virginia,highland 2835 +virginia,isle of wight 2836 +virginia,james city 2837 +virginia,king and queen 2838 +virginia,king george 2839 +virginia,king william 2840 +virginia,lancaster 2841 +virginia,lee 2842 +virginia,loudoun 2843 +virginia,louisa 2844 +virginia,lunenburg 2845 +virginia,madison 2846 +virginia,mathews 2847 +virginia,mecklenburg 2848 +virginia,middlesex 2849 +virginia,montgomery 2850 +virginia,suffolk 2851 +virginia,nelson 2852 +virginia,new kent 2853 +virginia,northampton 2854 +virginia,northumberland 2855 +virginia,nottoway 2856 +virginia,orange 2857 +virginia,page 2858 +virginia,patrick 2859 +virginia,pittsylvania 2860 +virginia,powhatan 2861 +virginia,prince edward 2862 +virginia,prince george 2863 +virginia,prince william 2864 +virginia,pulaski 2865 +virginia,rappahannock 2866 +virginia,richmond 2867 +virginia,roanoke 2868 +virginia,rockbridge 2869 +virginia,rockingham 2870 +virginia,russell 2871 +virginia,scott 2872 +virginia,shenandoah 2873 +virginia,smyth 2874 +virginia,southampton 2875 +virginia,spotsylvania 2876 +virginia,stafford 2877 +virginia,surry 2878 +virginia,sussex 2879 +virginia,tazewell 2880 +virginia,warren 2881 +virginia,washington 2882 +virginia,westmoreland 2883 +virginia,wise 2884 +virginia,wythe 2885 +virginia,york 2886 +virginia,hampton 2887 +virginia,newport news 2888 +virginia,norfolk 2889 +virginia,virginia beach 2890 +washington,adams 2891 +washington,asotin 2892 +washington,benton 2893 +washington,chelan 2894 +washington,clallam 2895 +washington,clark 2896 +washington,columbia 2897 +washington,cowlitz 2898 +washington,douglas 2899 +washington,ferry 2900 +washington,franklin 2901 +washington,garfield 2902 +washington,grant 2903 +washington,grays harbor 2904 +washington,island 2905 +washington,jefferson 2906 +washington,king 2907 +washington,kitsap 2908 +washington,kittitas 2909 +washington,klickitat 2910 +washington,lewis 2911 +washington,lincoln 2912 +washington,mason 2913 +washington,okanogan 2914 +washington,pacific 2915 +washington,pend oreille 2916 +washington,pierce:main 2917 +washington,pierce:penrose 2918 +washington,san juan:lopez island 2919 +washington,san juan:orcas island 2920 +washington,san juan:san juan island 2921 +washington,skagit 2922 +washington,skamania 2923 +washington,snohomish 2924 +washington,spokane 2925 +washington,stevens 2926 +washington,thurston 2927 +washington,wahkiakum 2928 +washington,walla walla 2929 +washington,whatcom 2930 +washington,whitman 2931 +washington,yakima 2932 +west virginia,barbour 2933 +west virginia,berkeley 2934 +west virginia,boone 2935 +west virginia,braxton 2936 +west virginia,brooke 2937 +west virginia,cabell 2938 +west virginia,calhoun 2939 +west virginia,clay 2940 +west virginia,doddridge 2941 +west virginia,fayette 2942 +west virginia,gilmer 2943 +west virginia,grant 2944 +west virginia,greenbrier 2945 +west virginia,hampshire 2946 +west virginia,hancock 2947 +west virginia,hardy 2948 +west virginia,harrison 2949 +west virginia,jackson 2950 +west virginia,jefferson 2951 +west virginia,kanawha 2952 +west virginia,lewis 2953 +west virginia,lincoln 2954 +west virginia,logan 2955 +west virginia,mcdowell 2956 +west virginia,marion 2957 +west virginia,marshall 2958 +west virginia,mason 2959 +west virginia,mercer 2960 +west virginia,mineral 2961 +west virginia,mingo 2962 +west virginia,monongalia 2963 +west virginia,monroe 2964 +west virginia,morgan 2965 +west virginia,nicholas 2966 +west virginia,ohio 2967 +west virginia,pendleton 2968 +west virginia,pleasants 2969 +west virginia,pocahontas 2970 +west virginia,preston 2971 +west virginia,putnam 2972 +west virginia,raleigh 2973 +west virginia,randolph 2974 +west virginia,ritchie 2975 +west virginia,roane 2976 +west virginia,summers 2977 +west virginia,taylor 2978 +west virginia,tucker 2979 +west virginia,tyler 2980 +west virginia,upshur 2981 +west virginia,wayne 2982 +west virginia,webster 2983 +west virginia,wetzel 2984 +west virginia,wirt 2985 +west virginia,wood 2986 +west virginia,wyoming 2987 +wisconsin,adams 2988 +wisconsin,ashland 2989 +wisconsin,barron 2990 +wisconsin,bayfield 2991 +wisconsin,brown 2992 +wisconsin,buffalo 2993 +wisconsin,burnett 2994 +wisconsin,calumet 2995 +wisconsin,chippewa 2996 +wisconsin,clark 2997 +wisconsin,columbia 2998 +wisconsin,crawford 2999 +wisconsin,dane 3000 +wisconsin,dodge 3001 +wisconsin,door 3002 +wisconsin,douglas 3003 +wisconsin,dunn 3004 +wisconsin,eau claire 3005 +wisconsin,florence 3006 +wisconsin,fond du lac 3007 +wisconsin,forest 3008 +wisconsin,grant 3009 +wisconsin,green 3010 +wisconsin,green lake 3011 +wisconsin,iowa 3012 +wisconsin,iron 3013 +wisconsin,jackson 3014 +wisconsin,jefferson 3015 +wisconsin,juneau 3016 +wisconsin,kenosha 3017 +wisconsin,kewaunee 3018 +wisconsin,la crosse 3019 +wisconsin,lafayette 3020 +wisconsin,langlade 3021 +wisconsin,lincoln 3022 +wisconsin,manitowoc 3023 +wisconsin,marathon 3024 +wisconsin,marinette 3025 +wisconsin,marquette 3026 +wisconsin,milwaukee 3027 +wisconsin,monroe 3028 +wisconsin,oconto 3029 +wisconsin,oneida 3030 +wisconsin,outagamie 3031 +wisconsin,ozaukee 3032 +wisconsin,pepin 3033 +wisconsin,pierce 3034 +wisconsin,polk 3035 +wisconsin,portage 3036 +wisconsin,price 3037 +wisconsin,racine 3038 +wisconsin,richland 3039 +wisconsin,rock 3040 +wisconsin,rusk 3041 +wisconsin,st croix 3042 +wisconsin,sauk 3043 +wisconsin,sawyer 3044 +wisconsin,shawano 3045 +wisconsin,sheboygan 3046 +wisconsin,taylor 3047 +wisconsin,trempealeau 3048 +wisconsin,vernon 3049 +wisconsin,vilas 3050 +wisconsin,walworth 3051 +wisconsin,washburn 3052 +wisconsin,washington 3053 +wisconsin,waukesha 3054 +wisconsin,waupaca 3055 +wisconsin,waushara 3056 +wisconsin,winnebago 3057 +wisconsin,wood 3058 +wyoming,albany 3059 +wyoming,big horn 3060 +wyoming,campbell 3061 +wyoming,carbon 3062 +wyoming,converse 3063 +wyoming,crook 3064 +wyoming,fremont 3065 +wyoming,goshen 3066 +wyoming,hot springs 3067 +wyoming,johnson 3068 +wyoming,laramie 3069 +wyoming,lincoln 3070 +wyoming,natrona 3071 +wyoming,niobrara 3072 +wyoming,park 3073 +wyoming,platte 3074 +wyoming,sheridan 3075 +wyoming,sublette 3076 +wyoming,sweetwater 3077 +wyoming,teton 3078 +wyoming,uinta 3079 +wyoming,washakie 3080 +wyoming,weston 3081 +new mexico,valencia 3082 diff -Nru r-cran-maps-2.2-1/src/france.name r-cran-maps-2.3-2/src/france.name --- r-cran-maps-2.2-1/src/france.name 2004-03-01 02:32:28.000000000 +0000 +++ r-cran-maps-2.3-2/src/france.name 2013-01-07 23:28:24.000000000 +0000 @@ -1,7 +1,7 @@ Nord 1 Pas-de-Calais 2 Somme 3 -Nord 4 +Nord:1 4 Ardennes 5 Seine-Maritime 6 Aisne 7 @@ -34,7 +34,7 @@ Mayenne 34 Vosges 35 Sarthe 36 -Finistere 37 +Finistere:I. d'Ouessant 37 Yonne 38 Loiret 39 Haut-Rhin 40 @@ -90,7 +90,7 @@ Alpes-de-Haute-Provence 90 Landes 91 Gard 92 -Vaucluse 93 +Vaucluse:Enclave des Papes 93 Tarn-et-Garonne 94 Alpes-Maritimes 95 Vaucluse 96 @@ -103,9 +103,9 @@ Hautes-Pyrenees 103 Pyrenees-Atlantiques 104 Aude 105 -Hautes-Pyrenees 106 +Hautes-Pyrenees:1 106 Ariege 107 -Hautes-Pyrenees 108 +Hautes-Pyrenees:2 108 Var:Iles d'Hyeres:I. du Levant 109 Var:Iles d'Hyeres:I. de Porquerolles 110 Var:Iles d'Hyeres:I. de Port Cros 111 diff -Nru r-cran-maps-2.2-1/src/mapget.c r-cran-maps-2.3-2/src/mapget.c --- r-cran-maps-2.2-1/src/mapget.c 2004-07-19 01:34:15.000000000 +0000 +++ r-cran-maps-2.3-2/src/mapget.c 2013-03-13 01:09:30.000000000 +0000 @@ -153,7 +153,7 @@ char **database; int *type; { - char Lname[100]; + char Lname[512]; int Coordtype; FILE *lf; @@ -203,7 +203,7 @@ double *range; { Region region, total; - char Gname[100]; + char Gname[512]; int i, maxsize = 0, k; int type; double factor, xmin, xmax, ymin, ymax; @@ -306,7 +306,7 @@ double *x, *y, *range; { Polyline line, total; - char Lname[100]; + char Lname[512]; int i, Coordtype, k, maxsize = 0, start, end, incr; int type; double factor, xmin, xmax, ymin, ymax, ox, dx, wind; @@ -549,7 +549,7 @@ map_where(char **database, double *x, double *y, int *n, int *poly) { Region npoly; - char Gname[100]; + char Gname[512]; int i, j; int nv; struct region_h *rh; diff -Nru r-cran-maps-2.2-1/src/maps.def r-cran-maps-2.3-2/src/maps.def --- r-cran-maps-2.2-1/src/maps.def 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/maps.def 2011-11-08 22:39:26.000000000 +0000 @@ -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 diff -Nru r-cran-maps-2.2-1/src/state.carto.gon r-cran-maps-2.3-2/src/state.carto.gon --- r-cran-maps-2.2-1/src/state.carto.gon 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.carto.gon 2011-11-08 21:32:38.000000000 +0000 @@ -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 diff -Nru r-cran-maps-2.2-1/src/state.carto.gonstats r-cran-maps-2.3-2/src/state.carto.gonstats --- r-cran-maps-2.2-1/src/state.carto.gonstats 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.carto.gonstats 2012-11-27 20:20:24.000000000 +0000 @@ -0,0 +1 @@ +50 1 diff -Nru r-cran-maps-2.2-1/src/state.carto.line r-cran-maps-2.3-2/src/state.carto.line --- r-cran-maps-2.2-1/src/state.carto.line 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.carto.line 2011-11-08 21:32:38.000000000 +0000 @@ -0,0 +1,524 @@ +1 0 +5.832 5.8024 +5.7456 6.4288 +5.3064 6.4648 +5.2776 5.8744 +5.3712 5.8168 +5.832 5.8024 +EOR +0 2 +0.9864 9.3448 +1.1808 9.3304 +1.1592 9.028 +1.116 9.2008 +1.0296 9.0928 +0.9864 9.3448 +EOR +0 3 +2.4192 6.7528 +2.556 7.264 +2.4408 7.48 +2.4624 7.6168 +2.7648 7.5952 +2.8224 6.8824 +2.6496 6.6952 +2.4192 6.7528 +EOR +4 0 +4.788 6.58 +4.8456 6.7312 +4.716 6.7672 +4.7808 6.8752 +4.0824 7.2784 +4.2552 6.8968 +4.392 6.8392 +4.392 6.6952 +4.788 6.58 +EOR +5 0 +2.376 6.796 +2.52 7.2712 +2.1096 7.8832 +2.1096 8.0848 +0.9216 8.1208 +0.3744 7.6816 +0.8856 6.6664 +1.2672 6.4576 +1.6056 6.22 +2.376 6.796 +EOR +6 0 +2.808 7.66 +3.1752 7.5808 +3.3552 7.5952 +3.3624 8.1856 +2.8152 8.2 +2.808 7.66 +EOR +7 0 +9.1512 7.948 +9.1872 8.3152 +8.6256 8.344 +8.604 7.8616 +9.1512 7.948 +EOR +8 0 +8.0928 6.8536 +7.8408 7.2784 +7.9056 7.4872 +7.8048 7.48 +7.8552 6.8464 +8.0928 6.8536 +EOR +9 0 +5.4 5.788 +5.4072 5.6728 +5.6304 5.6296 +5.7888 5.4568 +6.0408 5.5216 +6.3432 5.2048 +6.4512 4.6072 +6.9552 3.7864 +7.1064 3.7432 +7.272 3.9448 +7.2864 4.3696 +7.1136 4.8808 +6.84 5.608 +6.6096 5.608 +5.904 5.68 +5.8608 5.7664 +5.4 5.788 +EOR +10 0 +6.84 5.7592 +6.2784 6.4 +5.7672 6.4432 +5.8968 5.7448 +6.6456 5.6296 +6.6816 5.716 +6.8256 5.6584 +6.84 5.7592 +EOR +0 11 +0.6624 5.9752 +0.8784 6.1192 +0.9864 6.0832 +1.008 5.9896 +0.828 5.896 +0.6624 5.9752 +EOR +12 0 +2.3976 8.5888 +2.412 8.1496 +2.772 8.1568 +2.772 8.2216 +2.3976 8.5888 +EOR +0 13 +5.2848 7.3432 +5.1264 6.9976 +4.9248 6.9328 +4.6224 7.2856 +4.6512 7.4584 +4.536 7.5088 +4.3272 7.7968 +4.3416 7.9768 +4.6224 8.3368 +5.1696 8.3944 +5.2272 8.2216 +5.2848 7.3432 +EOR +0 14 +5.7168 8.2216 +5.7096 7.2928 +5.5584 7.1272 +5.436 7.1344 +5.1912 7.0696 +5.3064 7.3288 +5.2776 8.2072 +5.7168 8.2216 +EOR +15 0 +4.32 7.9912 +4.3776 8.1712 +4.5648 8.308 +4.4424 8.3872 +3.6792 8.3296 +3.7512 8.056 +4.32 7.9912 +EOR +16 0 +3.4416 7.5736 +3.9456 7.5376 +3.9528 7.7608 +3.8664 7.912 +3.4056 7.9192 +3.4416 7.5736 +EOR +0 17 +6.228 7.0192 +6.1632 7.156 +5.9904 7.1056 +5.724 7.2352 +5.5584 7.0768 +5.1408 6.9976 +4.9608 6.9256 +4.9536 6.8536 +5.1552 6.8896 +5.9976 6.8392 +6.228 7.0192 +EOR +0 18 +5.1336 5.86 +5.1336 5.7232 +4.4568 5.8744 +4.536 6.1984 +4.392 6.6376 +4.7736 6.508 +4.824 6.3712 +4.7088 6.1336 +5.1336 5.86 +EOR +19 0 +9.144 9.1216 +9.4464 9.2872 +9.3672 9.3448 +9.36 9.5392 +9.216 9.5968 +9.0936 9.424 +9.144 9.1216 +EOR +0 20 +8.1144 6.796 +8.0496 6.5944 +7.8048 6.5368 +7.7112 6.94 +7.6968 6.7672 +7.4016 7.048 +7.2648 7.3288 +7.0776 7.48 +7.776 7.4584 +7.8264 6.8176 +8.1144 6.796 +EOR +0 21 +8.7552 8.9776 +9.2016 9.0136 +9.4032 8.8552 +9.3816 8.6032 +9.6336 8.1856 +9.7776 8.1856 +9.7776 8.0488 +9.4968 8.092 +9.3816 8.3296 +8.6256 8.3944 +8.7552 8.9776 +EOR +22 0 +5.436 8.272 +6.1992 8.3008 +6.3936 8.5744 +6.4512 8.848 +6.2928 9.0352 +6.0048 9.1936 +6.3216 9.2008 +6.156 9.3016 +5.7744 9.2584 +5.472 9.3448 +4.8312 9.0424 +5.2056 8.8912 +5.256 8.8048 +5.4288 9.0712 +5.8032 9.1936 +5.976 9.136 +5.7456 8.9488 +5.6448 8.9992 +5.4792 8.7184 +5.5224 8.5024 +5.436 8.272 +EOR +23 0 +3.6576 8.3872 +4.4136 8.416 +4.2912 8.5456 +4.32 8.7688 +4.5216 8.9776 +3.888 8.9056 +3.888 8.8192 +3.564 8.6248 +3.6576 8.3872 +EOR +24 0 +5.2416 5.9176 +5.2632 6.4864 +4.824 6.5656 +4.86 6.3568 +4.7448 6.1552 +5.076 6.112 +5.1336 5.932 +5.2416 5.9176 +EOR +25 0 +4.8672 6.7816 +4.9176 6.8896 +4.572 7.2928 +4.608 7.4656 +4.4712 7.48 +4.284 7.8256 +4.2696 7.9768 +3.78 8.0128 +3.9816 7.7752 +3.9816 7.3648 +4.824 6.904 +4.8024 6.8032 +4.8672 6.7816 +EOR +0 26 +2.4984 8.5672 +3.0672 8.5384 +3.0744 8.4088 +2.7144 8.38 +2.6712 8.3368 +2.4984 8.5672 +EOR +27 0 +3.3984 7.9624 +3.7728 7.9624 +3.6792 8.2504 +3.1176 8.3008 +3.1104 8.2144 +3.3912 8.1928 +3.3984 7.9624 +EOR +28 0 +2.4048 7.5664 +2.4264 8.0992 +2.1384 8.092 +2.1528 7.8976 +2.4048 7.5664 +EOR +29 0 +8.9856 9.4168 +8.8776 9.208 +8.8416 9.0208 +9.1512 9.0424 +9.0864 9.1432 +9.0576 9.4024 +8.9856 9.4168 +EOR +0 30 +8.1 8.0776 +8.4744 7.8616 +8.4024 7.732 +8.4312 7.6096 +8.6832 7.5592 +8.6616 7.1128 +8.1864 6.6232 +8.208 6.8608 +7.8552 7.2856 +7.9416 7.5016 +8.0928 7.6096 +7.9488 7.8112 +7.9704 7.9696 +8.1 8.0776 +EOR +31 0 +2.844 7.0768 +3.1464 7.084 +3.1608 7.5448 +2.8152 7.6096 +2.844 7.0768 +EOR +0 32 +8.7264 9.3808 +8.7264 8.92 +8.568 8.4088 +8.5536 7.8904 +8.1072 8.1208 +7.92 8.3872 +6.8328 8.416 +7.0488 8.6392 +6.9984 8.8912 +7.632 8.9128 +7.8192 9.064 +7.74 9.172 +8.1576 9.4168 +8.7264 9.3808 +EOR +0 33 +7.6824 6.6952 +7.7688 6.364 +7.308 6.1264 +7.0632 6.3496 +6.8256 6.3568 +6.768 6.472 +6.372 6.4576 +6.0984 6.4936 +6.4872 6.7456 +7.6824 6.6952 +EOR +0 34 +3.06 8.5384 +3.5352 8.6176 +3.5784 8.4664 +3.0816 8.4376 +3.06 8.5384 +EOR +0 35 +6.7032 8.3152 +6.7176 7.7752 +6.5016 7.3648 +6.2424 7.1056 +6.156 7.1776 +5.9616 7.1416 +5.7456 7.2712 +5.7672 8.2144 +6.2136 8.2432 +6.7032 8.3152 +EOR +36 0 +4.2192 6.9184 +4.14 7.1632 +3.9312 7.3432 +3.9384 7.4872 +3.204 7.5448 +3.204 7.4872 +3.6504 7.48 +3.6432 7.0624 +3.888 6.9472 +4.2192 6.9184 +EOR +37 0 +0.9144 8.1856 +0.936 8.4088 +1.152 8.2648 +2.376 8.3512 +2.3616 8.1496 +0.9144 8.1856 +EOR +0 38 +6.7824 8.3656 +7.884 8.3368 +8.064 8.1352 +7.9416 7.984 +7.8984 7.804 +8.0424 7.624 +7.7976 7.5232 +6.7464 7.5376 +6.7824 8.3656 +EOR +0 39 +9.2088 7.9552 +9.2232 8.308 +9.3528 8.308 +9.4536 8.0848 +9.432 7.9912 +9.2088 7.9552 +EOR +40 0 +6.8832 5.7664 +7.2576 6.0904 +7.0488 6.2992 +6.8256 6.3064 +6.7536 6.4072 +6.372 6.4 +6.732 5.9968 +6.8832 5.7664 +EOR +41 0 +3.0888 8.4016 +3.1104 8.3296 +3.6432 8.308 +3.564 8.4304 +3.0888 8.4016 +EOR +0 42 +4.9248 6.796 +5.1768 6.832 +6.4512 6.7528 +6.0552 6.4936 +4.8528 6.6016 +4.9248 6.796 +EOR +43 0 +2.88 7.0408 +3.1248 6.3352 +3.3264 6.1192 +3.3912 6.2128 +3.8304 5.5 +4.104 5.4064 +4.1256 5.6512 +4.428 5.9104 +4.4856 6.2128 +4.3704 6.4072 +4.356 6.832 +3.6504 6.9544 +3.6216 7.4656 +3.1824 7.4656 +3.1824 7.084 +2.88 7.0408 +EOR +44 0 +2.7792 7.66 +2.7792 8.1928 +2.4768 8.1064 +2.4624 7.6744 +2.7792 7.66 +EOR +45 0 +8.7624 9.388 +8.748 8.9992 +8.8056 9.0064 +8.8488 9.2296 +8.964 9.3808 +8.7624 9.388 +EOR +46 0 +7.6608 6.7312 +7.3656 7.0192 +7.1424 7.3792 +6.9768 7.4296 +6.5592 6.9904 +6.0408 6.8464 +6.9696 6.7384 +7.6608 6.7312 +EOR +47 0 +2.376 8.3872 +2.3688 8.6032 +1.2528 8.74 +1.2528 8.596 +0.8208 8.7256 +0.9288 8.452 +1.188 8.308 +2.376 8.3872 +EOR +0 48 +6.264 7.0696 +6.4872 7.3072 +6.7248 7.66 +6.7248 7.4944 +6.8184 7.4656 +6.7968 7.2712 +6.6888 7.2928 +6.5376 7.0264 +6.336 6.976 +6.264 7.0696 +EOR +49 0 +4.4784 8.3944 +5.1912 8.4448 +5.22 8.7904 +4.7952 8.992 +4.4352 8.8768 +4.3344 8.7112 +4.3272 8.5744 +4.4784 8.3944 +EOR +0 50 +2.8296 8.236 +2.8008 8.3368 +3.0816 8.344 +3.0744 8.2648 +2.8296 8.236 +EOR diff -Nru r-cran-maps-2.2-1/src/state.carto.linestats r-cran-maps-2.3-2/src/state.carto.linestats --- r-cran-maps-2.2-1/src/state.carto.linestats 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.carto.linestats 2012-11-27 20:20:23.000000000 +0000 @@ -0,0 +1 @@ +50 45 diff -Nru r-cran-maps-2.2-1/src/state.carto.name r-cran-maps-2.3-2/src/state.carto.name --- r-cran-maps-2.2-1/src/state.carto.name 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.carto.name 2011-11-08 21:32:39.000000000 +0000 @@ -0,0 +1,50 @@ +Alabama 1 +Alaska 2 +Arizona 3 +Arkansas 4 +California 5 +Colorado 6 +Connecticut 7 +Delaware 8 +Florida 9 +Georgia 10 +Hawaii 11 +Idaho 12 +Illinois 13 +Indiana 14 +Iowa 15 +Kansas 16 +Kentucky 17 +Louisiana 18 +Maine 19 +Maryland 20 +Massachusetts 21 +Michigan 22 +Minnesota 23 +Mississippi 24 +Missouri 25 +Montana 26 +Nebraska 27 +Nevada 28 +New Hampshire 29 +New Jersey 30 +New Mexico 31 +New York 32 +North Carolina 33 +North Dakota 34 +Ohio 35 +Oklahoma 36 +Oregon 37 +Pennsylvania 38 +Rhode Island 39 +South Carolina 40 +South Dakota 41 +Tennessee 42 +Texas 43 +Utah 44 +Vermont 45 +Virginia 46 +Washington 47 +West Virginia 48 +Wisconsin 49 +Wyoming 50 diff -Nru r-cran-maps-2.2-1/src/state.vbm.gon r-cran-maps-2.3-2/src/state.vbm.gon --- r-cran-maps-2.2-1/src/state.vbm.gon 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.vbm.gon 2011-11-08 21:32:39.000000000 +0000 @@ -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 diff -Nru r-cran-maps-2.2-1/src/state.vbm.gonstats r-cran-maps-2.3-2/src/state.vbm.gonstats --- r-cran-maps-2.2-1/src/state.vbm.gonstats 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.vbm.gonstats 2012-11-27 20:20:24.000000000 +0000 @@ -0,0 +1 @@ +50 1 diff -Nru r-cran-maps-2.2-1/src/state.vbm.line r-cran-maps-2.3-2/src/state.vbm.line --- r-cran-maps-2.2-1/src/state.vbm.line 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.vbm.line 2011-11-08 21:32:39.000000000 +0000 @@ -0,0 +1,494 @@ +1 0 +89.0 34.0 +96.0 34.0 +98 20 +91 20 +91.0 16.0 +89.0 17.0 +89.0 34.0 +EOR +2 0 +9.0 26.0 +16.0 23.0 +16.0 13.0 +13.0 15.0 +2.0 8.0 +7.0 13.0 +4.0 15.0 +7.0 18.0 +4.0 18.0 +4 20 +7.0 19.0 +5.0 22.0 +9.0 26.0 +EOR +3 0 +27.0 43.0 +38.0 43.0 +38.0 23.0 +32.0 23.0 +25.0 27.0 +25.0 39.0 +27.0 39.0 +27.0 43.0 +EOR +4 0 +70 40 +79 40 +79.0 38.0 +82.0 38.0 +80.0 28.0 +73.0 28.0 +73 30 +70.0 31.0 +70 40 +EOR +5 0 +1.0 61.0 +13.0 61.0 +13.0 51.0 +24.0 39.0 +24.0 27.0 +20.0 27.0 +20.0 29.0 +12.0 33.0 +1.0 55.0 +1.0 61.0 +EOR +6 0 +39.0 58.0 +53.0 58.0 +53.0 44.0 +39.0 44.0 +39.0 58.0 +EOR +7 0 +136.0 69.0 +142.0 69.0 +142.0 64.0 +137.0 63.0 +136.0 64.0 +136.0 69.0 +EOR +8 0 +128.0 57.0 +132.0 51.0 +132.0 49.0 +127.0 49.0 +127.0 55.0 +128.0 57.0 +EOR +9 0 +92.0 19.0 +97.0 19.0 +99.0 18.0 +108.0 18.0 +112.0 6.0 +109.0 1.0 +103.0 5.0 +102.0 13.0 +100.0 16.0 +92.0 16.0 +92.0 19.0 +EOR +10 0 +97.0 34.0 +101.0 34.0 +102.0 33.0 +109.0 23.0 +108.0 19.0 +99.0 19.0 +97.0 34.0 +EOR +11 0 +38.0 12.0 +41 10 +40.0 5.0 +35.0 2.0 +32.0 7.0 +38.0 12.0 +EOR +12 0 +19.0 91.0 +21.0 91.0 +21.0 87.0 +29.0 72.0 +33.0 72.0 +33.0 62.0 +19.0 62.0 +19.0 91.0 +EOR +13 0 +79.0 66.0 +84.0 66.0 +84.0 63.0 +86.0 63.0 +86.0 46.0 +84.0 44.0 +78.0 55.0 +80.0 64.0 +79.0 66.0 +EOR +14 0 +87.0 63.0 +95.0 63.0 +95.0 51.0 +88.0 47.0 +87.0 47.0 +87.0 63.0 +EOR +15 0 +65 70 +76 70 +79.0 64.0 +78 60 +77.0 58.0 +69.0 58.0 +65.0 67.0 +65 70 +EOR +16 0 +54.0 55.0 +68.0 55.0 +69.0 52.0 +69.0 44.0 +54.0 44.0 +54.0 55.0 +EOR +17 0 +95 50 +96 50 +101.0 48.0 +103.0 48.0 +105.0 45.0 +101.0 41.0 +84.0 41.0 +84.0 43.0 +95 50 +EOR +18 0 +73.0 27.0 +80.0 27.0 +79.0 21.0 +83.0 21.0 +85.0 12.0 +73.0 15.0 +73.0 27.0 +EOR +19 0 +147.0 97.0 +152.0 93.0 +153.0 83.0 +146.0 76.0 +143 90 +147.0 97.0 +EOR +20 0 +113.0 55.0 +126.0 55.0 +126.0 48.0 +132.0 48.0 +127.0 44.0 +119.0 51.0 +113.0 51.0 +113.0 55.0 +EOR +21 0 +136.0 74.0 +146.0 74.0 +149.0 72.0 +150.0 73.0 +152.0 73.0 +152.0 66.0 +148.0 65.0 +148 70 +136 70 +136.0 74.0 +EOR +22 0 +84 90 +93.0 89.0 +98.0 84.0 +94.0 84.0 +99.0 79.0 +98.0 75.0 +101.0 79.0 +101.0 71.0 +98.0 64.0 +90.0 64.0 +90.0 79.0 +94.0 84.0 +90.0 84.0 +88.0 81.0 +80.0 86.0 +84 90 +EOR +23 0 +64.0 91.0 +81.0 91.0 +74.0 84.0 +74.0 76.0 +76.0 71.0 +65.0 71.0 +65.0 79.0 +64.0 91.0 +EOR +24 0 +83.0 34.0 +88.0 34.0 +88.0 17.0 +85.0 17.0 +84.0 22.0 +80.0 22.0 +82.0 33.0 +83.0 34.0 +EOR +25 0 +69.0 57.0 +77.0 57.0 +77.0 55.0 +83.0 44.0 +82.0 39.0 +80.0 39.0 +80.0 41.0 +70.0 41.0 +70.0 52.0 +69.0 57.0 +EOR +26 0 +22.0 91.0 +47.0 91.0 +47.0 76.0 +33.0 76.0 +33.0 73.0 +30.0 73.0 +22.0 88.0 +22.0 91.0 +EOR +27 0 +48.0 66.0 +60.0 66.0 +64.0 65.0 +65.0 64.0 +68.0 56.0 +54.0 56.0 +54.0 59.0 +48.0 59.0 +48.0 66.0 +EOR +28 0 +14.0 61.0 +26.0 61.0 +26 40 +25 40 +14.0 52.0 +14.0 61.0 +EOR +29 0 +142.0 89.0 +145.0 75.0 +139.0 75.0 +142.0 89.0 +EOR +30 0 +132.0 66.0 +136.0 62.0 +136.0 54.0 +133.0 52.0 +130.0 58.0 +131 60 +129.0 64.0 +132.0 66.0 +EOR +31 0 +39.0 43.0 +51.0 43.0 +51.0 25.0 +42.0 25.0 +42.0 23.0 +39.0 23.0 +39.0 43.0 +EOR +32 0 +130.0 89.0 +135.0 89.0 +135.0 64.0 +130 70 +113 70 +113.0 72.0 +115.0 73.0 +115.0 77.0 +125.0 77.0 +125.0 84.0 +130.0 89.0 +EOR +33 0 +107 40 +127 40 +126.0 37.0 +117 30 +112.0 35.0 +101.0 35.0 +107 40 +EOR +34 0 +48.0 91.0 +63.0 91.0 +64.0 79.0 +48.0 79.0 +48.0 91.0 +EOR +35 0 +109.0 68.0 +109.0 59.0 +108.0 57.0 +103.0 49.0 +102.0 49.0 +96.0 51.0 +96.0 63.0 +103.0 63.0 +109.0 68.0 +EOR +36 0 +52.0 43.0 +69.0 43.0 +69.0 31.0 +57.0 35.0 +57 40 +52 40 +52.0 43.0 +EOR +37 0 +3.0 77.0 +5.0 77.0 +5.0 75.0 +15.0 77.0 +18.0 77.0 +18.0 62.0 +1.0 62.0 +1.0 67.0 +3.0 77.0 +EOR +38 0 +112.0 71.0 +112.0 69.0 +129.0 69.0 +131.0 67.0 +128.0 65.0 +128.0 64.0 +130 60 +126.0 56.0 +110.0 56.0 +110.0 69.0 +112.0 71.0 +EOR +39 0 +143.0 69.0 +147.0 69.0 +147.0 65.0 +143.0 64.0 +143.0 69.0 +EOR +40 0 +103.0 34.0 +111.0 34.0 +117.0 28.0 +110.0 24.0 +103.0 34.0 +EOR +41 0 +48.0 78.0 +64.0 78.0 +64.0 66.0 +60.0 67.0 +48.0 67.0 +48.0 78.0 +EOR +42 0 +84 40 +105 40 +99.0 35.0 +83.0 35.0 +84 40 +EOR +43 0 +52.0 39.0 +56.0 39.0 +56.0 34.0 +72.0 29.0 +72.0 14.0 +67.0 9.0 +67.0 2.0 +61.0 5.0 +57.0 14.0 +52.0 14.0 +43.0 24.0 +52.0 24.0 +52.0 39.0 +EOR +44 0 +27.0 61.0 +33.0 61.0 +33.0 58.0 +38.0 58.0 +38.0 44.0 +27.0 44.0 +27.0 61.0 +EOR +45 0 +136.0 89.0 +141.0 89.0 +138.0 75.0 +136.0 75.0 +136.0 89.0 +EOR +46 0 +118 50 +127.0 43.0 +125.0 41.0 +102.0 41.0 +105.0 44.0 +112.0 44.0 +117.0 49.0 +118 50 +EOR +47 0 +7.0 91.0 +18.0 91.0 +18.0 78.0 +14.0 78.0 +6.0 76.0 +6.0 78.0 +3.0 78.0 +1.0 89.0 +7.0 89.0 +7.0 91.0 +EOR +48 0 +109.0 57.0 +109.0 55.0 +112.0 55.0 +112 50 +116 50 +111.0 45.0 +106.0 45.0 +104.0 49.0 +109.0 57.0 +EOR +49 0 +75.0 84.0 +81.0 84.0 +88 80 +85.0 76.0 +85.0 67.0 +79.0 67.0 +75.0 76.0 +75.0 84.0 +EOR +50 0 +34.0 75.0 +47.0 75.0 +47.0 59.0 +34.0 59.0 +34.0 75.0 +EOR diff -Nru r-cran-maps-2.2-1/src/state.vbm.linestats r-cran-maps-2.3-2/src/state.vbm.linestats --- r-cran-maps-2.2-1/src/state.vbm.linestats 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.vbm.linestats 2012-11-27 20:20:24.000000000 +0000 @@ -0,0 +1 @@ +50 35 diff -Nru r-cran-maps-2.2-1/src/state.vbm.name r-cran-maps-2.3-2/src/state.vbm.name --- r-cran-maps-2.2-1/src/state.vbm.name 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-maps-2.3-2/src/state.vbm.name 2011-11-08 21:32:39.000000000 +0000 @@ -0,0 +1,50 @@ +Alabama 1 +Alaska 2 +Arizona 3 +Arkansas 4 +California 5 +Colorado 6 +Connecticut 7 +Delaware 8 +Florida 9 +Georgia 10 +Hawaii 11 +Idaho 12 +Illinois 13 +Indiana 14 +Iowa 15 +Kansas 16 +Kentucky 17 +Louisiana 18 +Maine 19 +Maryland 20 +Massachusetts 21 +Michigan 22 +Minnesota 23 +Mississippi 24 +Missouri 25 +Montana 26 +Nebraska 27 +Nevada 28 +New Hampshire 29 +New Jersey 30 +New Mexico 31 +New York 32 +North Carolina 33 +North Dakota 34 +Ohio 35 +Oklahoma 36 +Oregon 37 +Pennsylvania 38 +Rhode Island 39 +South Carolina 40 +South Dakota 41 +Tennessee 42 +Texas 43 +Utah 44 +Vermont 45 +Virginia 46 +Washington 47 +West Virginia 48 +Wisconsin 49 +Wyoming 50 diff -Nru r-cran-maps-2.2-1/src/thin.c r-cran-maps-2.3-2/src/thin.c --- r-cran-maps-2.2-1/src/thin.c 2011-04-12 10:16:55.000000000 +0000 +++ r-cran-maps-2.3-2/src/thin.c 2013-03-13 01:09:30.000000000 +0000 @@ -1,6 +1,12 @@ #include "R.h" #include "map.h" +#define INIT(a) a.begin = -PI; a.end = PI +#define INSTALL_UP(j) x[upfence]=x[j]; y[upfence++]=y[j]; INIT(wedge) +#define INSTALL_DOWN(j) x[--downfence]=x[j]; y[downfence]=y[j]; INIT(wedge) +#define Max(a,b) ((a)>(b)?(a):(b)) +#define Min(a,b) ((a)<(b)?(a):(b)) + /* * An arc structure has a beginning angle and * an ending angle. It should be in a canonical @@ -57,8 +63,8 @@ /* do the intersection ... */ else { - a->begin = MAX(begin, a->begin); - a->end = MIN(end, a->end); + a->begin = Max(begin, a->begin); + a->end = Min(end, a->end); } /* canonicalize the intersection if necessary */ @@ -90,10 +96,7 @@ /* non-symmetric thin goes from one end to the other */ if(!symmetric) { upfence = 0; - x[upfence]=x[0]; - y[upfence++]=y[0]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_UP(0); for(cur = 0, next = 1; next < n; next++) { dx = x[next] - x[cur]; dy = y[next] - y[cur]; @@ -102,10 +105,7 @@ theta = atan2(dy, dx); if(!inarc(wedge, theta)) { cur = --next; - x[upfence]=x[cur]; - y[upfence++]=y[cur]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_UP(cur); continue; } dist = hypot(dx, dy); @@ -114,19 +114,13 @@ intersect(&wedge, theta - alpha, theta + alpha); } } - x[upfence]=x[n-1]; - y[upfence++]=y[n-1]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_UP(n-1); return(upfence); } /* symmetric version: first thin from the beginning to the middle */ upfence = 0; mid = (n + 1) / 2; - x[upfence]=x[0]; - y[upfence++]=y[0]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_UP(0); for(cur = 0, next = 1; next < mid; next++) { dx = x[next] - x[cur]; dy = y[next] - y[cur]; @@ -135,10 +129,7 @@ theta = atan2(dy, dx); if(!inarc(wedge, theta)) { cur = --next; - x[upfence]=x[cur]; - y[upfence++]=y[cur]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_UP(cur); continue; } dist = hypot(dx, dy); @@ -147,18 +138,12 @@ intersect(&wedge, theta - alpha, theta + alpha); } } - x[upfence]=x[mid-1]; - y[upfence++]=y[mid-1]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_UP(mid-1); uptotal = upfence; /* now work from the end to the middle */ downfence = n; mid = n - mid; - x[--downfence]=x[n-1]; - y[downfence]=y[n-1]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_DOWN(n-1); for(cur = n-1, next = n-2; next >= mid; next--) { dx = x[next] - x[cur]; dy = y[next] - y[cur]; @@ -167,10 +152,7 @@ theta = atan2(dy, dx); if(!inarc(wedge, theta)) { cur = ++next; - x[--downfence]=x[cur]; - y[downfence]=y[cur]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_DOWN(cur); continue; } dist = hypot(dx, dy); @@ -179,10 +161,7 @@ intersect(&wedge, theta - alpha, theta + alpha); } } - x[--downfence]=x[mid]; - y[downfence]=y[mid]; - wedge.begin = -PI; - wedge.end = PI; + INSTALL_DOWN(mid); downtotal = n - downfence; /* for n odd, middle point is recorded twice, so fix that */ diff -Nru r-cran-maps-2.2-1/src/thin.c.orig r-cran-maps-2.3-2/src/thin.c.orig --- r-cran-maps-2.2-1/src/thin.c.orig 2004-07-19 01:24:29.000000000 +0000 +++ r-cran-maps-2.3-2/src/thin.c.orig 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -#include "R.h" -#include "map.h" - -#define INIT(a) a.begin = -PI; a.end = PI -#define INSTALL_UP(j) x[upfence]=x[j]; y[upfence++]=y[j]; INIT(wedge) -#define INSTALL_DOWN(j) x[--downfence]=x[j]; y[downfence]=y[j]; INIT(wedge) -#define Max(a,b) ((a)>(b)?(a):(b)) -#define Min(a,b) ((a)<(b)?(a):(b)) - -/* - * An arc structure has a beginning angle and - * an ending angle. It should be in a canonical - * form such that the beginning angle is - * in [-PI,PI). This implies that the end - * angle is always greater than -PI, a fact - * which is assumed in the routines below which - * manipulate arcs. - */ -struct arc { - double begin; - double end; -}; - -/* - * Test whether theta lies in the arc a. - * Theta is expected to be in [-PI,PI). - */ -static int inarc(a, theta) - struct arc a; - double theta; -{ - if(a.begin <= theta && theta <= a.end) - return(1); - theta += PI2; - if(a.begin <= theta && theta <= a.end) - return(1); - return(0); -} - -/* - * Intersect the arc a with the arc defined by begin - * and end. The arc is assumed to be in canonical form - * but the arc defined by (begin,end) can be located - * anywhere. - */ -static void intersect(a, begin, end) - struct arc *a; - double begin, end; -{ - /* move (begin,end) until it has a chance to intersect a */ - while(end < a->begin) { - begin += PI2; - end += PI2; - } - while(begin > a->end) { - begin -= PI2; - end -= PI2; - } - - /* if no intersection ... */ - if(end < a->begin || begin > a->end) - a->begin = a->end = 0; - - /* do the intersection ... */ - else { - a->begin = Max(begin, a->begin); - a->end = Min(end, a->end); - } - - /* canonicalize the intersection if necessary */ - while(a->begin >= PI) { - a->begin -= PI; - a->end -= PI; - } -} - -/* - * Given an ordered list of n points in the plane, and - * a tolerance delta, find a subset of the points with - * the same ordering such that the linear spline passing - * through the new points passes within delta of each of - * the original points. - */ -static -int thin(x, y, n, delta, symmetric) - double x[], y[], delta; - int n, symmetric; -{ - int cur, next, mid, uptotal, downtotal, upfence, downfence, m; - double dist, theta, alpha, dx, dy; - struct arc wedge; - - if((symmetric && n <= 4) || (!symmetric && n <= 2) || delta <= 0) - return(n); - - /* non-symmetric thin goes from one end to the other */ - if(!symmetric) { - upfence = 0; - INSTALL_UP(0); - for(cur = 0, next = 1; next < n; next++) { - dx = x[next] - x[cur]; - dy = y[next] - y[cur]; - if(dx == 0 && dy == 0) - continue; - theta = atan2(dy, dx); - if(!inarc(wedge, theta)) { - cur = --next; - INSTALL_UP(cur); - continue; - } - dist = hypot(dx, dy); - if(dist > delta) { - alpha = asin(delta / dist); - intersect(&wedge, theta - alpha, theta + alpha); - } - } - INSTALL_UP(n-1); - return(upfence); - } - - /* symmetric version: first thin from the beginning to the middle */ - upfence = 0; mid = (n + 1) / 2; - INSTALL_UP(0); - for(cur = 0, next = 1; next < mid; next++) { - dx = x[next] - x[cur]; - dy = y[next] - y[cur]; - if(dx == 0 && dy == 0) - continue; - theta = atan2(dy, dx); - if(!inarc(wedge, theta)) { - cur = --next; - INSTALL_UP(cur); - continue; - } - dist = hypot(dx, dy); - if(dist > delta) { - alpha = asin(delta / dist); - intersect(&wedge, theta - alpha, theta + alpha); - } - } - INSTALL_UP(mid-1); - uptotal = upfence; - - /* now work from the end to the middle */ - downfence = n; mid = n - mid; - INSTALL_DOWN(n-1); - for(cur = n-1, next = n-2; next >= mid; next--) { - dx = x[next] - x[cur]; - dy = y[next] - y[cur]; - if(dx == 0 && dy == 0) - continue; - theta = atan2(dy, dx); - if(!inarc(wedge, theta)) { - cur = ++next; - INSTALL_DOWN(cur); - continue; - } - dist = hypot(dx, dy); - if(dist > delta) { - alpha = asin(delta / dist); - intersect(&wedge, theta - alpha, theta + alpha); - } - } - INSTALL_DOWN(mid); - downtotal = n - downfence; - - /* for n odd, middle point is recorded twice, so fix that */ - if(n % 2) { - downfence++; - downtotal--; - } - - /* now copy back upper half so that arrays are contiguous */ - for(m = 0; m < downtotal; m++) { - x[upfence] = x[downfence]; - y[upfence++] = y[downfence++]; - } - - return(uptotal + downtotal); -} - -void mapthin(x, y, n, delta, symmetric) - double *x, *y, *delta; - int *n, *symmetric; -{ - int start, end, m, from, to, wasna, isna, i; - - end = 0; - while(end < *n) { - start = end; - while(end < *n && !ISNA(x[end])) - end++; - m = thin(x+start, y+start, end-start, *delta, (int)*symmetric); - for(i = start+m; i < end; i++) { - x[i] = NA_REAL; - y[i] = NA_REAL; - } - while(end < *n && ISNA(x[end])) - end++; - } - wasna = 0; - for(from = to = 0; from < *n; from++) { - isna = ISNA(x[from]); - if(!isna) { - x[to] = x[from]; - y[to] = y[from]; - to++; - } else if(!wasna) { - x[to] = NA_REAL; - y[to] = NA_REAL; - to++; - } - wasna = isna; - } - *n = wasna ? to-1 : to; -} diff -Nru r-cran-maps-2.2-1/src/world.line r-cran-maps-2.3-2/src/world.line --- r-cran-maps-2.2-1/src/world.line 2004-02-10 20:25:55.000000000 +0000 +++ r-cran-maps-2.3-2/src/world.line 2012-11-27 20:19:11.000000000 +0000 @@ -593,6 +593,106 @@ EOR 1 19 -2.142615 0.855245 + -2.141519 0.855211 + -2.136665 0.855211 + -2.131812 0.855211 + -2.126958 0.855211 + -2.122105 0.855211 + -2.117251 0.855211 + -2.112397 0.855211 + -2.107544 0.855211 + -2.102690 0.855211 + -2.097836 0.855211 + -2.092983 0.855211 + -2.088129 0.855211 + -2.083276 0.855211 + -2.078422 0.855211 + -2.073568 0.855211 + -2.068715 0.855211 + -2.063861 0.855211 + -2.059008 0.855211 + -2.054154 0.855211 + -2.049300 0.855211 + -2.044447 0.855211 + -2.039593 0.855211 + -2.034739 0.855211 + -2.029886 0.855211 + -2.025032 0.855211 + -2.020179 0.855211 + -2.015325 0.855211 + -2.010471 0.855211 + -2.005618 0.855211 + -2.000764 0.855211 + -1.995911 0.855211 + -1.991057 0.855211 + -1.986203 0.855211 + -1.981350 0.855211 + -1.976496 0.855211 + -1.971642 0.855211 + -1.966789 0.855211 + -1.961935 0.855211 + -1.957082 0.855211 + -1.952228 0.855211 + -1.947374 0.855211 + -1.942521 0.855211 + -1.937667 0.855211 + -1.932814 0.855211 + -1.927960 0.855211 + -1.923106 0.855211 + -1.918253 0.855211 + -1.913399 0.855211 + -1.908545 0.855211 + -1.903692 0.855211 + -1.898838 0.855211 + -1.893985 0.855211 + -1.889131 0.855211 + -1.884277 0.855211 + -1.879424 0.855211 + -1.874570 0.855211 + -1.869716 0.855211 + -1.864863 0.855211 + -1.860009 0.855211 + -1.855156 0.855211 + -1.850302 0.855211 + -1.845448 0.855211 + -1.840595 0.855211 + -1.835741 0.855211 + -1.830888 0.855211 + -1.826034 0.855211 + -1.821180 0.855211 + -1.816327 0.855211 + -1.811473 0.855211 + -1.806619 0.855211 + -1.801766 0.855211 + -1.796912 0.855211 + -1.792059 0.855211 + -1.787205 0.855211 + -1.782351 0.855211 + -1.777498 0.855211 + -1.772644 0.855211 + -1.767791 0.855211 + -1.762937 0.855211 + -1.758083 0.855211 + -1.753230 0.855211 + -1.748376 0.855211 + -1.743522 0.855211 + -1.738669 0.855211 + -1.733815 0.855211 + -1.728962 0.855211 + -1.724108 0.855211 + -1.719254 0.855211 + -1.714401 0.855211 + -1.709547 0.855211 + -1.704694 0.855211 + -1.699840 0.855211 + -1.694986 0.855211 + -1.690133 0.855211 + -1.685279 0.855211 + -1.680425 0.855211 + -1.675572 0.855211 + -1.670718 0.855211 + -1.665865 0.855211 + -1.661011 0.855211 -1.660754 0.855202 EOR 1 19 diff -Nru r-cran-maps-2.2-1/src/world.linestats r-cran-maps-2.3-2/src/world.linestats --- r-cran-maps-2.2-1/src/world.linestats 2011-04-14 08:17:31.000000000 +0000 +++ r-cran-maps-2.3-2/src/world.linestats 2012-11-27 20:20:24.000000000 +0000 @@ -1 +1 @@ -3904 177 +3904 207