diff -Nru r-cran-mapproj-1.2.7/debian/changelog r-cran-mapproj-1.2.8/debian/changelog --- r-cran-mapproj-1.2.7/debian/changelog 2020-05-30 14:16:53.000000000 +0000 +++ r-cran-mapproj-1.2.8/debian/changelog 2022-01-14 17:52:08.000000000 +0000 @@ -1,8 +1,11 @@ -r-cran-mapproj (1.2.7-1build1) groovy; urgency=medium +r-cran-mapproj (1.2.8-1) unstable; urgency=medium - * No-change rebuild against r-api-4.0 + * Team Upload. + * New upstream version 1.2.8 + * Bump Standards-Version to 4.6.0 (no changes needed) + * Bump debhelper compatibility level to 13 - -- Graham Inggs Sat, 30 May 2020 14:16:53 +0000 + -- Nilesh Patra Fri, 14 Jan 2022 23:22:08 +0530 r-cran-mapproj (1.2.7-1) unstable; urgency=medium diff -Nru r-cran-mapproj-1.2.7/debian/control r-cran-mapproj-1.2.8/debian/control --- r-cran-mapproj-1.2.7/debian/control 2020-02-10 05:57:16.000000000 +0000 +++ r-cran-mapproj-1.2.8/debian/control 2022-01-14 17:52:06.000000000 +0000 @@ -4,11 +4,11 @@ Section: gnu-r Testsuite: autopkgtest-pkg-r Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), dh-r, r-base-dev, r-cran-maps -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/r-pkg-team/r-cran-mapproj Vcs-Git: https://salsa.debian.org/r-pkg-team/r-cran-mapproj.git Homepage: https://cran.r-project.org/package=mapproj diff -Nru r-cran-mapproj-1.2.7/DESCRIPTION r-cran-mapproj-1.2.8/DESCRIPTION --- r-cran-mapproj-1.2.7/DESCRIPTION 2020-02-03 10:10:02.000000000 +0000 +++ r-cran-mapproj-1.2.8/DESCRIPTION 2022-01-12 11:32:43.000000000 +0000 @@ -1,7 +1,7 @@ Package: mapproj Title: Map Projections -Version: 1.2.7 -Date: 2020-01-31 +Version: 1.2.8 +Date: 2022-01-12 Author: Doug McIlroy. Packaged for R by Ray Brownrigg and Thomas P Minka, transition to Plan 9 codebase by Roger Bivand. Description: Converts latitude/longitude into projected coordinates. @@ -10,6 +10,6 @@ License: Lucent Public License Maintainer: Alex Deckmyn NeedsCompilation: yes -Packaged: 2020-02-03 08:19:33 UTC; alex Repository: CRAN -Date/Publication: 2020-02-03 10:10:02 UTC +Packaged: 2022-01-12 10:00:03 UTC; alex +Date/Publication: 2022-01-12 11:32:43 UTC diff -Nru r-cran-mapproj-1.2.7/man/mapproject.Rd r-cran-mapproj-1.2.8/man/mapproject.Rd --- r-cran-mapproj-1.2.7/man/mapproject.Rd 2020-02-01 01:35:08.000000000 +0000 +++ r-cran-mapproj-1.2.8/man/mapproject.Rd 2022-01-12 09:59:34.000000000 +0000 @@ -208,8 +208,8 @@ Richard A. Becker, and Allan R. Wilks, "Maps in S", \emph{AT\&T Bell Laboratories Statistics Research Report, 1991.} - \url{http://www.research.att.com/areas/stat/doc/93.2.ps} - + \url{ https://web.archive.org/web/20070824013345/http://www.research.att.com/areas/stat/doc/93.2.ps} + M. D. McIlroy, Documentation from the \emph{Tenth Edition UNIX Manual, Volume 1,} diff -Nru r-cran-mapproj-1.2.7/MD5 r-cran-mapproj-1.2.8/MD5 --- r-cran-mapproj-1.2.7/MD5 2020-02-03 10:10:02.000000000 +0000 +++ r-cran-mapproj-1.2.8/MD5 2022-01-12 11:32:43.000000000 +0000 @@ -1,9 +1,9 @@ -da14c28aba85f319bf8acda4a84be8c9 *DESCRIPTION +5a84d4adcac11e7d0ca4877a4fc48f05 *DESCRIPTION a66243f26e992c2e09d44b07c8617243 *LICENSE.note 056aeb9f5996f07d32b7b3c52fe6af0b *NAMESPACE -a256c056315fa29e63e1ff128a9dec99 *R/mapproj.r +412368c9cb39b1e4afde6ba59a568784 *R/mapproj.r 774a5e45c7620829cb08e6b3664d2e02 *man/map.grid.Rd -1fcc23d01eee11a5bc21a4283ca5a410 *man/mapproject.Rd +69b8d89c345652d60ffcdf355c317545 *man/mapproject.Rd 1e220fbd9ec36780a036ddc43a17ef08 *src/Makevars.debug 963422f3661a1419150ea314b5b3a4c5 *src/aitoff.c 820bbcc1eace6808d0d13e215e54ab64 *src/albers.c @@ -34,7 +34,7 @@ 270fec0e947e395e1ac74950d4cee39c *src/laue.c d1097e5df5f8e8d4f2586a66e8bce3ab *src/lune.c 43884f7426e7089a34ff7a46d6c9b19a *src/map.h -38950e1951a6f2e28dc46fdcbe3ec473 *src/mapproject.c +cb01919230736df812f057a23c376a38 *src/mapproject.c c9cb7e5d306dea81a01e7aa5de4d18df *src/mercator.c 1aa54f763ad4839773e6ea12ce926fbc *src/mollweide.c ebf89710c52f2558a03dd08afaa13b1c *src/newyorker.c diff -Nru r-cran-mapproj-1.2.7/R/mapproj.r r-cran-mapproj-1.2.8/R/mapproj.r --- r-cran-mapproj-1.2.7/R/mapproj.r 2020-02-01 01:35:08.000000000 +0000 +++ r-cran-mapproj-1.2.8/R/mapproj.r 2020-02-04 13:57:43.000000000 +0000 @@ -3,6 +3,7 @@ val <- list(projection = "", parameters = NULL, orientation = NULL) function(new) if(!missing(new)) val <<- new else val }) + "mapproject"<- function(x, y, projection = "", parameters = NULL, orientation = NULL) { @@ -15,30 +16,30 @@ y <- x$y x <- x$x } - if(length(x) != length(y)) + if (length(x) != length(y)) stop("lengths of x and y must match") - if(is.null(r)) + if (is.null(r)) r <- range(x[!is.na(x)]) new.projection <- (projection != "") - if(new.projection) { - if(is.null(orientation)) orientation = c(90, 0, mean(r)) - else if(length(orientation) != 3) + if (new.projection) { + if (is.null(orientation)) orientation = c(90, 0, mean(r)) + else if (length(orientation) != 3) stop("orientation argument must have 3 elements") } else { - if(nchar(.Last.projection()$projection) == 0) { + if (nchar(.Last.projection()$projection) == 0) { #stop("no previous projection") return(list(x = x, y = y)) } p <- .Last.projection() projection <- p$projection - if(is.null(parameters)) parameters <- p$parameters - else if(length(parameters) != length(p$parameters)) + if (is.null(parameters)) parameters <- p$parameters + else if (length(parameters) != length(p$parameters)) stop(paste("expecting", length(p$parameters), "parameters for", projection, "projection")) - if(is.null(orientation)) orientation <- p$orientation - else if(length(orientation) != 3) + if (is.null(orientation)) orientation <- p$orientation + else if (length(orientation) != 3) stop("orientation argument must have 3 elements") } error <- .C(C_setproj, @@ -47,7 +48,7 @@ as.integer(length(parameters)), as.double(orientation), error = character(1))$error - if(error != "") + if (error != "") stop(error) .Last.projection(list(projection = projection, parameters = parameters, @@ -69,47 +70,47 @@ function(lim, ...) { # like pretty but ensures that the range is identical: # range(pretty.range(x)) == range(x) - x = pretty(lim, ...) - if(abs(x[1]-lim[1]) > abs(x[2]-lim[1])) x = x[-1] - n = length(x) - if(abs(x[n]-lim[2]) > abs(x[n-1]-lim[2])) x = x[-n] - x[1] = lim[1]; x[length(x)] = lim[2] + x <- pretty(lim, ...) + if (abs(x[1]-lim[1]) > abs(x[2]-lim[1])) x <- x[-1] + n <- length(x) + if (abs(x[n]-lim[2]) > abs(x[n-1]-lim[2])) x <- x[-n] + x[1] <- lim[1]; x[length(x)] <- lim[2] x } auto.format <- function(x) { # use the minimal number of digits to make x's unique # similar to abbrev - for(digits in 0:6) { - s = formatC(x, digits = digits, format = "f") - if(all(duplicated(s) == duplicated(x))) break + for (digits in 0:6) { + s <- formatC(x, digits = digits, format = "f") + if (all(duplicated(s) == duplicated(x))) break } s } # by default, use limits of last map - if(missing(lim)) lim = .map.range() - if(is.list(lim)) { + if (missing(lim)) lim = .map.range() + if (is.list(lim)) { # first argument is a map lim <- lim$range } - if(lim[2]-lim[1] > 360) { + if (lim[2]-lim[1] > 360) { lim[2] <- lim[1] + 360 } - if(pretty) { + if (pretty) { x <- pretty.range(lim[1:2], n = nx) y <- pretty.range(lim[3:4], n = ny) } else { - x <- seq(lim[1], lim[2], len = nx) - y <- seq(lim[3], lim[4], len = ny) + x <- seq(lim[1], lim[2], length.out = nx) + y <- seq(lim[3], lim[4], length.out = ny) } - p = mapproject(expand.grid(x = c(seq(lim[1], lim[2], len = 100), NA), + p <- mapproject(expand.grid(x = c(seq(lim[1], lim[2], length.out = 100), NA), y = y)) - p = maps::map.wrap(p) + p <- maps::map.wrap(p) lines(p, col = col, lty = lty, ...) lines(mapproject(expand.grid(y = c(seq(lim[3], lim[4], - len = 100), NA), x = x)), col = col, lty = lty, ...) - if(labels) { + length.out = 100), NA), x = x)), col = col, lty = lty, ...) + if (labels) { tx <- x[2] xinc <- median(diff(x)) ty <- y[length(y)-2] diff -Nru r-cran-mapproj-1.2.7/src/mapproject.c r-cran-mapproj-1.2.8/src/mapproject.c --- r-cran-mapproj-1.2.7/src/mapproject.c 2020-02-01 01:35:08.000000000 +0000 +++ r-cran-mapproj-1.2.8/src/mapproject.c 2022-01-12 08:21:27.000000000 +0000 @@ -135,13 +135,13 @@ double x, y; *error = 0; - range[XMIN] = range[YMIN] = SINGLE_XMAX; - range[XMAX] = range[YMAX] = -SINGLE_XMAX; + range[XMIN] = range[YMIN] = FLT_MAX; + range[XMAX] = range[YMAX] = -FLT_MAX; for(i = 0; i < *n; i++, lon++, lat++) { if(ISNA(*lon) || ISNA(*lat)) continue; ok = 1 == project(*lon, *lat, &x, &y); - if(!ok || ABS(x) > SINGLE_XMAX || ABS(y) > SINGLE_XMAX) { + if(!ok || ABS(x) > FLT_MAX || ABS(y) > FLT_MAX) { *error = 1; *lon = NA_REAL; *lat = NA_REAL;