[geos-commits] [SCM] GEOS branch master updated. aefa49cbc3d096b98333332c12faff26f6fae02e

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  aefa49cbc3d096b98333332c12faff26f6fae02e (commit)
      from  6d71376a638e466b6c568724bb90caded0c970d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aefa49cbc3d096b98333332c12faff26f6fae02e
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Nov 16 11:43:02 2018 -0800

    Fix SharePathsOp to deal with Empty results from OverlayOp
    Fix UnaryUnion test to deal with typed EMPTY

diff --git a/src/operation/sharedpaths/SharedPathsOp.cpp b/src/operation/sharedpaths/SharedPathsOp.cpp
index 62bfc37..bb6d61f 100644
--- a/src/operation/sharedpaths/SharedPathsOp.cpp
+++ b/src/operation/sharedpaths/SharedPathsOp.cpp
@@ -118,7 +118,7 @@ SharedPathsOp::findLinearIntersections(PathList& to)
   {
     const Geometry* sub = full->getGeometryN(i);
     const LineString* path = dynamic_cast<const LineString*>(sub);
-    if ( path ) {
+    if ( path && ! path->isEmpty() ) {
       // NOTE: we're making a copy here, wouldn't be needed
       //       for a simple predicate
       to.push_back(_gf.createLineString(*path).release());
diff --git a/tests/unit/capi/GEOSUnaryUnionTest.cpp b/tests/unit/capi/GEOSUnaryUnionTest.cpp
index f3155bf..85d690f 100644
--- a/tests/unit/capi/GEOSUnaryUnionTest.cpp
+++ b/tests/unit/capi/GEOSUnaryUnionTest.cpp
@@ -85,7 +85,7 @@ namespace tut
         geom2_ = GEOSUnaryUnion(geom1_);
         ensure( nullptr != geom2_ );
 
-        ensure_equals(toWKT(geom2_), std::string("GEOMETRYCOLLECTION EMPTY"));
+        ensure_equals(toWKT(geom2_), std::string("POINT EMPTY"));
     }
 
     // Self-union a 2d point

-----------------------------------------------------------------------

Summary of changes:
 src/operation/sharedpaths/SharedPathsOp.cpp | 2 +-
 tests/unit/capi/GEOSUnaryUnionTest.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS