[geos-commits] [SCM] GEOS branch main updated. ce538ff668c9b8282c8cfb9c1938a43fa627173a

[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, main has been updated
       via  ce538ff668c9b8282c8cfb9c1938a43fa627173a (commit)
      from  078a37eaa6fd0017fefdf3347fa8a5d27f819f51 (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 ce538ff668c9b8282c8cfb9c1938a43fa627173a
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Mon Jan 8 14:31:32 2024 -0800

    synch code with JTS

diff --git a/src/algorithm/PointLocator.cpp b/src/algorithm/PointLocator.cpp
index 7208a82a5..7fa7dd7e3 100644
--- a/src/algorithm/PointLocator.cpp
+++ b/src/algorithm/PointLocator.cpp
@@ -75,11 +75,10 @@ void
 PointLocator::computeLocation(const CoordinateXY& p, const Geometry* geom)
 {
     //-- handle empty elements
-    /*
     if (geom->isEmpty()) {
         return;
     }
-*/
+    
     GeometryTypeId geomTypeId = geom->getGeometryTypeId();
     switch (geomTypeId)
     {
diff --git a/src/geomgraph/GeometryGraph.cpp b/src/geomgraph/GeometryGraph.cpp
index 1c8e57a9a..b1b2e53f1 100644
--- a/src/geomgraph/GeometryGraph.cpp
+++ b/src/geomgraph/GeometryGraph.cpp
@@ -208,10 +208,7 @@ void
 GeometryGraph::addCollection(const GeometryCollection* gc)
 {
     for(std::size_t i = 0, n = gc->getNumGeometries(); i < n; ++i) {
-        const Geometry* g = gc->getGeometryN(i);
-        if (! g->isEmpty()) {
-            add(g);
-        }
+        add(gc->getGeometryN(i));
     }
 }
 

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

Summary of changes:
 src/algorithm/PointLocator.cpp  | 3 +--
 src/geomgraph/GeometryGraph.cpp | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS