v3.4.3 (#32)

* Remove some trailing spaces

* Update DESCRIPTION

Author: adeckmyn

DESCRIPTION

@@ -1,10 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 3.4.2.9008
-Date: 2025-05-14
-Author: Original S code by Richard A. Becker and Allan R. Wilks.
-	R version by Ray Brownrigg.
-        Enhancements by Thomas P. Minka and Alex Deckmyn.
+Version: 3.4.3
+Date: 2025-05-15
 Description: Display of maps.  Projection code and larger maps are in
              separate packages ('mapproj' and 'mapdata').
 Depends: R (>= 3.5.0)
@@ -14,7 +11,6 @@ Suggests: mapproj (>= 1.2-0), mapdata (>= 2.3.0), sf, rnaturalearth
 License: GPL-2
 URL: https://github.com/adeckmyn/maps
 BugReports: https://github.com/adeckmyn/maps/issues
-Maintainer: Alex Deckmyn <alex.deckmyn@meteo.be>
 Authors@R: c(person(given  = c("Richard", "A."),
                     family = "Becker",
                     role   = "aut",

R/db.r

@@ -136,7 +136,7 @@ function(database = "world", patterns, exact = FALSE)
     }
   } else {
 ## QUICK FIX: there is a problem now for UK vs Ukrain...
-    if (database=="world") patterns <- fix_exceptions(patterns) 
+    if (database=="world") patterns <- fix_exceptions(patterns)
     regexp <- paste("(^", patterns, ")", sep = "", collapse = "|")
 # BUGFIX: perl regex is limited to about 30000 characters
 # so this crashes if patterns includes the whole world map
@@ -164,7 +164,7 @@ function(database = "world")
       if (!is.null(database$maptype)) return(database$maptype)
 #      if (!is.null(database$projection)) return("planar")
       return("spherical")
-# you may also look at $projection ... 
+# you may also look at $projection ...
     } else "spherical"
   }
 }

R/iso.r

