version 0.6-4

DESCRIPTION

@@ -1,14 +1,14 @@
 Package: rgeos
 Title: Interface to Geometry Engine - Open Source ('GEOS')
-Version: 0.6-3
-Date: 2023-05-18
+Version: 0.6-4
+Date: 2023-06-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 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.
+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', or the 'geos' package, 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"),
@@ -21,12 +21,9 @@ Authors@R: c(
 License: GPL (>= 2)
 URL: https://r-forge.r-project.org/projects/rgeos/ https://libgeos.org
         http://rgeos.r-forge.r-project.org/index.html
-SystemRequirements: GEOS (>= 3.2.0); for building from source: GEOS
-        from https://libgeos.org; GEOS OSX frameworks built by William
-        Kyngesburye at http://www.kyngchaos.com/ may be used for source
-        installs on OSX.
+SystemRequirements: GEOS (>= 3.2.0).
 RoxygenNote: 6.1.1
-Packaged: 2023-05-24 10:18:27 UTC; rsb
+Packaged: 2023-07-18 10:10:48 UTC; rsb
 Author: Roger Bivand [cre, aut] (<https://orcid.org/0000-0003-2392-6140>),
   Colin Rundel [aut],
   Edzer Pebesma [ctb],
@@ -37,4 +34,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-05-24 16:50:02 UTC
+Date/Publication: 2023-07-18 17:40:06 UTC

MD5

@@ -1,8 +1,8 @@
 f679d5a621cf0cb4717ae8c3c2e3bef4 *ChangeLog
-af42c6d84937069d133841cc1b29c6b0 *DESCRIPTION
+9e25ecc0f8e89c75b39fa94182fbe82d *DESCRIPTION
 63fee8598b58d43d08a6201feafd58b7 *LICENSE.note
 d5248edab392a8b905063f745e040ec4 *NAMESPACE
-116e456e993ea0a6d6a1bcb63e927440 *NEWS.md
+90ac7ad38390d1b4ee8c2f014c0b645a *NEWS.md
 17dadb63cb6b4a8f6484f16d5111b9c6 *R/AAA.R
 437f4edbd6c67d561783af7960575283 *R/Rgpc_funcs.R
 fa1203778e80f3a61090cd1e34b24c4b *R/bbox2SP.R
@@ -21,11 +21,11 @@ d93133e3c7d7173580c0fe1242dcc1c8 *R/rgeos_topology.R
 18dfe68c4d93ef1258cec15654e05737 *R/rgeos_util.R
 6d0eb1653d9c722481408f7ce9d33e3c *R/rgeos_wkt.R
 c3cded853a2388ad53569a7105d1c1e3 *cleanup
-9b5a8b2e9856b4e1c271e8342c2c4e74 *configure
+854fad6505ca63a782477b3e18d7b1e6 *configure
 9e4edfae7897079371b3008cde997136 *configure.ac
 f679d5a621cf0cb4717ae8c3c2e3bef4 *inst/ChangeLog
 3c570969cc1bcbc2fc4a3753b140a0d1 *inst/README
-46a7cca16366fc9d6a92ee77d0f2ee9c *inst/SVN_VERSION
+aba3121d9a4398d318b708926dbf880d *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
@@ -62,7 +62,7 @@ ce5ce9f0e391809912a54812e96f3f89 *man/misc-over.Rd
 37700662cd67af8ae88f0870c0d41f3e *man/pred-binary-gCrosses.Rd
 fdb49a3cf3ccc518911e95ecaaf4a2f3 *man/pred-binary-gEquals.Rd
 507ee97b47863b48cf74d48252cd4144 *man/pred-binary-gIntersects.Rd
-5c5a77bcf4b71c7bc6c30e65e67b82f3 *man/pred-binary-gRelate.Rd
+8c47f97dceeaea08e290024c2e8bccad *man/pred-binary-gRelate.Rd
 44672cd00f092a5d6ead274004b6ad01 *man/pred-binary-gTouches.Rd
 d56a8bd17039002543dbcc021de23189 *man/pred-unary-gIsEmpty.Rd
 47f95df67ce2465ec0635518f9a5cc6a *man/pred-unary-gIsRing.Rd
@@ -111,12 +111,12 @@ a61694b4d033ea023b4dc14762f05d86 *src/rgeos_wkt.c
 2f71a3fd3908e077be2d96d4b447aca9 *tests/DP_simplify.R
 bf4ebf701ce2e7b7d58bc0a918bd2030 *tests/DP_simplify.Rout.save
 0a35ef68a0533c8fdd016140b47b7df5 *tests/leak_by_exception.R
-6d237f94e05b51e95ab99b9905afd43c *tests/leak_by_exception.Rout.save
+497e4751d32cfd5d73dd5baba49ded08 *tests/leak_by_exception.Rout.save
 768a54afc9389fb1b01d6b3973e81f33 *tests/test-all.R
 f28048eb32f3fc4ffdbd2f750b31e535 *tests/testthat/process_testxml.R
 627c975e214e2ff8ec9ff74a7c44a3a7 *tests/testthat/test-jts-xml.R
 88dadbfcd6df147b04bcf31aadf296b2 *tests/testthat/test-linearref.R
-e0d14404278e8ea3080b7ffed7fdae38 *tests/testthat/test-misc.R
+0e6b0fbe13a633c1548795958619bc59 *tests/testthat/test-misc.R
 9b8b49132a928c8740b881e6fa234a7f *tests/testthat/test-translate-empty.R
 0d33f089065f673688e69f6218694e91 *tests/testthat/test-translate-lines.R
 a5c6cd10cf0e7cb89e42b9413ee7bcce *tests/testthat/test-translate-points.R

NEWS.md

@@ -1,6 +1,10 @@
 # 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-3 (development, rev 694-)
+# Version 0.6-4 (development, rev 698-)
+
+* GEOS 3.12.0 beta WKTReader: Throw exception if WKT contains extra text after end of geometry (#1095, Dan Baston) uncovered error in WKT input in test.
+
+# Version 0.6-3 (2023-05-24, rev 694-697)
 
 * Make retirement in October 2023 explicit, move package start-up messages to load from attach
 

configure

@@ -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-3.
+# Generated by GNU Autoconf 2.71 for rgeos 0.6-4.
 #
 # Report bugs to <Roger.Bivand@nhh.no>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rgeos'
 PACKAGE_TARNAME='rgeos'
-PACKAGE_VERSION='0.6-3'
-PACKAGE_STRING='rgeos 0.6-3'
+PACKAGE_VERSION='0.6-4'
+PACKAGE_STRING='rgeos 0.6-4'
 PACKAGE_BUGREPORT='Roger.Bivand@nhh.no'
 PACKAGE_URL=''
 
@@ -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-3 to adapt to many kinds of systems.
+\`configure' configures rgeos 0.6-4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -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-3:";;
+     short | recursive ) echo "Configuration of rgeos 0.6-4:";;
    esac
   cat <<\_ACEOF
 
@@ -1352,7 +1352,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rgeos configure 0.6-3
+rgeos configure 0.6-4
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -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-3, which was
+It was created by rgeos $as_me 0.6-4, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -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-3, which was
+This file was extended by rgeos $as_me 0.6-4, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -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-3
+rgeos config.status 0.6-4
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

inst/SVN_VERSION

@@ -1 +1 @@
-696
+699

man/pred-binary-gRelate.Rd

@@ -31,7 +31,7 @@ See references for additional details.
 
 \references{
 Documentation of Intersection Matrix Patterns:
-\url{http://docs.geotools.org/stable/userguide/library/jts/dim9.html}
+\url{https://docs.geotools.org/stable/userguide/library/jts/dim9.html}
 }
 
 \author{Roger Bivand & Colin Rundel}

tests/leak_by_exception.Rout.save

@@ -1,6 +1,6 @@
 
-R Under development (unstable) (2022-12-10 r83428) -- "Unsuffered Consequences"
-Copyright (C) 2022 The R Foundation for Statistical Computing
+R version 4.3.0 (2023-04-21) -- "Already Tomorrow"
+Copyright (C) 2023 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -24,7 +24,7 @@ Type 'q()' to quit R.
 > try(g3 <- gUnion(g1, g2))
 g1 is invalid
 Error in RGEOSBinTopoFunc(spgeom1, spgeom2, byid, id, drop_lower_td, unaryUnion_if_byid_false,  : 
-  TopologyException: Input geom 0 is invalid: Self-intersection at 5 5
+  TopologyException: side location conflict at 5 5. This can occur if the input geometry is invalid.
 In addition: Warning messages:
 1: In RGEOSUnaryPredFunc(spgeom, byid, "rgeos_isvalid") :
   Self-intersection at or near point 5 5
@@ -34,7 +34,7 @@ In addition: Warning messages:
 > try(g3 <- gDifference(g1, g2))
 g1 is invalid
 Error in RGEOSBinTopoFunc(spgeom1, spgeom2, byid, id, drop_lower_td, unaryUnion_if_byid_false,  : 
-  TopologyException: Input geom 0 is invalid: Self-intersection at 5 5
+  TopologyException: side location conflict at 5 5. This can occur if the input geometry is invalid.
 In addition: Warning messages:
 1: In RGEOSUnaryPredFunc(spgeom, byid, "rgeos_isvalid") :
   Self-intersection at or near point 5 5
@@ -44,7 +44,7 @@ In addition: Warning messages:
 > try(g3 <- gIntersection(g1, g2))
 g1 is invalid
 Error in RGEOSBinTopoFunc(spgeom1, spgeom2, byid, id, drop_lower_td, unaryUnion_if_byid_false,  : 
-  TopologyException: Input geom 0 is invalid: Self-intersection at 5 5
+  TopologyException: side location conflict at 5 5. This can occur if the input geometry is invalid.
 In addition: Warning messages:
 1: In RGEOSUnaryPredFunc(spgeom, byid, "rgeos_isvalid") :
   Self-intersection at or near point 5 5
@@ -54,7 +54,7 @@ In addition: Warning messages:
 > try(g3 <- gSymdifference(g1, g2))
 g1 is invalid
 Error in RGEOSBinTopoFunc(spgeom1, spgeom2, byid, id, drop_lower_td, unaryUnion_if_byid_false,  : 
-  TopologyException: Input geom 0 is invalid: Self-intersection at 5 5
+  TopologyException: side location conflict at 5 5. This can occur if the input geometry is invalid.
 In addition: Warning messages:
 1: In RGEOSUnaryPredFunc(spgeom, byid, "rgeos_isvalid") :
   Self-intersection at or near point 5 5
@@ -99,4 +99,4 @@ In RGEOSUnaryPredFunc(spgeom, byid, "rgeos_isvalid") :
 > 
 > proc.time()
    user  system elapsed 
-  0.319   0.035   0.347 
+  0.313   0.038   0.343 

tests/testthat/test-misc.R

@@ -50,7 +50,7 @@ test_that("gNearestPoints works with different geometries as inputs", {
   g2 <- readWKT("MULTIPOLYGON(((34 54, 60 34, 60 54, 34 54),
                                (50 50, 52 50, 52 48, 50 48, 50 50)),
                               ((100 100, 150 100, 150 150, 100 150, 100 100),
-                               (120 120, 120 130, 130 130, 130 120, 120 120))))")
+                               (120 120, 120 130, 130 130, 130 120, 120 120)))")
   expect_identical(coord(gNearestPoints(g1, g2)),
                    coord(readWKT("MULTIPOINT(35 60, 35 54)")))
   expect_identical(gDistance(g1, g2), 6)