[geos-commits] [SCM] GEOS branch main updated. c66c9e8adbdfea6b7a36e14ff93fe97474fedfac
git at osgeo.org
git at osgeo.org
Fri May 2 12:58:40 PDT 2025
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 c66c9e8adbdfea6b7a36e14ff93fe97474fedfac (commit)
via 737904ec0274e64d2cd5079d0ee2988855b83a41 (commit)
via 2d9b0f5e5e75dab3a11a94b85b0cf6d4a051faea (commit)
from 8b04f6d04b3c63e8a8c0edb2315be9197ec45bef (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 c66c9e8adbdfea6b7a36e14ff93fe97474fedfac
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri May 2 12:57:24 2025 -0700
Remove unnecessary includes from tests and tut.
From @dbaston. Closes #1141.
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index f7c302de6..d54d82b9c 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -9,6 +9,7 @@
# by the Free Software Foundation.
# See the COPYING file for more information.
################################################################################
+
file(GLOB_RECURSE _sources ${CMAKE_CURRENT_LIST_DIR}/*.cpp CONFIGURE_DEPEND)
add_executable(test_geos_unit ${_sources})
unset(_sources)
diff --git a/tests/unit/algorithm/AngleTest.cpp b/tests/unit/algorithm/AngleTest.cpp
index cc889c5e9..4d3767182 100644
--- a/tests/unit/algorithm/AngleTest.cpp
+++ b/tests/unit/algorithm/AngleTest.cpp
@@ -7,9 +7,7 @@
#include <geos/geom/Coordinate.h>
#include <geos/algorithm/Angle.h>
// std
-#include <sstream>
#include <string>
-#include <memory>
namespace tut {
//
diff --git a/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp b/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp
index a8054f529..ec8551eaf 100644
--- a/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp
+++ b/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp
@@ -15,7 +15,6 @@
// std
#include <string>
#include <memory>
-#include <cassert>
#include <sstream>
using namespace geos::algorithm;
diff --git a/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp b/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp
index e75d61431..b312a01eb 100644
--- a/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp
+++ b/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp
@@ -15,7 +15,6 @@
#include <string>
#include <memory>
#include <cassert>
-#include <sstream>
using namespace geos::algorithm;
diff --git a/tests/unit/algorithm/CentroidTest.cpp b/tests/unit/algorithm/CentroidTest.cpp
index 152d12dff..db7d65932 100644
--- a/tests/unit/algorithm/CentroidTest.cpp
+++ b/tests/unit/algorithm/CentroidTest.cpp
@@ -12,7 +12,6 @@
#include <geos/geom/PrecisionModel.h>
#include <geos/io/WKTReader.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/ConvexHullTest.cpp b/tests/unit/algorithm/ConvexHullTest.cpp
index b265c2216..c37de5bc8 100644
--- a/tests/unit/algorithm/ConvexHullTest.cpp
+++ b/tests/unit/algorithm/ConvexHullTest.cpp
@@ -17,7 +17,6 @@
// std
#include <sstream>
#include <memory>
-#include <cassert>
namespace geos {
namespace geom {
diff --git a/tests/unit/algorithm/InteriorPointAreaTest.cpp b/tests/unit/algorithm/InteriorPointAreaTest.cpp
index 4b30808b6..eacdba30b 100644
--- a/tests/unit/algorithm/InteriorPointAreaTest.cpp
+++ b/tests/unit/algorithm/InteriorPointAreaTest.cpp
@@ -23,7 +23,6 @@
#include <geos/io/WKTReader.h>
#include <geos/geom/Geometry.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/IntersectionTest.cpp b/tests/unit/algorithm/IntersectionTest.cpp
index b2b6576e2..b3e8f0c93 100644
--- a/tests/unit/algorithm/IntersectionTest.cpp
+++ b/tests/unit/algorithm/IntersectionTest.cpp
@@ -23,8 +23,6 @@
#include <geos/io/WKTReader.h>
#include <geos/geom/Geometry.h>
// std
-#include <sstream>
-#include <string>
#include <memory>
namespace tut {
diff --git a/tests/unit/algorithm/LengthTest.cpp b/tests/unit/algorithm/LengthTest.cpp
index 598cd60de..8eb522730 100644
--- a/tests/unit/algorithm/LengthTest.cpp
+++ b/tests/unit/algorithm/LengthTest.cpp
@@ -13,7 +13,6 @@
#include <geos/geom/PrecisionModel.h>
#include <geos/io/WKTReader.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/MinimumAreaRectangleTest.cpp b/tests/unit/algorithm/MinimumAreaRectangleTest.cpp
index dad960837..a36723bb8 100644
--- a/tests/unit/algorithm/MinimumAreaRectangleTest.cpp
+++ b/tests/unit/algorithm/MinimumAreaRectangleTest.cpp
@@ -8,7 +8,6 @@
#include <geos/geom/Geometry.h>
#include <utility.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/MinimumBoundingCircleTest.cpp b/tests/unit/algorithm/MinimumBoundingCircleTest.cpp
index 599c3e597..c95f0836f 100644
--- a/tests/unit/algorithm/MinimumBoundingCircleTest.cpp
+++ b/tests/unit/algorithm/MinimumBoundingCircleTest.cpp
@@ -25,7 +25,6 @@
#include <geos/io/WKTReader.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/MinimumDiameterTest.cpp b/tests/unit/algorithm/MinimumDiameterTest.cpp
index bf36579a3..2f1812b17 100644
--- a/tests/unit/algorithm/MinimumDiameterTest.cpp
+++ b/tests/unit/algorithm/MinimumDiameterTest.cpp
@@ -23,7 +23,6 @@
#include <geos/io/WKTWriter.h>
#include <geos/geom/Geometry.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/OrientationIndexFailureTest.cpp b/tests/unit/algorithm/OrientationIndexFailureTest.cpp
index c9419332d..7bd81bbc5 100644
--- a/tests/unit/algorithm/OrientationIndexFailureTest.cpp
+++ b/tests/unit/algorithm/OrientationIndexFailureTest.cpp
@@ -7,9 +7,6 @@
#include <geos/geom/Coordinate.h>
#include <geos/algorithm/Orientation.h>
// std
-#include <sstream>
-#include <string>
-#include <memory>
using namespace geos::geom;
using namespace geos::algorithm;
diff --git a/tests/unit/algorithm/PointLocationTest.cpp b/tests/unit/algorithm/PointLocationTest.cpp
index f580c3ee9..ee053a4da 100644
--- a/tests/unit/algorithm/PointLocationTest.cpp
+++ b/tests/unit/algorithm/PointLocationTest.cpp
@@ -10,7 +10,6 @@
#include <geos/algorithm/PointLocation.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/PointLocatorTest.cpp b/tests/unit/algorithm/PointLocatorTest.cpp
index a230d9686..3cff31ac8 100644
--- a/tests/unit/algorithm/PointLocatorTest.cpp
+++ b/tests/unit/algorithm/PointLocatorTest.cpp
@@ -12,7 +12,6 @@
#include <geos/geom/Geometry.h> // required for use in unique_ptr
#include <geos/geom/Coordinate.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/PolygonNodeTopologyTest.cpp b/tests/unit/algorithm/PolygonNodeTopologyTest.cpp
index 1b6dfdef2..ca0270be1 100644
--- a/tests/unit/algorithm/PolygonNodeTopologyTest.cpp
+++ b/tests/unit/algorithm/PolygonNodeTopologyTest.cpp
@@ -9,7 +9,6 @@
#include <geos/algorithm/PolygonNodeTopology.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/RobustLineIntersectionTest.cpp b/tests/unit/algorithm/RobustLineIntersectionTest.cpp
index aaeea3e89..31ec6e1ad 100644
--- a/tests/unit/algorithm/RobustLineIntersectionTest.cpp
+++ b/tests/unit/algorithm/RobustLineIntersectionTest.cpp
@@ -11,7 +11,6 @@
#include <geos/geom/LineString.h>
#include <geos/geom/Coordinate.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/RobustLineIntersectorZTest.cpp b/tests/unit/algorithm/RobustLineIntersectorZTest.cpp
index a343102a5..d57c65b52 100644
--- a/tests/unit/algorithm/RobustLineIntersectorZTest.cpp
+++ b/tests/unit/algorithm/RobustLineIntersectorZTest.cpp
@@ -10,9 +10,6 @@
#include <geos/geom/Coordinate.h>
#include <geos/geom/LineSegment.h>
// std
-#include <sstream>
-#include <string>
-#include <memory>
#include <utility>
diff --git a/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp b/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp
index 5a09e2ef8..42d86b66b 100644
--- a/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp
+++ b/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp
@@ -11,7 +11,6 @@
#include <geos/io/WKTReader.h>
#include <geos/constants.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
index 985a1a7ae..7261e3374 100644
--- a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
+++ b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
@@ -15,7 +15,6 @@
#include <geos/io/WKTWriter.h>
#include <geos/util.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp
index 11fb67aec..ae5c344c7 100644
--- a/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp
+++ b/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp
@@ -14,7 +14,6 @@
#include <geos/util.h>
// std
#include <cmath>
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp
index 735344cd5..f50b58680 100644
--- a/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp
+++ b/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp
@@ -14,7 +14,6 @@
#include <geos/geom/Coordinate.h>
// std
#include <cmath>
-#include <sstream>
#include <string>
#include <memory>
#include <cfenv>
diff --git a/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp b/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp
index 83505123e..533f6c935 100644
--- a/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp
+++ b/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp
@@ -10,7 +10,6 @@
#include <geos/constants.h>
#include <utility.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/hull/ConcaveHullTest.cpp b/tests/unit/algorithm/hull/ConcaveHullTest.cpp
index 3d47bbc93..c68961e72 100644
--- a/tests/unit/algorithm/hull/ConcaveHullTest.cpp
+++ b/tests/unit/algorithm/hull/ConcaveHullTest.cpp
@@ -10,7 +10,6 @@
#include <geos/constants.h>
#include <utility.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp b/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp
index db9cadc56..1258d6506 100644
--- a/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp
+++ b/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp
@@ -5,8 +5,6 @@
#include <geos/algorithm/locate/IndexedPointInAreaLocator.h>
// std
-#include <sstream>
-#include <string>
#include <memory>
using geos::geom::CoordinateXY;
diff --git a/tests/unit/capi/GEOSBufferTest.cpp b/tests/unit/capi/GEOSBufferTest.cpp
index badf30684..538dfbf75 100644
--- a/tests/unit/capi/GEOSBufferTest.cpp
+++ b/tests/unit/capi/GEOSBufferTest.cpp
@@ -5,10 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSBuildAreaTest.cpp b/tests/unit/capi/GEOSBuildAreaTest.cpp
index 012de41e4..503003dd6 100644
--- a/tests/unit/capi/GEOSBuildAreaTest.cpp
+++ b/tests/unit/capi/GEOSBuildAreaTest.cpp
@@ -4,10 +4,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSCAPIDefinesTest.cpp b/tests/unit/capi/GEOSCAPIDefinesTest.cpp
index 5d5347128..b86c8fe1c 100644
--- a/tests/unit/capi/GEOSCAPIDefinesTest.cpp
+++ b/tests/unit/capi/GEOSCAPIDefinesTest.cpp
@@ -5,10 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#define QUOTE(x) #x
#define EXPAND_AND_QUOTE(y) QUOTE(y)
diff --git a/tests/unit/capi/GEOSClipByRectTest.cpp b/tests/unit/capi/GEOSClipByRectTest.cpp
index be47a4c0f..9ff33d336 100644
--- a/tests/unit/capi/GEOSClipByRectTest.cpp
+++ b/tests/unit/capi/GEOSClipByRectTest.cpp
@@ -5,10 +5,8 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
#include <cstdio>
#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp b/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp
index 2cd039fb5..751e4cdc4 100644
--- a/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp
+++ b/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp
@@ -5,9 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSConcaveHullTest.cpp b/tests/unit/capi/GEOSConcaveHullTest.cpp
index 243161d31..5411db1d0 100644
--- a/tests/unit/capi/GEOSConcaveHullTest.cpp
+++ b/tests/unit/capi/GEOSConcaveHullTest.cpp
@@ -5,9 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp b/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp
index 2022b7f90..cee6d9019 100644
--- a/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp
+++ b/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp
@@ -5,10 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSContainsTest.cpp b/tests/unit/capi/GEOSContainsTest.cpp
index 2e570424d..3d377e829 100644
--- a/tests/unit/capi/GEOSContainsTest.cpp
+++ b/tests/unit/capi/GEOSContainsTest.cpp
@@ -8,9 +8,6 @@
#include <geos/geom/PrecisionModel.h>
#include <geos/geom/GeometryFactory.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSConvexHullTest.cpp b/tests/unit/capi/GEOSConvexHullTest.cpp
index e7c20ac0b..adb679cca 100644
--- a/tests/unit/capi/GEOSConvexHullTest.cpp
+++ b/tests/unit/capi/GEOSConvexHullTest.cpp
@@ -5,9 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSCoordSeqTest.cpp b/tests/unit/capi/GEOSCoordSeqTest.cpp
index 176b3d523..ffa7912b0 100644
--- a/tests/unit/capi/GEOSCoordSeqTest.cpp
+++ b/tests/unit/capi/GEOSCoordSeqTest.cpp
@@ -5,10 +5,9 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
+#include <algorithm>
#include <cstdio>
#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSCoverageIsValidTest.cpp b/tests/unit/capi/GEOSCoverageIsValidTest.cpp
index 93868959d..8f1e02889 100644
--- a/tests/unit/capi/GEOSCoverageIsValidTest.cpp
+++ b/tests/unit/capi/GEOSCoverageIsValidTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSCoverageSimplifyTest.cpp b/tests/unit/capi/GEOSCoverageSimplifyTest.cpp
index 812db7cc1..4ca7e9c39 100644
--- a/tests/unit/capi/GEOSCoverageSimplifyTest.cpp
+++ b/tests/unit/capi/GEOSCoverageSimplifyTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSCoverageUnionTest.cpp b/tests/unit/capi/GEOSCoverageUnionTest.cpp
index 2d7fccc32..13e922524 100644
--- a/tests/unit/capi/GEOSCoverageUnionTest.cpp
+++ b/tests/unit/capi/GEOSCoverageUnionTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp b/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp
index 0064d8073..d685ae25b 100644
--- a/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp
+++ b/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSDistanceTest.cpp b/tests/unit/capi/GEOSDistanceTest.cpp
index 0416532ef..f5f5e1471 100644
--- a/tests/unit/capi/GEOSDistanceTest.cpp
+++ b/tests/unit/capi/GEOSDistanceTest.cpp
@@ -6,11 +6,10 @@
#include <geos_c.h>
#include <geos/constants.h>
// std
-#include <cstdarg>
+#include <algorithm>
#include <cstdio>
#include <cstdlib>
#include <fenv.h>
-#include <memory>
#include <cmath>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSDistanceWithinTest.cpp b/tests/unit/capi/GEOSDistanceWithinTest.cpp
index 567e43192..e64c14b63 100644
--- a/tests/unit/capi/GEOSDistanceWithinTest.cpp
+++ b/tests/unit/capi/GEOSDistanceWithinTest.cpp
@@ -5,13 +5,6 @@
// geos
#include <geos/constants.h>
#include <geos_c.h>
-// std
-#include <limits>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <math.h>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSEqualsTest.cpp b/tests/unit/capi/GEOSEqualsTest.cpp
index 0164a3ced..392e2cd32 100644
--- a/tests/unit/capi/GEOSEqualsTest.cpp
+++ b/tests/unit/capi/GEOSEqualsTest.cpp
@@ -6,9 +6,6 @@
#include <geos/constants.h>
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSFrechetDistanceTest.cpp b/tests/unit/capi/GEOSFrechetDistanceTest.cpp
index ad6215a28..dc7d69929 100644
--- a/tests/unit/capi/GEOSFrechetDistanceTest.cpp
+++ b/tests/unit/capi/GEOSFrechetDistanceTest.cpp
@@ -4,12 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
-#include <cmath>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp b/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp
index 23b2d68d1..b5861b4d1 100644
--- a/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp
+++ b/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp
@@ -77,27 +77,27 @@ void object::test<3>
()
{
std::string wkt("LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)");
- std::string expected(std::string{"{\n"} +
- " \"type\": \"LineString\",\n" +
- " \"coordinates\": [\n" +
- " [\n" +
- " 102.0,\n" +
- " 0.0\n" +
- " ],\n" +
- " [\n" +
- " 103.0,\n" +
- " 1.0\n" +
- " ],\n" +
- " [\n" +
- " 104.0,\n" +
- " 0.0\n" +
- " ],\n" +
- " [\n" +
- " 105.0,\n" +
- " 1.0\n" +
- " ]\n" +
- " ]\n" +
- "}");
+ std::string expected(std::string{"{\n"
+ " \"type\": \"LineString\",\n"
+ " \"coordinates\": [\n"
+ " [\n"
+ " 102.0,\n"
+ " 0.0\n"
+ " ],\n"
+ " [\n"
+ " 103.0,\n"
+ " 1.0\n"
+ " ],\n"
+ " [\n"
+ " 104.0,\n"
+ " 0.0\n"
+ " ],\n"
+ " [\n"
+ " 105.0,\n"
+ " 1.0\n"
+ " ]\n"
+ " ]\n"
+ "}"});
test_geojson(wkt, expected, 4);
}
diff --git a/tests/unit/capi/GEOSGeomToWKBTest.cpp b/tests/unit/capi/GEOSGeomToWKBTest.cpp
index e445e47a5..dffeeedb7 100644
--- a/tests/unit/capi/GEOSGeomToWKBTest.cpp
+++ b/tests/unit/capi/GEOSGeomToWKBTest.cpp
@@ -6,10 +6,8 @@
#include <geos_c.h>
// std
#include <string>
-#include <cstdarg>
#include <cstdio>
#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeomToWKTTest.cpp b/tests/unit/capi/GEOSGeomToWKTTest.cpp
index 548da91ea..cbd4c34e2 100644
--- a/tests/unit/capi/GEOSGeomToWKTTest.cpp
+++ b/tests/unit/capi/GEOSGeomToWKTTest.cpp
@@ -6,10 +6,7 @@
#include <geos_c.h>
// std
#include <string>
-#include <cstdarg>
-#include <cstdio>
#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeom_cloneTest.cpp b/tests/unit/capi/GEOSGeom_cloneTest.cpp
index 3466a1b95..8ab1e9e6b 100644
--- a/tests/unit/capi/GEOSGeom_cloneTest.cpp
+++ b/tests/unit/capi/GEOSGeom_cloneTest.cpp
@@ -1,10 +1,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeom_createCollectionTest.cpp b/tests/unit/capi/GEOSGeom_createCollectionTest.cpp
index 93474d8cb..626465851 100644
--- a/tests/unit/capi/GEOSGeom_createCollectionTest.cpp
+++ b/tests/unit/capi/GEOSGeom_createCollectionTest.cpp
@@ -6,11 +6,8 @@
#include <geos_c.h>
// std
#include <array>
-#include <cstdarg>
#include <cstdio>
#include <cstdlib>
-#include <memory>
-#include <string>
#include <vector>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeom_createRectangleTest.cpp b/tests/unit/capi/GEOSGeom_createRectangleTest.cpp
index 95be7a936..a80be052a 100644
--- a/tests/unit/capi/GEOSGeom_createRectangleTest.cpp
+++ b/tests/unit/capi/GEOSGeom_createRectangleTest.cpp
@@ -3,10 +3,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeom_createTest.cpp b/tests/unit/capi/GEOSGeom_createTest.cpp
index 6bfb82c69..aec9ae316 100644
--- a/tests/unit/capi/GEOSGeom_createTest.cpp
+++ b/tests/unit/capi/GEOSGeom_createTest.cpp
@@ -5,11 +5,8 @@
// geos
#include <geos_c.h>
// std
-#include <string>
-#include <cstdarg>
#include <cstdio>
#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeom_extentTest.cpp b/tests/unit/capi/GEOSGeom_extentTest.cpp
index bf31bd9c8..49a703c5e 100644
--- a/tests/unit/capi/GEOSGeom_extentTest.cpp
+++ b/tests/unit/capi/GEOSGeom_extentTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp b/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp
index 3d5c98614..95ca4e05e 100644
--- a/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp
+++ b/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGeom_transformXYTest.cpp b/tests/unit/capi/GEOSGeom_transformXYTest.cpp
index b2112ea36..b1295806f 100644
--- a/tests/unit/capi/GEOSGeom_transformXYTest.cpp
+++ b/tests/unit/capi/GEOSGeom_transformXYTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSGetCentroidTest.cpp b/tests/unit/capi/GEOSGetCentroidTest.cpp
index f99c78f12..e0fc823fe 100644
--- a/tests/unit/capi/GEOSGetCentroidTest.cpp
+++ b/tests/unit/capi/GEOSGetCentroidTest.cpp
@@ -5,11 +5,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSHausdorffDistanceTest.cpp b/tests/unit/capi/GEOSHausdorffDistanceTest.cpp
index ead81cd93..eb569c60a 100644
--- a/tests/unit/capi/GEOSHausdorffDistanceTest.cpp
+++ b/tests/unit/capi/GEOSHausdorffDistanceTest.cpp
@@ -4,12 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
-#include <cmath>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSHilbertCodeTest.cpp b/tests/unit/capi/GEOSHilbertCodeTest.cpp
index b70cd1fd8..0220a847f 100644
--- a/tests/unit/capi/GEOSHilbertCodeTest.cpp
+++ b/tests/unit/capi/GEOSHilbertCodeTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSInterruptTest.cpp b/tests/unit/capi/GEOSInterruptTest.cpp
index b54ef8d7f..0843d1bea 100644
--- a/tests/unit/capi/GEOSInterruptTest.cpp
+++ b/tests/unit/capi/GEOSInterruptTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSIntersectionPrecTest.cpp b/tests/unit/capi/GEOSIntersectionPrecTest.cpp
index 0d38e06ac..d6ed8c620 100644
--- a/tests/unit/capi/GEOSIntersectionPrecTest.cpp
+++ b/tests/unit/capi/GEOSIntersectionPrecTest.cpp
@@ -5,10 +5,6 @@
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSIntersectsTest.cpp b/tests/unit/capi/GEOSIntersectsTest.cpp
index b86d8c282..fe11fd70e 100644
--- a/tests/unit/capi/GEOSIntersectsTest.cpp
+++ b/tests/unit/capi/GEOSIntersectsTest.cpp
@@ -6,9 +6,6 @@
#include <geos_c.h>
#include <geos/constants.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp b/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp
index 6b0e69a86..c47dbbb7d 100644
--- a/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp
+++ b/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp
@@ -5,11 +5,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSLineMergeDirectedTest.cpp b/tests/unit/capi/GEOSLineMergeDirectedTest.cpp
index bd5537d08..1e145abc6 100644
--- a/tests/unit/capi/GEOSLineMergeDirectedTest.cpp
+++ b/tests/unit/capi/GEOSLineMergeDirectedTest.cpp
@@ -4,9 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSLineMergeTest.cpp b/tests/unit/capi/GEOSLineMergeTest.cpp
index d8c40c4e0..48817c074 100644
--- a/tests/unit/capi/GEOSLineMergeTest.cpp
+++ b/tests/unit/capi/GEOSLineMergeTest.cpp
@@ -4,9 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSLineStringTest.cpp b/tests/unit/capi/GEOSLineStringTest.cpp
index d05a47a72..ca795de60 100644
--- a/tests/unit/capi/GEOSLineStringTest.cpp
+++ b/tests/unit/capi/GEOSLineStringTest.cpp
@@ -4,9 +4,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include <cmath>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSLineSubstringTest.cpp b/tests/unit/capi/GEOSLineSubstringTest.cpp
index df79b2659..8135a75d5 100644
--- a/tests/unit/capi/GEOSLineSubstringTest.cpp
+++ b/tests/unit/capi/GEOSLineSubstringTest.cpp
@@ -4,9 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSMakeValidTest.cpp b/tests/unit/capi/GEOSMakeValidTest.cpp
index 1c6071e94..c6531d5b8 100644
--- a/tests/unit/capi/GEOSMakeValidTest.cpp
+++ b/tests/unit/capi/GEOSMakeValidTest.cpp
@@ -4,10 +4,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
#include <cstring>
#include <cstdint>
diff --git a/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp b/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp
index 1ca8a7936..c309d0a76 100644
--- a/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp
+++ b/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp
@@ -5,11 +5,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp b/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp
index 5b7c1dff4..f535fce86 100644
--- a/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp
+++ b/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp
@@ -6,7 +6,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
#include <cstdio>
#include <cstdlib>
#include <cstring>
diff --git a/tests/unit/capi/GEOSMinimumClearanceTest.cpp b/tests/unit/capi/GEOSMinimumClearanceTest.cpp
index 0e58f470a..064763986 100644
--- a/tests/unit/capi/GEOSMinimumClearanceTest.cpp
+++ b/tests/unit/capi/GEOSMinimumClearanceTest.cpp
@@ -4,10 +4,6 @@
// geos
#include <geos_c.h>
#include <geos/constants.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp b/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp
index 6782d20c2..b2eff83fd 100644
--- a/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp
+++ b/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSMinimumWidthTest.cpp b/tests/unit/capi/GEOSMinimumWidthTest.cpp
index 57f935da8..4b5658126 100644
--- a/tests/unit/capi/GEOSMinimumWidthTest.cpp
+++ b/tests/unit/capi/GEOSMinimumWidthTest.cpp
@@ -3,10 +3,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSNearestPointsTest.cpp b/tests/unit/capi/GEOSNearestPointsTest.cpp
index d5e7ced4a..c1caa1887 100644
--- a/tests/unit/capi/GEOSNearestPointsTest.cpp
+++ b/tests/unit/capi/GEOSNearestPointsTest.cpp
@@ -5,10 +5,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSNodeTest.cpp b/tests/unit/capi/GEOSNodeTest.cpp
index 9b11e1a15..41324bda5 100644
--- a/tests/unit/capi/GEOSNodeTest.cpp
+++ b/tests/unit/capi/GEOSNodeTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSOffsetCurveTest.cpp b/tests/unit/capi/GEOSOffsetCurveTest.cpp
index b3414dc15..a979155b8 100644
--- a/tests/unit/capi/GEOSOffsetCurveTest.cpp
+++ b/tests/unit/capi/GEOSOffsetCurveTest.cpp
@@ -5,7 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
#include <cstdio>
#include <cstdlib>
#include <cstring>
diff --git a/tests/unit/capi/GEOSOrientPolygonsTest.cpp b/tests/unit/capi/GEOSOrientPolygonsTest.cpp
index 1b9a7a3d1..a82955911 100644
--- a/tests/unit/capi/GEOSOrientPolygonsTest.cpp
+++ b/tests/unit/capi/GEOSOrientPolygonsTest.cpp
@@ -4,12 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <string>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSOrientationIndexTest.cpp b/tests/unit/capi/GEOSOrientationIndexTest.cpp
index 71e50d6f8..8c827e008 100644
--- a/tests/unit/capi/GEOSOrientationIndexTest.cpp
+++ b/tests/unit/capi/GEOSOrientationIndexTest.cpp
@@ -4,12 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <string>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSPointOnSurfaceTest.cpp b/tests/unit/capi/GEOSPointOnSurfaceTest.cpp
index 2675a3a7c..0118234fa 100644
--- a/tests/unit/capi/GEOSPointOnSurfaceTest.cpp
+++ b/tests/unit/capi/GEOSPointOnSurfaceTest.cpp
@@ -5,11 +5,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp b/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp
index 43f426e04..f769b001f 100644
--- a/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp
+++ b/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSPolygonizeTest.cpp b/tests/unit/capi/GEOSPolygonizeTest.cpp
index c0c2eb576..8ed9325bd 100644
--- a/tests/unit/capi/GEOSPolygonizeTest.cpp
+++ b/tests/unit/capi/GEOSPolygonizeTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSPreparedDistanceTest.cpp b/tests/unit/capi/GEOSPreparedDistanceTest.cpp
index 45147eec2..5ea53f1e0 100644
--- a/tests/unit/capi/GEOSPreparedDistanceTest.cpp
+++ b/tests/unit/capi/GEOSPreparedDistanceTest.cpp
@@ -5,10 +5,6 @@
// geos
#include <geos_c.h>
#include <geos/constants.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp b/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp
index 81e74491b..7be2a2d2b 100644
--- a/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp
+++ b/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp
@@ -5,10 +5,6 @@
// geos
#include <geos_c.h>
#include <geos/constants.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSPreparedGeometryTest.cpp b/tests/unit/capi/GEOSPreparedGeometryTest.cpp
index b720214b2..28e24b187 100644
--- a/tests/unit/capi/GEOSPreparedGeometryTest.cpp
+++ b/tests/unit/capi/GEOSPreparedGeometryTest.cpp
@@ -8,9 +8,6 @@
#include <geos/geom/PrecisionModel.h>
#include <geos/geom/GeometryFactory.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp b/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp
index 6ac00004e..effa0628b 100644
--- a/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp
+++ b/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp
@@ -5,10 +5,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSProjectTest.cpp b/tests/unit/capi/GEOSProjectTest.cpp
index 91c861823..af8640f8b 100644
--- a/tests/unit/capi/GEOSProjectTest.cpp
+++ b/tests/unit/capi/GEOSProjectTest.cpp
@@ -3,11 +3,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp b/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp
index e8b08adf4..d27d4d23b 100644
--- a/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp
+++ b/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSRelatePatternMatchTest.cpp b/tests/unit/capi/GEOSRelatePatternMatchTest.cpp
index b60ab1e18..a942917ef 100644
--- a/tests/unit/capi/GEOSRelatePatternMatchTest.cpp
+++ b/tests/unit/capi/GEOSRelatePatternMatchTest.cpp
@@ -5,9 +5,7 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
+#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp b/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp
index 1a0780b57..0b78590b2 100644
--- a/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp
+++ b/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp
@@ -3,12 +3,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSReverseTest.cpp b/tests/unit/capi/GEOSReverseTest.cpp
index fae65d95f..cb8895d26 100644
--- a/tests/unit/capi/GEOSReverseTest.cpp
+++ b/tests/unit/capi/GEOSReverseTest.cpp
@@ -3,10 +3,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSSTRtreeTest.cpp b/tests/unit/capi/GEOSSTRtreeTest.cpp
index 80c52499d..ab3697fab 100644
--- a/tests/unit/capi/GEOSSTRtreeTest.cpp
+++ b/tests/unit/capi/GEOSSTRtreeTest.cpp
@@ -6,7 +6,6 @@
#include <geos_c.h>
#include <geos/constants.h>
// std
-#include <cstdarg>
#include <cstdio>
#include <cstring>
#include <cmath>
diff --git a/tests/unit/capi/GEOSSegmentIntersectionTest.cpp b/tests/unit/capi/GEOSSegmentIntersectionTest.cpp
index aec95a847..f3e2c75da 100644
--- a/tests/unit/capi/GEOSSegmentIntersectionTest.cpp
+++ b/tests/unit/capi/GEOSSegmentIntersectionTest.cpp
@@ -3,10 +3,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSSharedPathsTest.cpp b/tests/unit/capi/GEOSSharedPathsTest.cpp
index db3b24fb9..e1708d938 100644
--- a/tests/unit/capi/GEOSSharedPathsTest.cpp
+++ b/tests/unit/capi/GEOSSharedPathsTest.cpp
@@ -5,10 +5,7 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSSimplifyTest.cpp b/tests/unit/capi/GEOSSimplifyTest.cpp
index 407589b8b..1de11740b 100644
--- a/tests/unit/capi/GEOSSimplifyTest.cpp
+++ b/tests/unit/capi/GEOSSimplifyTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSSnapTest.cpp b/tests/unit/capi/GEOSSnapTest.cpp
index fba18f8e8..7fedee2e6 100644
--- a/tests/unit/capi/GEOSSnapTest.cpp
+++ b/tests/unit/capi/GEOSSnapTest.cpp
@@ -5,10 +5,7 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp b/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp
index ca84ed899..1f6bdcb33 100644
--- a/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp
+++ b/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp
@@ -1,11 +1,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp b/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp
index 0f873b9e3..2c421f513 100644
--- a/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp
+++ b/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp
@@ -4,11 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSUnaryUnionTest.cpp b/tests/unit/capi/GEOSUnaryUnionTest.cpp
index b33b07a2f..ad431e12b 100644
--- a/tests/unit/capi/GEOSUnaryUnionTest.cpp
+++ b/tests/unit/capi/GEOSUnaryUnionTest.cpp
@@ -5,9 +5,6 @@
// geos
#include <geos_c.h>
// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSUserDataTest.cpp b/tests/unit/capi/GEOSUserDataTest.cpp
index 18345f769..9049f7564 100644
--- a/tests/unit/capi/GEOSUserDataTest.cpp
+++ b/tests/unit/capi/GEOSUserDataTest.cpp
@@ -1,14 +1,9 @@
//
-// Test Suite for C-API GEOSSimplify
+// Test Suite for C-API GEOSGeom_setUserData
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSVoronoiDiagramTest.cpp b/tests/unit/capi/GEOSVoronoiDiagramTest.cpp
index b379a49d0..7c5b05bcd 100644
--- a/tests/unit/capi/GEOSVoronoiDiagramTest.cpp
+++ b/tests/unit/capi/GEOSVoronoiDiagramTest.cpp
@@ -6,10 +6,6 @@
#include <geos_c.h>
// std
#include <cfenv>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSWithinTest.cpp b/tests/unit/capi/GEOSWithinTest.cpp
index 703a9b86e..387f40909 100644
--- a/tests/unit/capi/GEOSWithinTest.cpp
+++ b/tests/unit/capi/GEOSWithinTest.cpp
@@ -4,10 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSisClosedTest.cpp b/tests/unit/capi/GEOSisClosedTest.cpp
index 656ec1ab1..2b322542e 100644
--- a/tests/unit/capi/GEOSisClosedTest.cpp
+++ b/tests/unit/capi/GEOSisClosedTest.cpp
@@ -4,12 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cctype>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSisRingTest.cpp b/tests/unit/capi/GEOSisRingTest.cpp
index 1d0b6da47..0f263be6c 100644
--- a/tests/unit/capi/GEOSisRingTest.cpp
+++ b/tests/unit/capi/GEOSisRingTest.cpp
@@ -4,12 +4,6 @@
#include <tut/tut.hpp>
// geos
#include <geos_c.h>
-// std
-#include <cctype>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/GEOSisValidDetailTest.cpp b/tests/unit/capi/GEOSisValidDetailTest.cpp
index 56d005268..4c0c12e9e 100644
--- a/tests/unit/capi/GEOSisValidDetailTest.cpp
+++ b/tests/unit/capi/GEOSisValidDetailTest.cpp
@@ -6,10 +6,6 @@
#include <geos_c.h>
// std
#include <cctype>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include "capi_test_utils.h"
diff --git a/tests/unit/capi/capi_test_utils.h b/tests/unit/capi/capi_test_utils.h
index aef573565..67818d6a1 100644
--- a/tests/unit/capi/capi_test_utils.h
+++ b/tests/unit/capi/capi_test_utils.h
@@ -7,8 +7,6 @@
#include <cstdarg>
#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#include <cfenv>
diff --git a/tests/unit/geom/CoordinateSequenceIteratorTest.cpp b/tests/unit/geom/CoordinateSequenceIteratorTest.cpp
index 7fa846335..ca98b8172 100644
--- a/tests/unit/geom/CoordinateSequenceIteratorTest.cpp
+++ b/tests/unit/geom/CoordinateSequenceIteratorTest.cpp
@@ -1,7 +1,7 @@
#include <tut/tut.hpp>
#include <geos/geom/LineSegment.h>
#include <geos/geom/CoordinateSequence.h>
-#include <numeric>
+#include <algorithm>
namespace tut {
diff --git a/tests/unit/geomgraph/TopologyLocationTest.cpp b/tests/unit/geomgraph/TopologyLocationTest.cpp
index 86bc6d602..731dcfd72 100644
--- a/tests/unit/geomgraph/TopologyLocationTest.cpp
+++ b/tests/unit/geomgraph/TopologyLocationTest.cpp
@@ -6,10 +6,6 @@
// geos
#include <geos/geomgraph/TopologyLocation.h>
#include <geos/geom/Location.h>
-// std
-#include <memory>
-#include <string>
-#include <vector>
using TopologyLocation = geos::geomgraph::TopologyLocation;
using Location = geos::geom::Location;
diff --git a/tests/unit/index/VertexSequencePackedRtreeTest.cpp b/tests/unit/index/VertexSequencePackedRtreeTest.cpp
index 877666e8d..88edfbf6b 100644
--- a/tests/unit/index/VertexSequencePackedRtreeTest.cpp
+++ b/tests/unit/index/VertexSequencePackedRtreeTest.cpp
@@ -12,11 +12,9 @@
#include <geos/io/WKTWriter.h>
#include <geos/index/VertexSequencePackedRtree.h>
-// std
-#include <stdio.h>
+using geos::index::VertexSequencePackedRtree;
using namespace geos::geom;
-using geos::index::VertexSequencePackedRtree;
namespace tut {
//
diff --git a/tests/unit/index/strtree/SimpleSTRtreeTest.cpp b/tests/unit/index/strtree/SimpleSTRtreeTest.cpp
index 7e15311f0..f13edf7a0 100644
--- a/tests/unit/index/strtree/SimpleSTRtreeTest.cpp
+++ b/tests/unit/index/strtree/SimpleSTRtreeTest.cpp
@@ -8,8 +8,6 @@
#include <geos/index/ItemVisitor.h>
#include <geos/io/WKTReader.h>
-#include <iostream>
-
using namespace geos;
namespace tut {
diff --git a/tests/unit/index/strtree/TemplateSTRtreeTest.cpp b/tests/unit/index/strtree/TemplateSTRtreeTest.cpp
index 75de4f704..701b356e7 100644
--- a/tests/unit/index/strtree/TemplateSTRtreeTest.cpp
+++ b/tests/unit/index/strtree/TemplateSTRtreeTest.cpp
@@ -8,8 +8,6 @@
#include <geos/index/ItemVisitor.h>
#include <geos/io/WKTReader.h>
-#include <iostream>
-
using namespace geos;
using geos::index::strtree::TemplateSTRtree;
using geos::geom::Geometry;
diff --git a/tests/unit/io/ByteOrderValuesTest.cpp b/tests/unit/io/ByteOrderValuesTest.cpp
index 22fc3a024..f483fd2fd 100644
--- a/tests/unit/io/ByteOrderValuesTest.cpp
+++ b/tests/unit/io/ByteOrderValuesTest.cpp
@@ -6,9 +6,6 @@
// geos
#include <geos/io/ByteOrderValues.h>
#include <geos/constants.h> // for int64
-// std
-#include <sstream>
-#include <memory>
namespace tut {
//
diff --git a/tests/unit/io/GeoJSONFeatureTest.cpp b/tests/unit/io/GeoJSONFeatureTest.cpp
index 0f9b4a8d9..701302289 100644
--- a/tests/unit/io/GeoJSONFeatureTest.cpp
+++ b/tests/unit/io/GeoJSONFeatureTest.cpp
@@ -14,7 +14,6 @@
#include <geos/geom/GeometryCollection.h>
#include <geos/geom/Coordinate.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/io/GeoJSONReaderTest.cpp b/tests/unit/io/GeoJSONReaderTest.cpp
index c5ff39db8..25ec0aa4f 100644
--- a/tests/unit/io/GeoJSONReaderTest.cpp
+++ b/tests/unit/io/GeoJSONReaderTest.cpp
@@ -13,7 +13,6 @@
#include <geos/geom/GeometryCollection.h>
#include <geos/geom/Coordinate.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/io/GeoJSONValueTest.cpp b/tests/unit/io/GeoJSONValueTest.cpp
index 7b539ff08..2bf1f3d01 100644
--- a/tests/unit/io/GeoJSONValueTest.cpp
+++ b/tests/unit/io/GeoJSONValueTest.cpp
@@ -6,9 +6,7 @@
// geos
#include <geos/io/GeoJSON.h>
// std
-#include <sstream>
#include <string>
-#include <memory>
namespace tut {
@@ -99,4 +97,4 @@ void object::test<6>
ensure_equals(3, value.getArray()[2].getNumber());
}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/io/GeoJSONWriterTest.cpp b/tests/unit/io/GeoJSONWriterTest.cpp
index 7db14f5cf..e075e577f 100644
--- a/tests/unit/io/GeoJSONWriterTest.cpp
+++ b/tests/unit/io/GeoJSONWriterTest.cpp
@@ -163,27 +163,27 @@ void object::test<11>
{
GeomPtr geom(wktreader.read("LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)"));
std::string result = geojsonwriter.writeFormatted(geom.get());
- ensure_equals(result, std::string{"{\n"} +
- " \"type\": \"LineString\",\n" +
- " \"coordinates\": [\n" +
- " [\n" +
- " 102.0,\n" +
- " 0.0\n" +
- " ],\n" +
- " [\n" +
- " 103.0,\n" +
- " 1.0\n" +
- " ],\n" +
- " [\n" +
- " 104.0,\n" +
- " 0.0\n" +
- " ],\n" +
- " [\n" +
- " 105.0,\n" +
- " 1.0\n" +
- " ]\n" +
- " ]\n" +
- "}");
+ ensure_equals(result, std::string{"{\n"
+ " \"type\": \"LineString\",\n"
+ " \"coordinates\": [\n"
+ " [\n"
+ " 102.0,\n"
+ " 0.0\n"
+ " ],\n"
+ " [\n"
+ " 103.0,\n"
+ " 1.0\n"
+ " ],\n"
+ " [\n"
+ " 104.0,\n"
+ " 0.0\n"
+ " ],\n"
+ " [\n"
+ " 105.0,\n"
+ " 1.0\n"
+ " ]\n"
+ " ]\n"
+ "}"});
}
// Write a LineString to formatted GeoJSON with custom indentation
@@ -194,27 +194,27 @@ void object::test<12>
{
GeomPtr geom(wktreader.read("LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)"));
std::string result = geojsonwriter.writeFormatted(geom.get(), geos::io::GeoJSONType::GEOMETRY, 2);
- ensure_equals(result, std::string{"{\n"} +
- " \"type\": \"LineString\",\n" +
- " \"coordinates\": [\n" +
- " [\n" +
- " 102.0,\n" +
- " 0.0\n" +
- " ],\n" +
- " [\n" +
- " 103.0,\n" +
- " 1.0\n" +
- " ],\n" +
- " [\n" +
- " 104.0,\n" +
- " 0.0\n" +
- " ],\n" +
- " [\n" +
- " 105.0,\n" +
- " 1.0\n" +
- " ]\n" +
- " ]\n" +
- "}");
+ ensure_equals(result, std::string{"{\n"
+ " \"type\": \"LineString\",\n"
+ " \"coordinates\": [\n"
+ " [\n"
+ " 102.0,\n"
+ " 0.0\n"
+ " ],\n"
+ " [\n"
+ " 103.0,\n"
+ " 1.0\n"
+ " ],\n"
+ " [\n"
+ " 104.0,\n"
+ " 0.0\n"
+ " ],\n"
+ " [\n"
+ " 105.0,\n"
+ " 1.0\n"
+ " ]\n"
+ " ]\n"
+ "}"});
}
// Write a Feature
diff --git a/tests/unit/io/WKTWriterTest.cpp b/tests/unit/io/WKTWriterTest.cpp
index 4622e9b98..27897f3d3 100644
--- a/tests/unit/io/WKTWriterTest.cpp
+++ b/tests/unit/io/WKTWriterTest.cpp
@@ -20,7 +20,6 @@
#include <geos/geom/CoordinateSequence.h>
#include <geos/util.h>
// std
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/io/WriterTest.cpp b/tests/unit/io/WriterTest.cpp
index d616e4136..69ab6296a 100644
--- a/tests/unit/io/WriterTest.cpp
+++ b/tests/unit/io/WriterTest.cpp
@@ -6,9 +6,7 @@
// geos
#include <geos/io/Writer.h>
// std
-#include <sstream>
#include <string>
-#include <memory>
namespace tut {
//
diff --git a/tests/unit/linearref/LengthIndexedLineTest.cpp b/tests/unit/linearref/LengthIndexedLineTest.cpp
index 09909f6bf..8ab1bd38d 100644
--- a/tests/unit/linearref/LengthIndexedLineTest.cpp
+++ b/tests/unit/linearref/LengthIndexedLineTest.cpp
@@ -16,7 +16,6 @@
// std
#include <cmath>
-#include <sstream>
#include <string>
#include <memory>
diff --git a/tests/unit/math/DDTest.cpp b/tests/unit/math/DDTest.cpp
index 93d3f1ea1..b98cbae33 100644
--- a/tests/unit/math/DDTest.cpp
+++ b/tests/unit/math/DDTest.cpp
@@ -10,10 +10,6 @@
#include <tut/tut.hpp>
#include <utility.h>
-// std
-#include <memory>
-#include <string>
-
using namespace geos::math;
namespace tut {
diff --git a/tests/unit/noding/NodedSegmentStringTest.cpp b/tests/unit/noding/NodedSegmentStringTest.cpp
index dbda3eb6b..35100878f 100644
--- a/tests/unit/noding/NodedSegmentStringTest.cpp
+++ b/tests/unit/noding/NodedSegmentStringTest.cpp
@@ -18,7 +18,6 @@
using geos::io::WKTReader;
using geos::geom::CoordinateSequence;
using geos::geom::Geometry;
-//using geos::geom::LineString;
using geos::geom::GeometryFactory;
using geos::noding::SegmentString;
diff --git a/tests/unit/noding/snapround/HotPixelTest.cpp b/tests/unit/noding/snapround/HotPixelTest.cpp
index a7cb0c129..5ed39ba2e 100644
--- a/tests/unit/noding/snapround/HotPixelTest.cpp
+++ b/tests/unit/noding/snapround/HotPixelTest.cpp
@@ -8,8 +8,6 @@
#include <geos/geom/Coordinate.h>
#include <geos/geom/Envelope.h>
#include <geos/geom/PrecisionModel.h>
-// std
-#include <memory>
using namespace geos::geom;
using namespace geos::noding::snapround;
diff --git a/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp b/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp
index 4221bad3b..11d760c55 100644
--- a/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp
+++ b/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp
@@ -20,11 +20,7 @@
#include <geos/geom/MultiLineString.h>
// std
#include <memory>
-#include <fstream>
#include <string>
-#include <iomanip>
-#include <iostream>
-
namespace tut {
//
diff --git a/tests/unit/operation/BoundaryOpTest.cpp b/tests/unit/operation/BoundaryOpTest.cpp
index fc8aa1e68..de392dbff 100644
--- a/tests/unit/operation/BoundaryOpTest.cpp
+++ b/tests/unit/operation/BoundaryOpTest.cpp
@@ -5,8 +5,6 @@
#include <geos/algorithm/BoundaryNodeRule.h>
#include <geos/operation/BoundaryOp.h>
// std
-#include <cmath>
-#include <iostream>
#include <string>
#include <memory>
diff --git a/tests/unit/operation/buffer/BufferBuilderTest.cpp b/tests/unit/operation/buffer/BufferBuilderTest.cpp
index e3f4613c9..09f8a7119 100644
--- a/tests/unit/operation/buffer/BufferBuilderTest.cpp
+++ b/tests/unit/operation/buffer/BufferBuilderTest.cpp
@@ -18,7 +18,6 @@
// std
#include <memory>
#include <string>
-#include <vector>
namespace tut {
//
diff --git a/tests/unit/operation/buffer/BufferOpTest.cpp b/tests/unit/operation/buffer/BufferOpTest.cpp
index 342f95db2..520256585 100644
--- a/tests/unit/operation/buffer/BufferOpTest.cpp
+++ b/tests/unit/operation/buffer/BufferOpTest.cpp
@@ -19,7 +19,6 @@
// std
#include <memory>
#include <string>
-#include <vector>
using namespace geos::operation::buffer;
diff --git a/tests/unit/operation/buffer/OffsetCurveTest.cpp b/tests/unit/operation/buffer/OffsetCurveTest.cpp
index e845a51f4..0e817439f 100644
--- a/tests/unit/operation/buffer/OffsetCurveTest.cpp
+++ b/tests/unit/operation/buffer/OffsetCurveTest.cpp
@@ -10,7 +10,6 @@
#include <geos/operation/buffer/BufferParameters.h>
#include <geos/geom/Geometry.h>
#include <geos/io/WKTReader.h>
-// #include <geos/io/WKTWriter.h>
// std
#include <memory>
diff --git a/tests/unit/operation/distance/DistanceOpTest.cpp b/tests/unit/operation/distance/DistanceOpTest.cpp
index 9df481a39..32eee5bbf 100644
--- a/tests/unit/operation/distance/DistanceOpTest.cpp
+++ b/tests/unit/operation/distance/DistanceOpTest.cpp
@@ -20,7 +20,6 @@
// std
#include <memory>
#include <string>
-#include <vector>
namespace tut {
//
diff --git a/tests/unit/operation/geounion/CoverageUnionTest.cpp b/tests/unit/operation/geounion/CoverageUnionTest.cpp
index 50135e195..4da7a6ed9 100644
--- a/tests/unit/operation/geounion/CoverageUnionTest.cpp
+++ b/tests/unit/operation/geounion/CoverageUnionTest.cpp
@@ -17,7 +17,6 @@
#include <memory>
#include <string>
#include <vector>
-#include <iostream>
namespace tut {
//
diff --git a/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp b/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp
index a898a60f4..7866fb732 100644
--- a/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp
+++ b/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp
@@ -11,7 +11,6 @@
// std
#include <memory>
#include <string>
-#include <vector>
namespace tut {
//
diff --git a/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp b/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp
index a03163f93..6342b4243 100644
--- a/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp
+++ b/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp
@@ -9,7 +9,6 @@
#include <geos/geom/CoordinateList.h>
#include <geos/geom/CoordinateSequence.h>
// std
-#include <string>
#include <vector>
using geos::geom::CoordinateSequence;
diff --git a/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp b/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp
index a49b5aec7..e2fccc582 100644
--- a/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp
+++ b/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp
@@ -13,7 +13,6 @@
#include <geos/geom/Coordinate.h>
// std
#include <memory>
-#include <vector>
namespace tut {
using namespace geos::operation::overlay;
diff --git a/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp b/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp
index ab9d09da3..5c481cac3 100644
--- a/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp
+++ b/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp
@@ -5,7 +5,6 @@
#include <geos/algorithm/BoundaryNodeRule.h>
#include <geos/operation/relate/RelateOp.h>
// std
-#include <cmath>
#include <string>
#include <memory>
diff --git a/tests/unit/operation/relate/RelateOpTest.cpp b/tests/unit/operation/relate/RelateOpTest.cpp
index 9c75fd33b..92759da80 100644
--- a/tests/unit/operation/relate/RelateOpTest.cpp
+++ b/tests/unit/operation/relate/RelateOpTest.cpp
@@ -20,7 +20,6 @@
#include <geos/io/WKTReader.h>
#include <geos/operation/relate/RelateOp.h>
// std
-#include <cmath>
#include <string>
#include <memory>
#include <thread>
diff --git a/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp b/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp
index 58d9ef046..ded1c83fc 100644
--- a/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp
+++ b/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp
@@ -15,7 +15,6 @@
// std
#include <memory>
#include <string>
-#include <vector>
namespace tut {
//
diff --git a/tests/unit/operation/valid/MakeValidTest.cpp b/tests/unit/operation/valid/MakeValidTest.cpp
index 188f41a52..0a6cdddf4 100644
--- a/tests/unit/operation/valid/MakeValidTest.cpp
+++ b/tests/unit/operation/valid/MakeValidTest.cpp
@@ -12,11 +12,6 @@
#include <geos/util.h>
#include <utility.h>
-// std
-#include <cmath>
-#include <string>
-#include <vector>
-#include <fstream>
using namespace geos::geom;
using namespace geos::operation::valid;
diff --git a/tests/unit/operation/valid/ValidClosedRingTest.cpp b/tests/unit/operation/valid/ValidClosedRingTest.cpp
index 9ef97c870..54074f678 100644
--- a/tests/unit/operation/valid/ValidClosedRingTest.cpp
+++ b/tests/unit/operation/valid/ValidClosedRingTest.cpp
@@ -17,13 +17,11 @@
#include <geos/io/WKTReader.h>
#include <geos/operation/valid/TopologyValidationError.h>
// std
-#include <cmath>
#include <string>
#include <memory>
#include <iostream>
using namespace geos::geom;
-//using namespace geos::operation;
using namespace geos::operation::valid;
using namespace geos::util;
using namespace std;
diff --git a/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp b/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp
index 944a2ff0d..98d986f2b 100644
--- a/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp
+++ b/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp
@@ -17,7 +17,6 @@
#include <geos/io/WKTReader.h>
#include <geos/operation/valid/TopologyValidationError.h>
// std
-#include <cmath>
#include <string>
#include <memory>
#include <iostream>
diff --git a/tests/unit/precision/GeometryPrecisionReducerTest.cpp b/tests/unit/precision/GeometryPrecisionReducerTest.cpp
index bd51e355c..7c2161ddf 100644
--- a/tests/unit/precision/GeometryPrecisionReducerTest.cpp
+++ b/tests/unit/precision/GeometryPrecisionReducerTest.cpp
@@ -13,8 +13,6 @@
#include <geos/io/WKTReader.h>
// std
#include <string>
-#include <vector>
-#include <iostream>
using namespace geos::geom;
using namespace geos::precision;
diff --git a/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp b/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp
index aec43a41a..1371f7d15 100644
--- a/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp
+++ b/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp
@@ -11,7 +11,6 @@
#include <geos/io/WKTReader.h>
// std
#include <string>
-#include <vector>
namespace tut {
//
diff --git a/tests/unit/triangulate/DelaunayTest.cpp b/tests/unit/triangulate/DelaunayTest.cpp
index 0b324c7df..eb8d859ea 100644
--- a/tests/unit/triangulate/DelaunayTest.cpp
+++ b/tests/unit/triangulate/DelaunayTest.cpp
@@ -11,12 +11,10 @@
#include <geos/triangulate/quadedge/QuadEdgeSubdivision.h>
#include <geos/triangulate/IncrementalDelaunayTriangulator.h>
#include <geos/triangulate/DelaunayTriangulationBuilder.h>
-//#include <geos/io/WKTWriter.h>
#include <geos/io/WKTReader.h>
#include <geos/geom/GeometryCollection.h>
#include <geos/geom/GeometryFactory.h>
#include <geos/geom/CoordinateSequence.h>
-//#include <stdio.h>
using namespace geos::triangulate;
using namespace geos::triangulate::quadedge;
diff --git a/tests/unit/triangulate/VoronoiTest.cpp b/tests/unit/triangulate/VoronoiTest.cpp
index 5333de0dc..dd9066a95 100644
--- a/tests/unit/triangulate/VoronoiTest.cpp
+++ b/tests/unit/triangulate/VoronoiTest.cpp
@@ -19,8 +19,8 @@
#include <geos/geom/CoordinateSequence.h>
#include <geos/util.h>
-//#include <stdio.h>
#include <iostream>
+
using namespace geos::triangulate;
using namespace geos::triangulate::quadedge;
using namespace geos::geom;
diff --git a/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp b/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp
index 0380a416c..d236962ea 100644
--- a/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp
+++ b/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp
@@ -11,9 +11,6 @@
#include <geos/io/WKTWriter.h>
#include <geos/triangulate/polygon/ConstrainedDelaunayTriangulator.h>
-// std
-#include <stdio.h>
-
using geos::triangulate::polygon::ConstrainedDelaunayTriangulator;
using geos::geom::Geometry;
diff --git a/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp b/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp
index afe0f6fa3..d96d6ec2b 100644
--- a/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp
+++ b/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp
@@ -13,9 +13,6 @@
#include <geos/triangulate/polygon/PolygonHoleJoiner.h>
#include <geos/util.h>
-// std
-#include <stdio.h>
-
using geos::triangulate::polygon::PolygonHoleJoiner;
using geos::geom::CoordinateSequence;
using geos::geom::Geometry;
diff --git a/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp b/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp
index a1e2032b9..5755807b0 100644
--- a/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp
+++ b/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp
@@ -13,9 +13,6 @@
#include <geos/triangulate/polygon/PolygonTriangulator.h>
#include <geos/util.h>
-// std
-#include <stdio.h>
-
using geos::triangulate::polygon::PolygonTriangulator;
using geos::geom::CoordinateSequence;
using geos::geom::Geometry;
diff --git a/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp b/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp
index 9521a8a7e..05e0221a1 100644
--- a/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp
+++ b/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp
@@ -21,9 +21,8 @@
#include <geos/geom/Coordinate.h>
#include <geos/operation/valid/RepeatedPointRemover.h>
// std
-#include <stdio.h>
-#include <iostream>
#include <algorithm>
+
using namespace geos::triangulate::quadedge;
using namespace geos::triangulate;
using namespace geos::geom;
diff --git a/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp b/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp
index c6f877731..a6c4519a3 100644
--- a/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp
+++ b/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp
@@ -7,8 +7,6 @@
#include <geos/triangulate/quadedge/Vertex.h>
#include <geos/triangulate/quadedge/QuadEdge.h>
#include <geos/triangulate/quadedge/QuadEdgeQuartet.h>
-// std
-#include <stdio.h>
using namespace geos::triangulate::quadedge;
diff --git a/tests/unit/triangulate/quadedge/VertexTest.cpp b/tests/unit/triangulate/quadedge/VertexTest.cpp
index 62c10a054..ee7a8b829 100644
--- a/tests/unit/triangulate/quadedge/VertexTest.cpp
+++ b/tests/unit/triangulate/quadedge/VertexTest.cpp
@@ -8,8 +8,6 @@
#include <geos/triangulate/quadedge/Vertex.h>
//#include <geos/io/WKTWriter.h>
#include <geos/geom/Envelope.h>
-// std
-#include <stdio.h>
using namespace geos::triangulate::quadedge;
diff --git a/tests/unit/tut/tut.hpp b/tests/unit/tut/tut.hpp
index f8d464819..ea7104c24 100644
--- a/tests/unit/tut/tut.hpp
+++ b/tests/unit/tut/tut.hpp
@@ -4,14 +4,10 @@
#undef public
#undef private
-#include <iostream>
+#include <cassert>
#include <map>
-#include <vector>
-#include <set>
#include <string>
-#include <sstream>
-#include <iterator>
-#include <algorithm>
+
#include "tut_exception.hpp"
#include "tut_result.hpp"
diff --git a/tests/unit/tut/tut_assert.hpp b/tests/unit/tut/tut_assert.hpp
index faf10b874..506192c4c 100644
--- a/tests/unit/tut/tut_assert.hpp
+++ b/tests/unit/tut/tut_assert.hpp
@@ -7,6 +7,7 @@
#include <iterator>
#include <cassert>
#include <cmath>
+#include <sstream>
#if defined(TUT_USE_POSIX)
#include <errno.h>
diff --git a/tests/unit/tut/tut_console_reporter.hpp b/tests/unit/tut/tut_console_reporter.hpp
index c30459e06..bc06fd12b 100644
--- a/tests/unit/tut/tut_console_reporter.hpp
+++ b/tests/unit/tut/tut_console_reporter.hpp
@@ -1,6 +1,7 @@
#ifndef TUT_CONSOLE_REPORTER
#define TUT_CONSOLE_REPORTER
#include <tut/tut.hpp>
+#include <iostream>
#include <cassert>
#if defined(TUT_USE_POSIX)
commit 737904ec0274e64d2cd5079d0ee2988855b83a41
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri May 2 11:11:23 2025 -0700
Add MaximumInscribedCircle isRadiusWithin fast envelope check, port of https://github.com/locationtech/jts/commit/7835f24417b2e748bf251814779ef652f28895c4
diff --git a/src/algorithm/construct/MaximumInscribedCircle.cpp b/src/algorithm/construct/MaximumInscribedCircle.cpp
index a39640227..12fbefeda 100644
--- a/src/algorithm/construct/MaximumInscribedCircle.cpp
+++ b/src/algorithm/construct/MaximumInscribedCircle.cpp
@@ -55,11 +55,11 @@ MaximumInscribedCircle::MaximumInscribedCircle(const Geometry* polygonal, double
{
if (!(typeid(*polygonal) == typeid(Polygon) ||
typeid(*polygonal) == typeid(MultiPolygon))) {
- throw util::IllegalArgumentException("Input geometry must be a Polygon or MultiPolygon");
+ throw util::IllegalArgumentException("Input must be a Polygon or MultiPolygon");
}
if (polygonal->isEmpty()) {
- throw util::IllegalArgumentException("Empty input geometry is not supported");
+ throw util::IllegalArgumentException("Empty input is not supported");
}
}
@@ -192,6 +192,16 @@ MaximumInscribedCircle::isRadiusWithin(double maxRadius)
return false;
}
maximumRadius = maxRadius;
+
+ /**
+ * Check if envelope dimension is smaller than diameter
+ */
+ const Envelope* env = inputGeom->getEnvelopeInternal();
+ double maxDiam = 2 * maximumRadius;
+ if (env->getWidth() < maxDiam || env->getHeight() < maxDiam) {
+ return true;
+ }
+
tolerance = maxRadius * MAX_RADIUS_FRACTION;
compute();
double radius = centerPt.distance(radiusPt);
@@ -207,7 +217,7 @@ MaximumInscribedCircle::compute()
if (done) return;
/**
- * Handle empty or flat geometries.
+ * Handle flat geometries.
*/
if (inputGeom->getArea() == 0.0) {
const CoordinateXY* c = inputGeom->getCoordinate();
commit 2d9b0f5e5e75dab3a11a94b85b0cf6d4a051faea
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri May 2 11:08:34 2025 -0700
Fix ExactMaxInscribedCircle to handle collinear input, port of https://github.com/locationtech/jts/commit/e788619f9436abaf8e71645e16c368c651f1d3e1
diff --git a/include/geos/algorithm/Angle.h b/include/geos/algorithm/Angle.h
index 164c89844..6f86f3d33 100644
--- a/include/geos/algorithm/Angle.h
+++ b/include/geos/algorithm/Angle.h
@@ -150,6 +150,7 @@ public:
/// Computes the angle of the unoriented bisector
/// of the smallest angle between two vectors.
/// The computed angle will be in the range (-Pi, Pi].
+ /// Collinear inputs are handled.
///
/// @param tip1 the tip of v1
/// @param tail the tail of each vector
diff --git a/include/geos/algorithm/construct/ExactMaxInscribedCircle.h b/include/geos/algorithm/construct/ExactMaxInscribedCircle.h
index d41866ef6..c68ddc7dd 100644
--- a/include/geos/algorithm/construct/ExactMaxInscribedCircle.h
+++ b/include/geos/algorithm/construct/ExactMaxInscribedCircle.h
@@ -107,9 +107,9 @@ private:
static bool isConvex(const CoordinateSequence* ring);
- static bool isConvex(const CoordinateXY& p0,
- const CoordinateXY& p1,
- const CoordinateXY& p2);
+ static bool isConcave(const CoordinateXY& p0,
+ const CoordinateXY& p1,
+ const CoordinateXY& p2);
static bool isPointInConvexRing(const CoordinateSequence* ringCW,
const CoordinateXY& p);
diff --git a/src/algorithm/construct/ExactMaxInscribedCircle.cpp b/src/algorithm/construct/ExactMaxInscribedCircle.cpp
index 3491d8703..46ce08794 100644
--- a/src/algorithm/construct/ExactMaxInscribedCircle.cpp
+++ b/src/algorithm/construct/ExactMaxInscribedCircle.cpp
@@ -29,6 +29,7 @@
#include <geos/geom/Polygon.h>
#include <geos/geom/Triangle.h>
#include <geos/util/IllegalArgumentException.h>
+#include <geos/util/IllegalStateException.h>
#include <typeinfo> // for dynamic_cast
@@ -197,8 +198,8 @@ ExactMaxInscribedCircle::computeConvexBisector(
std::size_t iNext = index >= pts->size() ? 0 : index + 1;
const CoordinateXY& pPrev = pts->getAt(iPrev);
const CoordinateXY& pNext = pts->getAt(iNext);
- if (! isConvex(pPrev, basePt, pNext))
- throw util::IllegalArgumentException("Input is not convex");
+ if (isConcave(pPrev, basePt, pNext))
+ throw util::IllegalStateException("Input is not convex");
double bisectAng = Angle::bisector(pPrev, basePt, pNext);
CoordinateXY endPt = Angle::project(basePt, bisectAng, len);
return LineSegment(basePt.x, basePt.y, endPt.x, endPt.y);
@@ -245,11 +246,11 @@ ExactMaxInscribedCircle::isConvex(const CoordinateSequence* ring)
/* private static */
bool
-ExactMaxInscribedCircle::isConvex(const CoordinateXY& p0,
- const CoordinateXY& p1,
- const CoordinateXY& p2)
+ExactMaxInscribedCircle::isConcave(const CoordinateXY& p0,
+ const CoordinateXY& p1,
+ const CoordinateXY& p2)
{
- return Orientation::CLOCKWISE == Orientation::index(p0, p1, p2);
+ return Orientation::COUNTERCLOCKWISE == Orientation::index(p0, p1, p2);
}
/* private static */
diff --git a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
index 4f10b0c29..985a1a7ae 100644
--- a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
+++ b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
@@ -296,5 +296,15 @@ void object::test<16> ()
0.001, 4.7545, 3.0809, 2.081 );
}
+/* testQuadWithCollinearVertex */
+template<>
+template<>
+void object::test<17> ()
+{
+ checkCircle("POLYGON ((1 5, 5 5, 9 5, 5 1, 1 5))",
+ 0.001, 5.0, 3.3431, 1.65685 );
+}
+
+
} // namespace tut
-----------------------------------------------------------------------
Summary of changes:
include/geos/algorithm/Angle.h | 1 +
.../algorithm/construct/ExactMaxInscribedCircle.h | 6 +-
.../construct/ExactMaxInscribedCircle.cpp | 13 ++--
src/algorithm/construct/MaximumInscribedCircle.cpp | 16 ++++-
tests/unit/CMakeLists.txt | 1 +
tests/unit/algorithm/AngleTest.cpp | 2 -
.../CGAlgorithms/OrientationIsCCWTest.cpp | 1 -
.../unit/algorithm/CGAlgorithms/signedAreaTest.cpp | 1 -
tests/unit/algorithm/CentroidTest.cpp | 1 -
tests/unit/algorithm/ConvexHullTest.cpp | 1 -
tests/unit/algorithm/InteriorPointAreaTest.cpp | 1 -
tests/unit/algorithm/IntersectionTest.cpp | 2 -
tests/unit/algorithm/LengthTest.cpp | 1 -
tests/unit/algorithm/MinimumAreaRectangleTest.cpp | 1 -
tests/unit/algorithm/MinimumBoundingCircleTest.cpp | 1 -
tests/unit/algorithm/MinimumDiameterTest.cpp | 1 -
.../unit/algorithm/OrientationIndexFailureTest.cpp | 3 -
tests/unit/algorithm/PointLocationTest.cpp | 1 -
tests/unit/algorithm/PointLocatorTest.cpp | 1 -
tests/unit/algorithm/PolygonNodeTopologyTest.cpp | 1 -
.../unit/algorithm/RobustLineIntersectionTest.cpp | 1 -
.../unit/algorithm/RobustLineIntersectorZTest.cpp | 3 -
.../algorithm/construct/LargestEmptyCircleTest.cpp | 1 -
.../construct/MaximumInscribedCircleTest.cpp | 11 ++-
.../distance/DiscreteFrechetDistanceTest.cpp | 1 -
.../distance/DiscreteHausdorffDistanceTest.cpp | 1 -
.../algorithm/hull/ConcaveHullOfPolygonsTest.cpp | 1 -
tests/unit/algorithm/hull/ConcaveHullTest.cpp | 1 -
.../locate/IndexedPointInAreaLocatorTest.cpp | 2 -
tests/unit/capi/GEOSBufferTest.cpp | 4 --
tests/unit/capi/GEOSBuildAreaTest.cpp | 4 --
tests/unit/capi/GEOSCAPIDefinesTest.cpp | 4 --
tests/unit/capi/GEOSClipByRectTest.cpp | 2 -
tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp | 3 -
tests/unit/capi/GEOSConcaveHullTest.cpp | 3 -
.../GEOSConstrainedDelaunayTriangulationTest.cpp | 4 --
tests/unit/capi/GEOSContainsTest.cpp | 3 -
tests/unit/capi/GEOSConvexHullTest.cpp | 3 -
tests/unit/capi/GEOSCoordSeqTest.cpp | 3 +-
tests/unit/capi/GEOSCoverageIsValidTest.cpp | 5 --
tests/unit/capi/GEOSCoverageSimplifyTest.cpp | 5 --
tests/unit/capi/GEOSCoverageUnionTest.cpp | 5 --
tests/unit/capi/GEOSDelaunayTriangulationTest.cpp | 5 --
tests/unit/capi/GEOSDistanceTest.cpp | 3 +-
tests/unit/capi/GEOSDistanceWithinTest.cpp | 7 --
tests/unit/capi/GEOSEqualsTest.cpp | 3 -
tests/unit/capi/GEOSFrechetDistanceTest.cpp | 6 --
tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp | 42 +++++------
tests/unit/capi/GEOSGeomToWKBTest.cpp | 2 -
tests/unit/capi/GEOSGeomToWKTTest.cpp | 3 -
tests/unit/capi/GEOSGeom_cloneTest.cpp | 4 --
tests/unit/capi/GEOSGeom_createCollectionTest.cpp | 3 -
tests/unit/capi/GEOSGeom_createRectangleTest.cpp | 4 --
tests/unit/capi/GEOSGeom_createTest.cpp | 3 -
tests/unit/capi/GEOSGeom_extentTest.cpp | 4 --
.../unit/capi/GEOSGeom_extractUniquePointsTest.cpp | 4 --
tests/unit/capi/GEOSGeom_transformXYTest.cpp | 4 --
tests/unit/capi/GEOSGetCentroidTest.cpp | 5 --
tests/unit/capi/GEOSHausdorffDistanceTest.cpp | 6 --
tests/unit/capi/GEOSHilbertCodeTest.cpp | 4 --
tests/unit/capi/GEOSInterruptTest.cpp | 5 --
tests/unit/capi/GEOSIntersectionPrecTest.cpp | 4 --
tests/unit/capi/GEOSIntersectsTest.cpp | 3 -
tests/unit/capi/GEOSLargestEmptyCircleTest.cpp | 5 --
tests/unit/capi/GEOSLineMergeDirectedTest.cpp | 3 -
tests/unit/capi/GEOSLineMergeTest.cpp | 3 -
tests/unit/capi/GEOSLineStringTest.cpp | 3 -
tests/unit/capi/GEOSLineSubstringTest.cpp | 3 -
tests/unit/capi/GEOSMakeValidTest.cpp | 4 --
tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp | 5 --
tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp | 1 -
tests/unit/capi/GEOSMinimumClearanceTest.cpp | 4 --
.../unit/capi/GEOSMinimumRotatedRectangleTest.cpp | 4 --
tests/unit/capi/GEOSMinimumWidthTest.cpp | 4 --
tests/unit/capi/GEOSNearestPointsTest.cpp | 4 --
tests/unit/capi/GEOSNodeTest.cpp | 5 --
tests/unit/capi/GEOSOffsetCurveTest.cpp | 1 -
tests/unit/capi/GEOSOrientPolygonsTest.cpp | 6 --
tests/unit/capi/GEOSOrientationIndexTest.cpp | 6 --
tests/unit/capi/GEOSPointOnSurfaceTest.cpp | 5 --
tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp | 4 --
tests/unit/capi/GEOSPolygonizeTest.cpp | 5 --
tests/unit/capi/GEOSPreparedDistanceTest.cpp | 4 --
tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp | 4 --
tests/unit/capi/GEOSPreparedGeometryTest.cpp | 3 -
tests/unit/capi/GEOSPreparedNearestPointsTest.cpp | 4 --
tests/unit/capi/GEOSProjectTest.cpp | 5 --
tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp | 4 --
tests/unit/capi/GEOSRelatePatternMatchTest.cpp | 4 +-
tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp | 6 --
tests/unit/capi/GEOSReverseTest.cpp | 4 --
tests/unit/capi/GEOSSTRtreeTest.cpp | 1 -
tests/unit/capi/GEOSSegmentIntersectionTest.cpp | 4 --
tests/unit/capi/GEOSSharedPathsTest.cpp | 3 -
tests/unit/capi/GEOSSimplifyTest.cpp | 5 --
tests/unit/capi/GEOSSnapTest.cpp | 3 -
.../unit/capi/GEOSTopologyPreserveSimplifyTest.cpp | 5 --
tests/unit/capi/GEOSUnaryUnionPrecTest.cpp | 5 --
tests/unit/capi/GEOSUnaryUnionTest.cpp | 3 -
tests/unit/capi/GEOSUserDataTest.cpp | 7 +-
tests/unit/capi/GEOSVoronoiDiagramTest.cpp | 4 --
tests/unit/capi/GEOSWithinTest.cpp | 4 --
tests/unit/capi/GEOSisClosedTest.cpp | 6 --
tests/unit/capi/GEOSisRingTest.cpp | 6 --
tests/unit/capi/GEOSisValidDetailTest.cpp | 4 --
tests/unit/capi/capi_test_utils.h | 2 -
tests/unit/geom/CoordinateSequenceIteratorTest.cpp | 2 +-
tests/unit/geomgraph/TopologyLocationTest.cpp | 4 --
tests/unit/index/VertexSequencePackedRtreeTest.cpp | 4 +-
tests/unit/index/strtree/SimpleSTRtreeTest.cpp | 2 -
tests/unit/index/strtree/TemplateSTRtreeTest.cpp | 2 -
tests/unit/io/ByteOrderValuesTest.cpp | 3 -
tests/unit/io/GeoJSONFeatureTest.cpp | 1 -
tests/unit/io/GeoJSONReaderTest.cpp | 1 -
tests/unit/io/GeoJSONValueTest.cpp | 4 +-
tests/unit/io/GeoJSONWriterTest.cpp | 84 +++++++++++-----------
tests/unit/io/WKTWriterTest.cpp | 1 -
tests/unit/io/WriterTest.cpp | 2 -
tests/unit/linearref/LengthIndexedLineTest.cpp | 1 -
tests/unit/math/DDTest.cpp | 4 --
tests/unit/noding/NodedSegmentStringTest.cpp | 1 -
tests/unit/noding/snapround/HotPixelTest.cpp | 2 -
.../noding/snapround/MCIndexSnapRounderTest.cpp | 4 --
tests/unit/operation/BoundaryOpTest.cpp | 2 -
tests/unit/operation/buffer/BufferBuilderTest.cpp | 1 -
tests/unit/operation/buffer/BufferOpTest.cpp | 1 -
tests/unit/operation/buffer/OffsetCurveTest.cpp | 1 -
tests/unit/operation/distance/DistanceOpTest.cpp | 1 -
.../unit/operation/geounion/CoverageUnionTest.cpp | 1 -
.../operation/overlay/snap/GeometrySnapperTest.cpp | 1 -
.../overlay/snap/LineStringSnapperTest.cpp | 1 -
.../validate/OverlayResultValidatorTest.cpp | 1 -
.../relate/RelateBoundaryNodeRuleTest.cpp | 1 -
tests/unit/operation/relate/RelateOpTest.cpp | 1 -
.../operation/sharedpaths/SharedPathsOpTest.cpp | 1 -
tests/unit/operation/valid/MakeValidTest.cpp | 5 --
tests/unit/operation/valid/ValidClosedRingTest.cpp | 2 -
.../valid/ValidSelfTouchingRingFormingHoleTest.cpp | 1 -
.../precision/GeometryPrecisionReducerTest.cpp | 2 -
.../SimpleGeometryPrecisionReducerTest.cpp | 1 -
tests/unit/triangulate/DelaunayTest.cpp | 2 -
tests/unit/triangulate/VoronoiTest.cpp | 2 +-
.../ConstrainedDelaunayTriangulatorTest.cpp | 3 -
.../triangulate/polygon/PolygonHoleJoinerTest.cpp | 3 -
.../polygon/PolygonTriangulatorTest.cpp | 3 -
.../quadedge/QuadEdgeSubdivisionTest.cpp | 3 +-
tests/unit/triangulate/quadedge/QuadEdgeTest.cpp | 2 -
tests/unit/triangulate/quadedge/VertexTest.cpp | 2 -
tests/unit/tut/tut.hpp | 8 +--
tests/unit/tut/tut_assert.hpp | 1 +
tests/unit/tut/tut_console_reporter.hpp | 1 +
151 files changed, 111 insertions(+), 490 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list