[r-cran-maps] 42/64: Import Upstream version 2.3-2
Andreas Tille
tille at debian.org
Thu Sep 7 07:32:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-maps.
commit 74ac674295c1b1e0d5791d81f86e8f04e7937f40
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 7 09:27:18 2017 +0200
Import Upstream version 2.3-2
---
DESCRIPTION | 13 +-
MD5 | 72 +--
NAMESPACE | 2 +-
R/db.r | 10 +-
R/map.r | 12 +-
R/misc.r | 26 +-
R/polygon.r | 2 +-
R/zzz.R | 10 +-
data/countyMapEnv.r | 1 -
data/countyMapEnv.rda | Bin 0 -> 82 bytes
data/franceMapEnv.r | 1 -
data/franceMapEnv.rda | Bin 0 -> 82 bytes
data/italyMapEnv.r | 1 -
data/italyMapEnv.rda | Bin 0 -> 81 bytes
data/nzMapEnv.r | 1 -
data/nzMapEnv.rda | Bin 0 -> 78 bytes
data/state.cartoMapEnv.r | 1 -
data/state.cartoMapEnv.rda | Bin 0 -> 88 bytes
data/state.vbmMapEnv.r | 1 -
data/state.vbmMapEnv.rda | Bin 0 -> 85 bytes
data/stateMapEnv.r | 1 -
data/stateMapEnv.rda | Bin 0 -> 81 bytes
data/usaMapEnv.r | 1 -
data/usaMapEnv.rda | Bin 0 -> 78 bytes
data/world.cities.rda | Bin 511244 -> 508908 bytes
data/world2MapEnv.r | 1 -
data/world2MapEnv.rda | Bin 0 -> 82 bytes
data/worldMapEnv.r | 1 -
data/worldMapEnv.rda | Bin 0 -> 81 bytes
man/county.Rd | 2 +-
man/france.Rd | 2 +-
man/italy.Rd | 2 +-
man/map.Rd | 15 +-
man/map.cities.Rd | 11 +-
man/nz.Rd | 2 +-
man/state.Rd | 2 +-
man/state.carto.Rd | 2 +-
man/state.vbm.Rd | 2 +-
man/usa.Rd | 2 +-
man/world.Rd | 2 +-
man/world2.Rd | 2 +-
src/county.gon | 2 -
src/county.gonstats | 2 +-
src/county.name | 1379 ++++++++++++++++++++++----------------------
src/france.name | 10 +-
src/world.line | 100 ++++
src/world.linestats | 2 +-
47 files changed, 894 insertions(+), 804 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 5d1bd08..af872c7 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,17 +1,18 @@
Package: maps
Title: Draw Geographical Maps
-Version: 2.2-5
-Date: 2012-01-16
+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 <Ray.Brownrigg at ecs.vuw.ac.nz>.
- Enhancements by Thomas P Minka <surname at stat.cmu.edu>.
+ Enhancements by Thomas P Minka <tpminka at media.mit.edu>
Description: Display of maps. Projection code and larger maps are in
separate packages (mapproj and mapdata).
Depends: R (>= 2.10.0)
LazyLoad: yes
-Suggests: mapproj
+Suggests: mapproj (>= 1.2-0)
License: GPL-2
Maintainer: Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
-Packaged: 2012-01-15 19:27:26 UTC; ray
+Packaged: 2013-03-13 01:09:30 UTC; ray
+NeedsCompilation: yes
Repository: CRAN
-Date/Publication: 2012-01-15 20:48:09
+Date/Publication: 2013-03-13 07:24:49
diff --git a/MD5 b/MD5
index 52e111a..5aaddda 100644
--- a/MD5
+++ b/MD5
@@ -1,76 +1,76 @@
-3964d2eac0d6883c86b109d3a9570a0a *DESCRIPTION
-012592abf4b40a8d741b299df2ded05a *NAMESPACE
-80aa05ca421f4b4aafd2aa1c62e5bf2d *R/db.r
-3300f5294c8c0e572b76ec9125441284 *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
-6f0c8ff18c3b1d87c3fe4687ae7da8da *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
-4188c1cf58e79e9ad31f2a828bf3f1aa *data/state.cartoMapEnv.r
+bdc41fee0d78aa55dd1cc5e9cd1f17eb *data/state.cartoMapEnv.rda
e5e971cef422bb733644791ebdc05547 *data/state.fips.rda
0d920fc325a0cbd152019a3ef88adeb7 *data/state.vbm.center.rda
-b69d31b3798c90f8daf7739755de1a93 *data/state.vbmMapEnv.r
-388d3067e6c9ce642d2dafbb02b8851e *data/stateMapEnv.r
+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
-338087ffbea9f06c8249b4c2db629688 *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
-c2bfc2d7a2639dbf64962901f70e4c92 *man/state.carto.Rd
+805125518fa07c22f1116266bfdb270b *man/state.Rd
+6f697331a4eaa960a3d7afac01825f52 *man/state.carto.Rd
fa354b69c9d9ca135a97133f00bd0024 *man/state.fips.Rd
-5634c8781a38aff1c8c5867a2582b504 *man/state.vbm.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
7088312f20b1d127d59081a8ea4ce10c *src/Makefile
d1ebffb0e35151ea78870f20b78320d5 *src/Makefile.win
ee000c17ddd154301f679ce267ed4918 *src/README
885521324ea75cdfcea9d91a5afb0ec5 *src/convert.awk
-34229207131e202f22a184d96291370b *src/county.gon
-38ce6dae990d17ef1f7025cc01a48f20 *src/county.gonstats
+5046e7c59a58b0cad2b45cceb029a0ab *src/county.gon
+42d31544ad47078bf51d2d43cd125658 *src/county.gonstats
83e6208927194a37954576191c968ba9 *src/county.line
3840bd593493aff0a8a09564772ca1ce *src/county.linestats
-013536d7e03fa19af1c13dbd821a352e *src/county.name
+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
@@ -109,6 +109,6 @@ e00687fd8b955d445553fb401bf2bf3a *src/usa.linestats
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 --git a/NAMESPACE b/NAMESPACE
index 9c9f9ac..f860ac9 100755
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -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 --git a/R/db.r b/R/db.r
index cf56c11..ebcb6ba 100644
--- a/R/db.r
+++ b/R/db.r
@@ -5,7 +5,7 @@ function(database = "world", gons, fill = FALSE, xlim = c(-1e30, 1e30),
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 @@ function(database = "world", lines, xlim = c(-1e30, 1e30), ylim = c(-1e30,
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", lines, xlim = c(-1e30, 1e30), ylim = c(-1e30,
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 @@ function(database = "world")
{
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 @@ match.map <- function(database, regions, exact = FALSE, warn = TRUE) {
}
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 --git a/R/map.r b/R/map.r
index cfdd74a..d75c1e9 100644
--- a/R/map.r
+++ b/R/map.r
@@ -86,6 +86,12 @@ map.poly <- function(database, regions = ".", exact = FALSE,
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 = "",
@@ -114,7 +120,7 @@ function(database = "world", regions = ".", exact = FALSE,
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
@@ -228,8 +234,8 @@ closed.polygon <- function(p) {
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 --git a/R/misc.r b/R/misc.r
index 51a2106..1963188 100644
--- a/R/misc.r
+++ b/R/misc.r
@@ -31,24 +31,24 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
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 --git a/R/polygon.r b/R/polygon.r
index d74af26..db76e18 100644
--- a/R/polygon.r
+++ b/R/polygon.r
@@ -7,7 +7,7 @@ map.where <- function(database = "world", x, y)
}
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 --git a/R/zzz.R b/R/zzz.R
index 7ae0c9d..fc28b0b 100755
--- a/R/zzz.R
+++ b/R/zzz.R
@@ -1,5 +1,5 @@
-.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)
-}
+.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 --git a/data/countyMapEnv.r b/data/countyMapEnv.r
deleted file mode 100644
index db77270..0000000
--- a/data/countyMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-countyMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/countyMapEnv.rda b/data/countyMapEnv.rda
new file mode 100644
index 0000000..90d1c0c
Binary files /dev/null and b/data/countyMapEnv.rda differ
diff --git a/data/franceMapEnv.r b/data/franceMapEnv.r
deleted file mode 100644
index 54d3739..0000000
--- a/data/franceMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-franceMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/franceMapEnv.rda b/data/franceMapEnv.rda
new file mode 100644
index 0000000..5b5a930
Binary files /dev/null and b/data/franceMapEnv.rda differ
diff --git a/data/italyMapEnv.r b/data/italyMapEnv.r
deleted file mode 100644
index 548d74a..0000000
--- a/data/italyMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-italyMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/italyMapEnv.rda b/data/italyMapEnv.rda
new file mode 100644
index 0000000..5797f7f
Binary files /dev/null and b/data/italyMapEnv.rda differ
diff --git a/data/nzMapEnv.r b/data/nzMapEnv.r
deleted file mode 100644
index 68c5119..0000000
--- a/data/nzMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-nzMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/nzMapEnv.rda b/data/nzMapEnv.rda
new file mode 100644
index 0000000..b884648
Binary files /dev/null and b/data/nzMapEnv.rda differ
diff --git a/data/state.cartoMapEnv.r b/data/state.cartoMapEnv.r
deleted file mode 100644
index 9cba662..0000000
--- a/data/state.cartoMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-state.cartoMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/state.cartoMapEnv.rda b/data/state.cartoMapEnv.rda
new file mode 100644
index 0000000..48a0303
Binary files /dev/null and b/data/state.cartoMapEnv.rda differ
diff --git a/data/state.vbmMapEnv.r b/data/state.vbmMapEnv.r
deleted file mode 100644
index 8747981..0000000
--- a/data/state.vbmMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-state.vbmMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/state.vbmMapEnv.rda b/data/state.vbmMapEnv.rda
new file mode 100644
index 0000000..7d9bacd
Binary files /dev/null and b/data/state.vbmMapEnv.rda differ
diff --git a/data/stateMapEnv.r b/data/stateMapEnv.r
deleted file mode 100644
index a36eaa0..0000000
--- a/data/stateMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-stateMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/stateMapEnv.rda b/data/stateMapEnv.rda
new file mode 100644
index 0000000..060a946
Binary files /dev/null and b/data/stateMapEnv.rda differ
diff --git a/data/usaMapEnv.r b/data/usaMapEnv.r
deleted file mode 100644
index 41c2955..0000000
--- a/data/usaMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-usaMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/usaMapEnv.rda b/data/usaMapEnv.rda
new file mode 100644
index 0000000..3e2e59e
Binary files /dev/null and b/data/usaMapEnv.rda differ
diff --git a/data/world.cities.rda b/data/world.cities.rda
index 5e5202c..5be089e 100644
Binary files a/data/world.cities.rda and b/data/world.cities.rda differ
diff --git a/data/world2MapEnv.r b/data/world2MapEnv.r
deleted file mode 100644
index 967d45c..0000000
--- a/data/world2MapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-world2MapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/world2MapEnv.rda b/data/world2MapEnv.rda
new file mode 100644
index 0000000..0460198
Binary files /dev/null and b/data/world2MapEnv.rda differ
diff --git a/data/worldMapEnv.r b/data/worldMapEnv.r
deleted file mode 100644
index c0a9d3f..0000000
--- a/data/worldMapEnv.r
+++ /dev/null
@@ -1 +0,0 @@
-worldMapEnv <- "R_MAP_DATA_DIR"
diff --git a/data/worldMapEnv.rda b/data/worldMapEnv.rda
new file mode 100644
index 0000000..427d497
Binary files /dev/null and b/data/worldMapEnv.rda differ
diff --git a/man/county.Rd b/man/county.Rd
index 70a0b73..0dc3177 100644
--- a/man/county.Rd
+++ b/man/county.Rd
@@ -13,7 +13,7 @@ This database produces a map of the counties of the United States mainland
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 --git a/man/france.Rd b/man/france.Rd
index 7d2dca0..c230012 100644
--- a/man/france.Rd
+++ b/man/france.Rd
@@ -19,7 +19,7 @@ UNEP/GRID. Appropriate wording may be "UNESCO (1987) through
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 --git a/man/italy.Rd b/man/italy.Rd
index 42571c9..2573b96 100644
--- a/man/italy.Rd
+++ b/man/italy.Rd
@@ -19,7 +19,7 @@ UNEP/GRID. Appropriate wording may be "UNESCO (1987) through
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 --git a/man/map.Rd b/man/map.Rd
index bca6b5e..1fa0469 100644
--- a/man/map.Rd
+++ b/man/map.Rd
@@ -4,16 +4,7 @@
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),
- myborder = 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,
@@ -175,6 +166,12 @@ map(database = "world", regions = ".", exact = FALSE, boundary = TRUE,
}
\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
diff --git a/man/map.cities.Rd b/man/map.cities.Rd
index 2a258c6..1c560c4 100644
--- a/man/map.cities.Rd
+++ b/man/map.cities.Rd
@@ -88,12 +88,11 @@ general is no higher than about 40,000. The data are copyright Stefan
Helders but freely available from his website
\url{http://www.world-gazetteer.com}.
-There are three supplied databases, world.cities (the default),
-us.cities and canada.cities. The latter two (which need to be made
-available by using a \code{data()} call, include the state or
-province name with the city name (thanks to John Woodruff
-\email{jpwoodruff at irisinternet.net} for the state and province
-information).
+There are three supplied databases, world.cities (the default), us.cities
+and canada.cities. The latter two, which need to be made available by
+using a \code{'data()'} call, include the state or province name with the
+city name (thanks to John Woodruff \email{jpwoodruff at irisinternet.net}
+for the state and province information).
Note that if the underlying map is "Pacific-centric", i.e. longitudes
exceed 180 degrees, and a projection is used, then the map.cities data
diff --git a/man/nz.Rd b/man/nz.Rd
index 9d8a2ba..575af0b 100644
--- a/man/nz.Rd
+++ b/man/nz.Rd
@@ -12,7 +12,7 @@ detail. The `"nz"' database includes the 3 main Islands and 19 smaller
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 --git a/man/state.Rd b/man/state.Rd
index 397fee6..036a487 100644
--- a/man/state.Rd
+++ b/man/state.Rd
@@ -12,7 +12,7 @@ This database produces a map of the states of the United States mainland
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 --git a/man/state.carto.Rd b/man/state.carto.Rd
index 84d1dc5..1a6e411 100644
--- a/man/state.carto.Rd
+++ b/man/state.carto.Rd
@@ -20,7 +20,7 @@ references).
for annotation purposes.
}
\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 --git a/man/state.vbm.Rd b/man/state.vbm.Rd
index 37146c4..34f9097 100644
--- a/man/state.vbm.Rd
+++ b/man/state.vbm.Rd
@@ -21,7 +21,7 @@ annotations in even the small states.
for annotation purposes.
}
\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 --git a/man/usa.Rd b/man/usa.Rd
index c254dde..69e0f9c 100644
--- a/man/usa.Rd
+++ b/man/usa.Rd
@@ -12,7 +12,7 @@ This database produces a map of the United States mainland 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 --git a/man/world.Rd b/man/world.Rd
index 8a3fcb2..334ae8a 100644
--- a/man/world.Rd
+++ b/man/world.Rd
@@ -15,7 +15,7 @@ database of nearly 2 million points is found in the mapdata package.
}
\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 --git a/man/world2.Rd b/man/world2.Rd
index 720290a..018fb05 100644
--- a/man/world2.Rd
+++ b/man/world2.Rd
@@ -17,7 +17,7 @@ Ocean in the centre of the map.
}
\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 --git a/src/county.gon b/src/county.gon
index f8d6350..1fab79e 100644
--- a/src/county.gon
+++ b/src/county.gon
@@ -4786,8 +4786,6 @@ EOR
EOR
7733 7767 7972 7987 -7734
EOR
- 8698 -8698
-EOR
-8842 8843 -8856 -8853 -8848 8850
EOR
7677 7706 8009 -8028 -7679
diff --git a/src/county.gonstats b/src/county.gonstats
index eaae380..3ba8d86 100644
--- a/src/county.gonstats
+++ b/src/county.gonstats
@@ -1 +1 @@
-3083 13
+3082 13
diff --git a/src/county.name b/src/county.name
index 477777e..e1c1f99 100644
--- a/src/county.name
+++ b/src/county.name
@@ -286,7 +286,7 @@ connecticut,windham 285
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
@@ -2392,692 +2392,691 @@ south dakota,tripp 2391
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
-new mexico,valencia 3083
+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 --git a/src/france.name b/src/france.name
index fafa98e..071c23d 100644
--- a/src/france.name
+++ b/src/france.name
@@ -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 @@ Haute-Marne 33
Mayenne 34
Vosges 35
Sarthe 36
-Finistere 37
+Finistere:I. d'Ouessant 37
Yonne 38
Loiret 39
Haut-Rhin 40
@@ -90,7 +90,7 @@ Lot-et-Garonne 89
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 @@ Var 102
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 --git a/src/world.line b/src/world.line
index 19feed1..87c84a2 100644
--- a/src/world.line
+++ b/src/world.line
@@ -593,6 +593,106 @@ EOR
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 --git a/src/world.linestats b/src/world.linestats
index 6e6ae31..1b54316 100644
--- a/src/world.linestats
+++ b/src/world.linestats
@@ -1 +1 @@
-3904 177
+3904 207
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maps.git
More information about the debian-science-commits
mailing list