Replace us_map implementation with usmapdata call and remove map gene…

…ration scripts

DESCRIPTION

@@ -14,6 +14,7 @@ LazyData: true
 URL: https://usmap.dev
 BugReports: https://github.com/pdil/usmap/issues
 Imports:
+    usmapdata,
     utils
 Suggests:
     covr,

R/plot-map.R

@@ -104,16 +104,11 @@ plot_usmap <- function(regions = c("states", "state", "counties", "county"),
 
   # create label layer
   if (labels) {
-    centroidLabelsColClasses <- c("numeric", "numeric", "character", "character", "character")
+    if (regions_ == "state") { regions__ <- "states" }
+    else if (regions_ == "county") { regions__ <- "counties" }
+    else { regions__ <- regions_ }
 
-    if (regions_ == "county" | regions_ == "counties") {
-      # add extra column for the county name
-      centroidLabelsColClasses <- c(centroidLabelsColClasses, "character")
-    }
-
-    centroid_labels <- utils::read.csv(system.file("extdata", paste0("us_", regions_, "_centroids.csv"), package = "usmap"),
-                                       colClasses = centroidLabelsColClasses,
-                                       stringsAsFactors = FALSE)
+    centroid_labels <- usmapdata::centroid_labels(regions__)
 
     if (length(include) > 0) {
       centroid_labels <- centroid_labels[

R/transform.R

@@ -182,5 +182,5 @@ usmap_crs <- function() {
   }
 
   sp::CRS(paste("+proj=laea +lat_0=45 +lon_0=-100 +x_0=0 +y_0=0",
-                "+a=6370997 +b=6370997 +units=m +no_defs"))
+                "+a=6370997 +b=6370997 +units=m +no_defs +datum=WGS84"))
 }

R/usmap.R

@@ -98,42 +98,5 @@ if (getRversion() >= "2.15.1")
 us_map <- function(regions = c("states", "state", "counties", "county"),
                    include = c(),
                    exclude = c()) {
-
-  regions_ <- match.arg(regions)
-
-  if (regions_ == "state") regions_ <- "states"
-  else if (regions_ == "county") regions_ <- "counties"
-
-  df <- utils::read.csv(system.file("extdata", paste0("us_", regions_, ".csv"), package = "usmap"),
-                        colClasses = col_classes(regions_),
-                        stringsAsFactors = FALSE)
-
-  if (length(include) > 0) {
-    df <- df[df$full %in% include |
-               df$abbr %in% include |
-               df$fips %in% include |
-               substr(df$fips, 1, 2) %in% include, ]
-  }
-
-  if (length(exclude) > 0) {
-    df <- df[!(df$full %in% exclude |
-                 df$abbr %in% exclude |
-                 df$fips %in% exclude |
-                 substr(df$fips, 1, 2) %in% exclude), ]
-  }
-
-  df
-}
-
-#' Map data column classes
-#'
-#' @keywords internal
-col_classes <- function(regions) {
-  result <- c("numeric", "numeric", "integer", "logical", "integer", rep("character", 4))
-
-  if (regions %in% c("county", "counties")) {
-    result <- c(result, "character")    # add extra column for county name
-  }
-
-  result
+  usmapdata::us_map(regions = regions, include = include, exclude = exclude)
 }