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

[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  c972dd8f3c9d12b8f3c9b18349d91f43655d29e9 (commit)
      from  1db7c04d6c0ceafb591f039c0b0b3aead450301c (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 c972dd8f3c9d12b8f3c9b18349d91f43655d29e9
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Nov 1 09:14:18 2024 -0700

    Reorganize headers

diff --git a/include/geos/operation/overlayng/EdgeNodingBuilder.h b/include/geos/operation/overlayng/EdgeNodingBuilder.h
index aec4d7b41..9066bff2f 100644
--- a/include/geos/operation/overlayng/EdgeNodingBuilder.h
+++ b/include/geos/operation/overlayng/EdgeNodingBuilder.h
@@ -19,32 +19,20 @@
 #pragma once
 
 #include <geos/algorithm/LineIntersector.h>
-#include <geos/algorithm/Orientation.h>
-#include <geos/geom/Coordinate.h>
-#include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/Envelope.h>
 #include <geos/geom/Geometry.h>
 #include <geos/geom/GeometryCollection.h>
 #include <geos/geom/LinearRing.h>
 #include <geos/geom/LineString.h>
-#include <geos/geom/MultiLineString.h>
-#include <geos/geom/MultiPolygon.h>
 #include <geos/geom/Polygon.h>
 #include <geos/noding/IntersectionAdder.h>
-#include <geos/noding/MCIndexNoder.h>
 #include <geos/noding/Noder.h>
-#include <geos/noding/NodedSegmentString.h>
 #include <geos/noding/SegmentString.h>
-#include <geos/noding/ValidatingNoder.h>
-#include <geos/noding/snapround/SnapRoundingNoder.h>
 #include <geos/operation/overlayng/Edge.h>
 #include <geos/operation/overlayng/EdgeSourceInfo.h>
-#include <geos/operation/overlayng/InputGeometry.h>
 #include <geos/operation/overlayng/LineLimiter.h>
-#include <geos/operation/overlayng/OverlayUtil.h>
 #include <geos/operation/overlayng/RingClipper.h>
-#include <geos/operation/valid/RepeatedPointRemover.h>
 
 
 #include <geos/export.h>
@@ -54,8 +42,6 @@
 
 using namespace geos::geom;
 using namespace geos::noding;
-using geos::noding::snapround::SnapRoundingNoder;
-using geos::algorithm::LineIntersector;
 
 
 namespace geos {      // geos.
@@ -95,7 +81,7 @@ private:
     std::unique_ptr<LineLimiter> limiter;
 
     // For use in createFloatingPrecisionNoder()
-    LineIntersector lineInt;
+    algorithm::LineIntersector lineInt;
     IntersectionAdder intAdder;
     std::unique_ptr<Noder> internalNoder;
     std::unique_ptr<Noder> spareInternalNoder;
diff --git a/src/operation/overlayng/EdgeNodingBuilder.cpp b/src/operation/overlayng/EdgeNodingBuilder.cpp
index fd3fd8557..74800020f 100644
--- a/src/operation/overlayng/EdgeNodingBuilder.cpp
+++ b/src/operation/overlayng/EdgeNodingBuilder.cpp
@@ -16,11 +16,20 @@
  *
  **********************************************************************/
 
+#include <geos/noding/ValidatingNoder.h>
+#include <geos/noding/NodedSegmentString.h>
+#include <geos/noding/MCIndexNoder.h>
+#include <geos/geom/Coordinate.h>
+#include <geos/algorithm/Orientation.h>
+#include <geos/noding/snapround/SnapRoundingNoder.h>
 #include <geos/operation/overlayng/EdgeNodingBuilder.h>
 #include <geos/operation/overlayng/EdgeMerger.h>
+#include <geos/operation/valid/RepeatedPointRemover.h>
+#include <geos/operation/overlayng/OverlayUtil.h>
 #include <geos/util.h>
 
 using geos::operation::valid::RepeatedPointRemover;
+using geos::noding::snapround::SnapRoundingNoder;
 
 namespace geos {      // geos
 namespace operation { // geos.operation

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

Summary of changes:
 include/geos/operation/overlayng/EdgeNodingBuilder.h | 16 +---------------
 src/operation/overlayng/EdgeNodingBuilder.cpp        |  9 +++++++++
 2 files changed, 10 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GEOS