@@ -49,11 +49,11 @@ iso.alpha <- function(x,n=2){
   if (any(is.na(sel))) {
     sel2 <- which(is.na(sel))
     nam2 <- unlist(lapply(x[sel2],
-              function(nn) {regx <- paste("(^",nn,")",sep="") ; 
+              function(nn) {regx <- paste("(^",nn,")",sep="") ;
                             ttt <- grep(regx, iso3166$mapname, perl=TRUE, ignore.case=TRUE);
                             if (length(ttt)==1) ttt else NA}))
     sel[sel2] <- nam2
-  } 
+  }
 
   if (n==2) iso3166$a2[sel]
   else if (n==3) iso3166$a3[sel]

R/map.r

@@ -54,7 +54,7 @@ map.poly <- function(database, regions = ".", exact = FALSE,
       the.map <- SpatialPolygons2map(database, namefield=namefield)
     } else if (inherits(database,"SpatialLines")) {
       the.map <- SpatialLines2map(database, namefield=namefield)
-    } else if (is.list(database) && 
+    } else if (is.list(database) &&
                all(c("x", "y", "names") %in%  names(database))) {
       the.map <- database
     } else {
@@ -98,7 +98,7 @@ map.poly <- function(database, regions = ".", exact = FALSE,
             stop("nothing to draw: all regions out of bounds")
     # turn the polyline numbers into x and y coordinates
     if (as.polygon) {
-      coord <- mapgetl(database, line$number, xlim, ylim, fill) 
+      coord <- mapgetl(database, line$number, xlim, ylim, fill)
       # assemble lines into polygons
       gonsize <- line$size
       keep <- rep(TRUE, length(gonsize))
@@ -128,14 +128,14 @@ map <-
 function(database = "world", regions = ".", exact = FALSE,
 	 boundary = TRUE, interior = TRUE, projection = "",
 	 parameters = NULL, orientation = NULL, fill = FALSE,
-	 col = 1, plot = TRUE, add = FALSE, namesonly = 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, 
+         mar = c(4.1, 4.1, par("mar")[3], 0.1), myborder = 0.01,
          namefield="name", lforce = "n", ...)
 {
   # parameter checks
-  if (resolution>0 && !plot) 
+  if (resolution>0 && !plot)
     stop("must have plot=TRUE if resolution is given")
   if (!fill && !boundary && !interior)
     stop("one of boundary and interior must be TRUE")
@@ -145,11 +145,11 @@ function(database = "world", regions = ".", exact = FALSE,
     stop("Please install the package 'mapproj' for projections.")
   }
   coordtype <- maptype(database)
-  if (coordtype == "unknown") 
+  if (coordtype == "unknown")
      stop("missing database or unknown coordinate type")
-  if (doproj && coordtype != "spherical") 
+  if (doproj && coordtype != "spherical")
     stop(paste(database, "database is not spherical; projections not allowed"))
-  if (length(wrap)>=2 && !doproj && wrap[2] - wrap[1] != 360) 
+  if (length(wrap)>=2 && !doproj && wrap[2] - wrap[1] != 360)
     stop("The specified longitudes for wrapping are inconsistent, they should be 360 apart.")
   # turn the region names into x and y coordinates
   if (is.character(database)) as.polygon = fill
@@ -158,7 +158,7 @@ function(database = "world", regions = ".", exact = FALSE,
   # to get all necessary polylines/polygons is to set xlim=NULL *temporarily*
   # (alternatively, the C code must shift longitudes by +/- 360 to fit in boundaries)
   xlim_tmp <- if (length(wrap)>=2) NULL else xlim
-  coord <- map.poly(database, regions, exact, xlim_tmp, ylim, 
+  coord <- map.poly(database, regions, exact, xlim_tmp, ylim,
                     boundary, interior, fill, as.polygon, namefield=namefield)
   if (is.na(coord$x[1])) stop("first coordinate is NA. Bad map data?")
   if (length(wrap)>=2) {
@@ -215,7 +215,7 @@ function(database = "world", regions = ".", exact = FALSE,
       if (is.null(ylim) || (doproj && !(lforce %in% c("s","l")))) yrange <- range(coord$y, na.rm = TRUE)
       else yrange <- ylim
       if (coordtype != "spherical" || doproj) {
-	aspect <- c(1, 1) 
+	aspect <- c(1, 1)
       } else
         aspect <- c(cos((mean(yrange) * pi)/180), 1)
       d <- c(diff(xrange), diff(yrange)) * (1 + 2 * myborder) * aspect

R/misc.r

@@ -26,9 +26,9 @@ function(...)
 }
 
 "map.cities" <-
-function (x = world.cities, country = "", label = NULL, minpop = 0, 
+function (x = world.cities, country = "", label = NULL, minpop = 0,
   maxpop = Inf, capitals = 0, cex = par("cex"), projection = FALSE,
-  parameters = NULL, orientation = NULL, pch = 1, ...) 
+  parameters = NULL, orientation = NULL, pch = 1, ...)
 {
   if (missing(x) && !exists("world.cities")) {
     world.cities <- maps::world.cities
@@ -48,27 +48,27 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
       x$lat <- projx$y
     } else stop("mapproj package not available\n")
   } else {
-    if (usr[2] > (180 + 0.04*(usr[2] - usr[1]))) 
+    if (usr[2] > (180 + 0.04*(usr[2] - usr[1])))
       x$long[x$long < 0] <- 360 + x$long[x$long < 0]
   }
   selection <- x$long >= usr[1] & x$long <= usr[2] & x$lat >= usr[3] &
     x$lat <= usr[4] & (x$pop >= minpop & x$pop <= maxpop) & ((capitals == 0) |
     (x$capital >= 1))
-  if (country != "") 
+  if (country != "")
     selection <- selection & x$country.etc == country
   selection0 <- selection & (x$capital == 0) & (capitals == 0)
   selection01 <- selection & (x$capital <= 1) & (capitals <= 1)
   selection1 <- selection & (x$capital == 1) & (capitals == 1)
   selection2 <- selection & (x$capital == 2) & (capitals == 2)
   selection3 <- selection & (x$capital == 3) & (capitals == 3)
-  if (is.null(label)) 
+  if (is.null(label))
     label <- sum(selection) < 20
   cxy <- par("cxy")
-  if (sum(selection01) > 0) 
-    points(x$long[selection01], x$lat[selection01], pch = pch, 
+  if (sum(selection01) > 0)
+    points(x$long[selection01], x$lat[selection01], pch = pch,
       cex = cex * 0.6, ...)
-  if (sum(selection0) > 0) 
-    if (label) 
+  if (sum(selection0) > 0)
+    if (label)
       text(x$long[selection0], x$lat[selection0] + cxy[2] * cex * 0.7,
         paste(" ", x$name[selection0], sep = ""), cex = cex * 0.7, ...)
   if (sum(selection1) > 0) {
@@ -97,7 +97,7 @@ function (x = world.cities, country = "", label = NULL, minpop = 0,
 
 # draw a scale bar on a map
 "map.scale" <-
-function (x, y, relwidth = 0.15, metric = TRUE, ratio = TRUE, ...) 
+function (x, y, relwidth = 0.15, metric = TRUE, ratio = TRUE, ...)
 {
   # old version
   # format.pretty <- function(x) {
@@ -109,17 +109,17 @@ function (x, y, relwidth = 0.15, metric = TRUE, ratio = TRUE, ...)
   prettyNum(formatC(x, format = "fg", digits = digits), big.mark = ",")
   }
   usr <- par("usr")
-  if (missing(y)) 
+  if (missing(y))
   y <- (9 * usr[3] + usr[4])/10
-  if (abs(y) >= 90) 
+  if (abs(y) >= 90)
   warning("location of scale out of this world!")
-  if (missing(x)) 
+  if (missing(x))
   #x <- (0.9 - relwidth) * usr[2] + (0.1 + relwidth) * usr[1]
   x <- (9 * usr[1] + usr[2])/10
   cosy <- cos((2 * pi * y)/360)
   perdeg <- (2 * pi * (6356.78 + 21.38 * cosy) * cosy)/360
   scale <- (perdeg * 100000)/(2.54 * (par("pin")/diff(par("usr"))[-2])[1])
-  if (metric) 
+  if (metric)
   unit <- "km"
   else {
   perdeg <- perdeg * 0.6213712
@@ -174,7 +174,7 @@ map.wrap <- function(p, xlim=NULL) {
   j <- c(j, length(p$x))
   ind <- seq_along(p$x)
 
-  index <- c(ind[1:j[1]],  
+  index <- c(ind[1:j[1]],
              unlist(lapply(1:(length(j)-1), function(k) c(NA, ind[(j[k]+1):j[(k + 1)]]) )) )
 # notice that p$name is not returned!
 # so if wrapping is applied, you loose polygon names

R/read_external.R

@@ -108,7 +108,7 @@ sf2map <- function(database, namefield="name"){
   } else {
     line_names <- 1:nplines
   }
-  if (inherits(database[[gname]], "sfc_MULTILINESTRING") || 
+  if (inherits(database[[gname]], "sfc_MULTILINESTRING") ||
       inherits(database[[gname]], "sfc_MULTIPOLYGON")) {
     nlines <- vapply(1:nplines,
                     FUN=function(r) sum(vapply(1:length(database[[gname]][[r]]),