[geos-commits] r3206 - in trunk: src/geom tests/xmltester tests/xmltester/tests

[svn_geos at osgeo.org]

Author: strk
Date: 2011-02-12 00:54:02 -0800 (Sat, 12 Feb 2011)
New Revision: 3206

Modified:
   trunk/src/geom/Geometry.cpp
   trunk/tests/xmltester/Makefile.am
   trunk/tests/xmltester/tests/bug360.xml
Log:
Have Geometry::Union use BinaryOp rather than SnapIfNeededOverlayOp. Improves robustness (fixes bug #360, test for which is enabled with this commit)

Modified: trunk/src/geom/Geometry.cpp
===================================================================
--- trunk/src/geom/Geometry.cpp	2011-02-11 15:59:01 UTC (rev 3205)
+++ trunk/src/geom/Geometry.cpp	2011-02-12 08:54:02 UTC (rev 3206)
@@ -19,6 +19,7 @@
  *
  **********************************************************************/
 
+#include <geos/geom/BinaryOp.h>
 #include <geos/geom/Geometry.h>
 #include <geos/geom/GeometryFactory.h>
 #include <geos/geom/PrecisionModel.h>
@@ -585,7 +586,7 @@
 	}
 #endif
 
-	return SnapIfNeededOverlayOp::overlayOp(*this, *other, OverlayOp::opUNION).release();
+	return BinaryOp(this, other, overlayOp(OverlayOp::opUNION)).release();
 }
 
 /* public */

Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am	2011-02-11 15:59:01 UTC (rev 3205)
+++ trunk/tests/xmltester/Makefile.am	2011-02-12 08:54:02 UTC (rev 3206)
@@ -26,6 +26,7 @@
 	$(srcdir)/tests/bug244.xml \
 	$(srcdir)/tests/bug275.xml \
 	$(srcdir)/tests/bug358.xml \
+	$(srcdir)/tests/bug360.xml \
 	$(srcdir)/tests/general/TestBoundary.xml \
 	$(srcdir)/tests/general/TestBuffer.xml \
 	$(srcdir)/tests/general/TestBufferMitredJoin.xml \

Modified: trunk/tests/xmltester/tests/bug360.xml
===================================================================
--- trunk/tests/xmltester/tests/bug360.xml	2011-02-11 15:59:01 UTC (rev 3205)
+++ trunk/tests/xmltester/tests/bug360.xml	2011-02-12 08:54:02 UTC (rev 3206)
@@ -13,7 +13,7 @@
 01060000000300000001030000000100000009000000CF94E7BC74493A4112BF8381EC1D5241719EA08059493A41D99596CB011E5241D39DCCCD7D493A41059D9A3FF51D5241045779D6A6493A41CA15FFA0E61D52415B9FCDB4AF493A41B0B05E38E31D52419C61B481AB493A4145F236A0E31D5241692E81C6A2493A4145F2361DE51D5241CF94E77E93493A41DF8BD07EE71D5241CF94E7BC74493A4112BF8381EC1D524101030000000200000009000000DF0CC8255B483A4162F13B3BE31D52419C8CC751B8483A4118E57CB8FD1D52417E74A8A5BA483A41B95FD389FF1D524144923055C1483A4131986045FD1D52413551951AB9483A41DAABCF0F001E524129DC7EE826493A41EA92F392181E52411544B4DDD8493A41E127AB26D61D52415922E39AF6493A412F2C7F40CB1D5241DF0CC8255B483A4162F13B3BE31D52410B000000CCA90B5654493A4124A21B12F11D5241A3955A9B46493A41C60FFAD6081E52413C25CEA346493A41CF8B0DD8081E5241D39DCCCD7D493A41059D9A3FF51D5241045779D6A6493A41CA15FFA0E61D52414E9FCDB4AF493A41B1B05E38E31D52419C61B481AB493A4145F236A0E31D5241692E81C6A2493A4145F2361DE51D5241CF94E77E93493A41DF8BD07EE71D5241CF94E7BC74493A4112BF8381EC1D5241CCA90B5654493A4
 124A21B12F11D5241010300000001000000060000009C8CC751B8483A4118E57CB8FD1D52413551951AB9483A41DAABCF0F001E52417E74A8A5BA483A41C45FD389FF1D52415374A8A5BA483A41C45FD389FF1D52417E74A8A5BA483A41B95FD389FF1D52419C8CC751B8483A4118E57CB8FD1D5241</a>
 <test>
  <op name="union" arg1="A">
-GEOMETRYCOLLECTION EMPTY
+01030000000400000007000000DF0CC8255B483A4162F13B3BE31D52419C8CC751B8483A4118E57CB8FD1D52413551951AB9483A41DAABCF0F001E524129DC7EE826493A41EA92F392181E52411544B4DDD8493A41E127AB26D61D52415922E39AF6493A412F2C7F40CB1D5241DF0CC8255B483A4162F13B3BE31D524107000000A3955A9B46493A41C60FFAD6081E5241CCA90B5654493A4124A21B12F11D5241CF94E7BC74493A4112BF8381EC1D5241719EA08059493A41D99596CB011E5241D39DCCCD7D493A41059D9A3FF51D52413C25CEA346493A41CF8B0DD8081E5241A3955A9B46493A41C60FFAD6081E5241050000005374A8A5BA483A41C45FD389FF1D52417E74A8A5BA483A41B95FD389FF1D524144923055C1483A4131986045FD1D52416174A8A5BA483A41C45FD389FF1D52415374A8A5BA483A41C45FD389FF1D5241040000009C61B481AB493A4145F236A0E31D52414D9FCDB4AF493A41B1B05E38E31D52414E9FCDB4AF493A41B1B05E38E31D52419C61B481AB493A4145F236A0E31D5241
  </op>
 </test>
 </case>