Skip to content

Commit

Permalink
version 0.6-3
Browse files Browse the repository at this point in the history
  • Loading branch information
rsbivand authored and cran-robot committed May 24, 2023
1 parent 2c58bbe commit 64aa65e
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 50 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Package: rgeos
Title: Interface to Geometry Engine - Open Source ('GEOS')
Version: 0.6-2
Date: 2023-03-06
Version: 0.6-3
Date: 2023-05-18
Depends: R (>= 3.3.0), methods, sp (>= 1.1-0)
Imports: utils, stats, graphics
LinkingTo: sp
Suggests: maptools (>= 0.8-5), testthat, XML, maps, rgdal
NeedsCompilation: yes
LazyLoad: yes
Description: Interface to Geometry Engine - Open Source ('GEOS') using the C 'API' for topology operations on geometries. Please note that 'rgeos' will be retired during 2023, plan transition to sf functions using 'GEOS' at your earliest convenience. The 'GEOS' library is external to the package, and, when installing the package from source, must be correctly installed first. Windows and Mac Intel OS X binaries are provided on 'CRAN'. ('rgeos' >= 0.5-1): Up to and including 'GEOS' 3.7.1, topological operations succeeded with some invalid geometries for which the same operations fail from and including 'GEOS' 3.7.2. The 'checkValidity=' argument defaults and structure have been changed, from default FALSE to integer default '0L' for 'GEOS' < 3.7.2 (no check), '1L' 'GEOS' >= 3.7.2 (check and warn). A value of '2L' is also provided that may be used, assigned globally using 'set_RGEOS_CheckValidity(2L)', or locally using the 'checkValidity=2L' argument, to attempt zero-width buffer repair if invalid geometries are found. The previous default (FALSE, now '0L') is fastest and used for 'GEOS' < 3.7.2, but will not warn users of possible problems before the failure of topological operations that previously succeeded. From 'GEOS' 3.8.0, repair of geometries may also be attempted using 'gMakeValid()', which may, however, return a collection of geometries of different types.
Description: Interface to Geometry Engine - Open Source ('GEOS') using the C 'API' for topology operations on geometries. Please note that 'rgeos' will be retired during October 2023, plan transition to 'sf' or 'terra' functions using 'GEOS' at your earliest convenience (see <https://r-spatial.org/r/2023/05/15/evolution4.html> and earlier blogs for guidance). The 'GEOS' library is external to the package, and, when installing the package from source, must be correctly installed first. Windows and Mac Intel OS X binaries are provided on 'CRAN'. ('rgeos' >= 0.5-1): Up to and including 'GEOS' 3.7.1, topological operations succeeded with some invalid geometries for which the same operations fail from and including 'GEOS' 3.7.2. The 'checkValidity=' argument defaults and structure have been changed, from default FALSE to integer default '0L' for 'GEOS' < 3.7.2 (no check), '1L' 'GEOS' >= 3.7.2 (check and warn). A value of '2L' is also provided that may be used, assigned globally using 'set_RGEOS_CheckValidity(2L)', or locally using the 'checkValidity=2L' argument, to attempt zero-width buffer repair if invalid geometries are found. The previous default (FALSE, now '0L') is fastest and used for 'GEOS' < 3.7.2, but will not warn users of possible problems before the failure of topological operations that previously succeeded. From 'GEOS' 3.8.0, repair of geometries may also be attempted using 'gMakeValid()', which may, however, return a collection of geometries of different types.
Authors@R: c(
person("Roger", "Bivand", role = c("cre", "aut"), email = "Roger.Bivand@nhh.no", comment=c(ORCID="0000-0003-2392-6140")),
person("Colin", "Rundel", role = "aut"),
Expand All @@ -26,7 +26,7 @@ SystemRequirements: GEOS (>= 3.2.0); for building from source: GEOS
Kyngesburye at http://www.kyngchaos.com/ may be used for source
installs on OSX.
RoxygenNote: 6.1.1
Packaged: 2023-03-02 11:55:53 UTC; rsb
Packaged: 2023-05-24 10:18:27 UTC; rsb
Author: Roger Bivand [cre, aut] (<https://orcid.org/0000-0003-2392-6140>),
Colin Rundel [aut],
Edzer Pebesma [ctb],
Expand All @@ -37,4 +37,4 @@ Author: Roger Bivand [cre, aut] (<https://orcid.org/0000-0003-2392-6140>),
Sandro Santilli [cph, ctb]
Maintainer: Roger Bivand <Roger.Bivand@nhh.no>
Repository: CRAN
Date/Publication: 2023-03-02 13:10:02 UTC
Date/Publication: 2023-05-24 16:50:02 UTC
14 changes: 7 additions & 7 deletions MD5
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
f679d5a621cf0cb4717ae8c3c2e3bef4 *ChangeLog
42d740c7a7d09cbdeec4400d2068efb4 *DESCRIPTION
af42c6d84937069d133841cc1b29c6b0 *DESCRIPTION
63fee8598b58d43d08a6201feafd58b7 *LICENSE.note
d5248edab392a8b905063f745e040ec4 *NAMESPACE
e2cc03aeeee571f33640c8e94c49cc89 *NEWS.md
4150c45d25e24635d8b5b8c566e38b05 *R/AAA.R
116e456e993ea0a6d6a1bcb63e927440 *NEWS.md
17dadb63cb6b4a8f6484f16d5111b9c6 *R/AAA.R
437f4edbd6c67d561783af7960575283 *R/Rgpc_funcs.R
fa1203778e80f3a61090cd1e34b24c4b *R/bbox2SP.R
d97a5d4ab563a8c66bfd93dec1449adc *R/gpc_geos.R
Expand All @@ -21,11 +21,11 @@ d93133e3c7d7173580c0fe1242dcc1c8 *R/rgeos_topology.R
18dfe68c4d93ef1258cec15654e05737 *R/rgeos_util.R
6d0eb1653d9c722481408f7ce9d33e3c *R/rgeos_wkt.R
c3cded853a2388ad53569a7105d1c1e3 *cleanup
55bf74f8e36438785127a248bb2a6bd5 *configure
9b5a8b2e9856b4e1c271e8342c2c4e74 *configure
9e4edfae7897079371b3008cde997136 *configure.ac
f679d5a621cf0cb4717ae8c3c2e3bef4 *inst/ChangeLog
3c570969cc1bcbc2fc4a3753b140a0d1 *inst/README
087d72360e588012e0accf3c08c8928a *inst/SVN_VERSION
46a7cca16366fc9d6a92ee77d0f2ee9c *inst/SVN_VERSION
f330d6b1d9127bc82881f33dfe6e18bd *inst/poly-ex-gpc/ex-poly1.txt
734b9a203116bec1dd173e7f8a50e07a *inst/poly-ex-gpc/ex-poly2.txt
bd20bfd0827e13fa7ca4a022810e8962 *inst/poly-ex-gpc/hole-poly.txt
Expand All @@ -47,7 +47,7 @@ aed22fcecc8afa3757bfd9b4fe50b2a4 *man/class-gpc.poly.nohole.Rd
c7b2f59109cc485be1daae3e4e7e4eb1 *man/comment-functions.Rd
8c28c48df99e566a47a72cfca9449edf *man/constructor-SpatialCollections.Rd
a4f8b6f11e2595120e19822213c04368 *man/constructor-SpatialRings.Rd
b18b027ed0dff0e11a9f4e577cd48e0f *man/experimental-functions.Rd
9111e4e2c3c9126cc9ed6c3e136c3b6a *man/experimental-functions.Rd
9b8dad2cab20bd54dd7bf27f1383f7ca *man/gpc-new-generics.Rd
9daa96192eadb9b1f430ff76cf9b795f *man/gpc-polyfile.Rd
800ef0429558430406e3714c3ae4e9ba *man/labelpt.Rd
Expand All @@ -68,7 +68,7 @@ d56a8bd17039002543dbcc021de23189 *man/pred-unary-gIsEmpty.Rd
47f95df67ce2465ec0635518f9a5cc6a *man/pred-unary-gIsRing.Rd
14522b6206db0c56b0bb8f0e61af4fdb *man/pred-unary-gIsSimple.Rd
38a68cd3e2aca689b69c3a51622df5da *man/pred-unary-gIsValid.Rd
af8ba09e182b1d04f3e215425a0d085a *man/rgeos-deprecated.Rd
6681de4a4451ce7d5a360fc2e6e5a97d *man/rgeos-deprecated.Rd
27c39ed58f8f2c85524cc417beaf13a9 *man/topo-bin-gUnion.Rd
b05955696472d44437c45f50812907f0 *man/topo-unary-gBoundary.Rd
a16d91c0e3066d6f64c0483ac1aac007 *man/topo-unary-gCentroid.Rd
Expand Down
8 changes: 6 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Please note that **rgeos** will be retired by the end of 2023, plan transition to sf functions using GEOS at your earliest convenience.
# Please note that **rgeos** will be retired during October 2023, plan transition to **sf** or **terra** functions using GEOS at your earliest convenience (see https://r-spatial.org/r/2023/05/15/evolution4.html and earlier blogs for guidance).

# Version 0.6-2 (development, rev 693-)
# Version 0.6-3 (development, rev 694-)

* Make retirement in October 2023 explicit, move package start-up messages to load from attach

# Version 0.6-2 (2023-03-02, rev 693)

* remove CXX11 requirement

Expand Down
20 changes: 10 additions & 10 deletions R/AAA.R
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,7 @@ version_sp_linkingTo <- function() {
.Call("rgeos_sp_linkingTo_version")
}

.onLoad <- function(lib, pkg) {
# require(methods, quietly = TRUE, warn.conflicts = FALSE)
# require("sp")
# require("stringr")
# library.dynam('rgeos', pkg, lib)

load_stuff <- function() {
set_RGEOS_HANDLE(init_RGEOS())
if (!isTRUE(all.equal(version_GEOS(TRUE), version_GEOS(FALSE),
check.attributes=FALSE))) {
Expand All @@ -118,9 +113,6 @@ version_sp_linkingTo <- function() {
assign("STRsubset", FALSE, envir=.RGEOS_HANDLE)
cV <- ifelse(c(version_GEOS0()) < "3.7.2", 0L, 1L)
assign("CheckValidity", cV, envir=.RGEOS_HANDLE)
}

.onAttach <- function(lib, pkg) {
fn <- system.file("SVN_VERSION", package="rgeos")
if (file.exists(fn)) {
svn_version <- scan(fn, what=character(1), sep="\n", quiet=TRUE)
Expand All @@ -131,7 +123,7 @@ version_sp_linkingTo <- function() {
", (SVN revision ", svn_version, ")\n", sep="")
Smess <- paste(Smess, "GEOS runtime version:",
version_GEOS(), "\n")
Smess <- paste(Smess, "Please note that rgeos will be retired during 2023,\nplan transition to sf functions using GEOS at your earliest convenience.\n")
Smess <- paste(Smess, "Please note that rgeos will be retired during October 2023,\nplan transition to sf or terra functions using GEOS at your earliest convenience.\nSee https://r-spatial.org/r/2023/05/15/evolution4.html for details.\n")
if (gIsOverlayNG()) Smess <- paste(Smess, "GEOS using OverlayNG\n")
splVersion <- version_sp_linkingTo()
Smess <- paste(Smess, "Linking to sp version:", splVersion, "\n")
Expand All @@ -142,6 +134,14 @@ version_sp_linkingTo <- function() {

Smess <- paste(Smess, "Polygon checking:", get_do_poly_check(), "\n")
packageStartupMessage(Smess, appendLF = TRUE)

}

.onLoad <- function(lib, pkg) {
load_stuff()
}

.onAttach <- function(lib, pkg) {
}

.onUnload <- function(libpath) {
Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for rgeos 0.6-2.
# Generated by GNU Autoconf 2.71 for rgeos 0.6-3.
#
# Report bugs to <Roger.Bivand@nhh.no>.
#
Expand Down Expand Up @@ -610,8 +610,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rgeos'
PACKAGE_TARNAME='rgeos'
PACKAGE_VERSION='0.6-2'
PACKAGE_STRING='rgeos 0.6-2'
PACKAGE_VERSION='0.6-3'
PACKAGE_STRING='rgeos 0.6-3'
PACKAGE_BUGREPORT='Roger.Bivand@nhh.no'
PACKAGE_URL=''

Expand Down Expand Up @@ -1216,7 +1216,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures rgeos 0.6-2 to adapt to many kinds of systems.
\`configure' configures rgeos 0.6-3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1278,7 +1278,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of rgeos 0.6-2:";;
short | recursive ) echo "Configuration of rgeos 0.6-3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1352,7 +1352,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rgeos configure 0.6-2
rgeos configure 0.6-3
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1389,7 +1389,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by rgeos $as_me 0.6-2, which was
It was created by rgeos $as_me 0.6-3, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -2613,7 +2613,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by rgeos $as_me 0.6-2, which was
This file was extended by rgeos $as_me 0.6-3, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -2668,7 +2668,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
rgeos config.status 0.6-2
rgeos config.status 0.6-3
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion inst/SVN_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
693
696
5 changes: 0 additions & 5 deletions man/experimental-functions.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ xx <- readShapeSpatial(system.file("shapes/fylk-val-ll.shp",
package="maptools")[1], proj4string=CRS("+proj=longlat +datum=WGS84"))
a0 <- gUnarySTRtreeQuery(xx)
a0
bbxx <- bbox(xx)
wdb_lines <- system.file("share/wdb_borders_c.b", package="maptools")
xxx <- Rgshhs(wdb_lines, xlim=bbxx[1,], ylim=bbxx[2,])$SP
a1 <- gBinarySTRtreeQuery(xx, xxx)
a1
nc1 <- readShapePoly(system.file("shapes/sids.shp", package="maptools")[1],
proj4string=CRS("+proj=longlat +datum=NAD27"))
a2 <- gUnarySTRtreeQuery(nc1)
Expand Down
11 changes: 0 additions & 11 deletions man/rgeos-deprecated.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,6 @@ plot(d,col='red',pbg='white')
# Empty geometry since y is completely contained with x
d2 = gDifference(y,x)
if (require(maptools)) {
xx <- readShapeSpatial(system.file("shapes/fylk-val-ll.shp", package="maptools")[1],
proj4string=CRS("+proj=longlat +datum=WGS84"))
bbxx <- bbox(xx)
wdb_lines <- system.file("share/wdb_borders_c.b", package="maptools")
xxx <- Rgshhs(wdb_lines, xlim=bbxx[1,], ylim=bbxx[2,])$SP
res <-gIntersection(xx, xxx)
plot(xx, axes=TRUE)
plot(xxx, lty=2, add=TRUE)
plot(res, add=TRUE, pch=16,col='red')
}
pol <- readWKT(paste("POLYGON((-180 -20, -140 55, 10 0, -140 -60, -180 -20),",
"(-150 -20, -100 -10, -110 20, -150 -20))"))
library(sp)
Expand Down

0 comments on commit 64aa65e

Please sign in to comment.