[geos-commits] [SCM] GEOS branch master updated. 9cc5f362f1091eaf469a582ae91bca437b7b10ec
git at osgeo.org
git at osgeo.org
Thu Jul 30 10:37:49 PDT 2020
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 9cc5f362f1091eaf469a582ae91bca437b7b10ec (commit)
via 1f2150720f095bf4afccc8c114a939fec1507eeb (commit)
from c4e62873c97c6d1607f8e2c800a7992c49f414be (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 9cc5f362f1091eaf469a582ae91bca437b7b10ec
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Jul 30 10:37:39 2020 -0700
Remove unused compile-time options for BinaryOp
diff --git a/tests/xmltester/XMLTester.cpp b/tests/xmltester/XMLTester.cpp
index 7e6c603..8234426 100644
--- a/tests/xmltester/XMLTester.cpp
+++ b/tests/xmltester/XMLTester.cpp
@@ -34,7 +34,6 @@
#include <geos/geom/PrecisionModel.h>
#include <geos/geom/prep/PreparedGeometry.h>
#include <geos/geom/prep/PreparedGeometryFactory.h>
-#include <geos/geom/BinaryOp.h>
#include <geos/geom/util/Densifier.h>
#include <geos/operation/overlay/OverlayOp.h>
#include <geos/operation/overlay/snap/GeometrySnapper.h>
@@ -85,9 +84,6 @@
#include "Stackwalker.h"
#endif
-// Geometry methods do use BinaryOp internally
-#undef USE_BINARYOP
-
using namespace geos;
using namespace geos::operation::polygonize;
using namespace geos::operation::linemerge;
@@ -994,11 +990,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
profile.start();
-#ifndef USE_BINARYOP
GeomPtr gRealRes(gA->intersection(gB));
-#else
- GeomPtr gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opINTERSECTION));
-#endif
profile.stop();
@@ -1287,11 +1279,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
GeomPtr gRealRes;
if(gB) {
-#ifndef USE_BINARYOP
gRealRes = gA->Union(gB);
-#else
- gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opUNION));
-#endif
}
else {
gRealRes = gA->Union();
@@ -1314,11 +1302,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
GeomPtr gRes(parseGeometry(opRes, "expected"));
gRes->normalize();
-#ifndef USE_BINARYOP
GeomPtr gRealRes(gA->difference(gB));
-#else
- GeomPtr gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opDIFFERENCE));
-#endif
gRealRes->normalize();
@@ -1338,11 +1322,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
GeomPtr gRes(parseGeometry(opRes, "expected"));
gRes->normalize();
-#ifndef USE_BINARYOP
GeomPtr gRealRes(gA->symDifference(gB));
-#else
- GeomPtr gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opSYMDIFFERENCE));
-#endif
gRealRes->normalize();
@@ -1975,12 +1955,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
if(verbose > 1) {
std::cerr << "Running intersection for areatest" << std::endl;
}
-#ifndef USE_BINARYOP
GeomPtr gI(gA->intersection(gB));
-#else
- GeomPtr gI = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opINTERSECTION));
-#endif
if(testValidOutput) {
validOut &= int(testValid(gI.get(), "areatest intersection"));
@@ -1990,12 +1965,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
std::cerr << "Running difference(A,B) for areatest" << std::endl;
}
-#ifndef USE_BINARYOP
GeomPtr gDab(gA->difference(gB));
-#else
- GeomPtr gDab = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opDIFFERENCE));
-#endif
if(testValidOutput) {
validOut &= int(testValid(gI.get(), "areatest difference(a,b)"));
@@ -2005,12 +1975,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
std::cerr << "Running difference(B,A) for areatest" << std::endl;
}
-#ifndef USE_BINARYOP
GeomPtr gDba(gB->difference(gA));
-#else
- GeomPtr gDba = BinaryOp(gB, gA,
- overlayOp(OverlayOp::opDIFFERENCE));
-#endif
if(testValidOutput) {
validOut &= int(testValid(gI.get(), "areatest difference(b,a)"));
@@ -2020,12 +1985,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
std::cerr << "Running symdifference for areatest" << std::endl;
}
-#ifndef USE_BINARYOP
GeomPtr gSD(gA->symDifference(gB));
-#else
- GeomPtr gSD = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opSYMDIFFERENCE));
-#endif
if(testValidOutput) {
validOut &= int(testValid(gI.get(), "areatest symdifference"));
@@ -2035,12 +1995,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
std::cerr << "Running union for areatest" << std::endl;
}
-#ifndef USE_BINARYOP
GeomPtr gU(gA->Union(gB));
-#else
- GeomPtr gU = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opUNION));
-#endif
double areaA = gA->getArea();
double areaB = gB->getArea();
commit 1f2150720f095bf4afccc8c114a939fec1507eeb
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Jul 30 08:08:31 2020 -0700
output geometries with a bit more precision
diff --git a/tests/xmltester/XMLTester.cpp b/tests/xmltester/XMLTester.cpp
index 72d2a77..7e6c603 100644
--- a/tests/xmltester/XMLTester.cpp
+++ b/tests/xmltester/XMLTester.cpp
@@ -743,6 +743,7 @@ XMLTester::printGeom(const geom::Geometry* g)
return s2.str();
}
else {
+ wktwriter->setRoundingPrecision(12);
return wktwriter->write(g);
}
}
-----------------------------------------------------------------------
Summary of changes:
tests/xmltester/XMLTester.cpp | 46 +------------------------------------------
1 file changed, 1 insertion(+), 45 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list