[geos-commits] [SCM] GEOS branch master updated. 2e1a098567937ec3b67335118ca5f66b8233991f
git at osgeo.org
git at osgeo.org
Wed Nov 28 13:26:51 PST 2018
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 2e1a098567937ec3b67335118ca5f66b8233991f (commit)
from 8bc1ea0f8019bcb83c60126e7883ae428ea7c677 (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 2e1a098567937ec3b67335118ca5f66b8233991f
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Wed Nov 28 13:26:23 2018 -0800
Harmonize formatting of XML tests with JTS so the files
look more obviously "the same" during these kind of
porting runs
diff --git a/tests/xmltester/tests/general/TestUnaryUnion.xml b/tests/xmltester/tests/general/TestUnaryUnion.xml
index 57344a4..75248b0 100644
--- a/tests/xmltester/tests/general/TestUnaryUnion.xml
+++ b/tests/xmltester/tests/general/TestUnaryUnion.xml
@@ -1,161 +1,161 @@
-<run>
- <desc>Tests for Geometry.union() method (unary union)</desc>
- <precisionModel scale="1.0" offsetx="0.0" offsety="0.0"/>
-
-<case>
- <desc>P - point (showing merging of identical points)</desc>
- <a>
- MULTIPOINT((10 10), (0 0), (10 10))
- </a>
-<test>
- <op name="union" arg1="A">
- MULTIPOINT((10 10), (0 0))
- </op>
-</test>
-</case>
-
-<case>
- <desc>P - point (showing merging of identical points)</desc>
- <a>
- MULTIPOINT((10 10), (0 0), (10 10), (10 10), (10 10), (5 5), (5 5))
- </a>
-<test>
- <op name="union" arg1="A">
- MULTIPOINT((10 10), (5 5), (0 0))
- </op>
-</test>
-</case>
-
-<case>
- <desc>L - LineString (showing noding)</desc>
- <a>
- LINESTRING (0 0, 10 0, 5 -5, 5 5)
- </a>
-<test>
- <op name="union" arg1="A">
- MULTILINESTRING ((0 0, 5 0), (5 0, 10 0, 5 -5, 5 0), (5 0, 5 5))
- </op>
-</test>
-</case>
-
-<case>
- <desc>mL - multiLineString (showing noding)</desc>
- <a>
- MULTILINESTRING((0 0, 10 10), (0 10, 10 0))
- </a>
-<test>
- <op name="union" arg1="A">
- MULTILINESTRING ((0 0, 5 5), (5 5, 10 10), (0 10, 5 5), (5 5, 10 0))
- </op>
-</test>
-</case>
-
-<case>
- <desc>GC - shows handling linear rings and linestrings</desc>
- <a> GEOMETRYCOLLECTION (LINEARRING (0 0, 0 70, 80 70, 80 0, 0 0),
- LINESTRING (30 110, 30 30, 100 30))
- </a>
- <test>
- <op name="union" arg1="A">
- MULTILINESTRING ((0 0, 0 70, 30 70),
- (30 70, 80 70, 80 30),
- (80 30, 80 0, 0 0),
- (30 110, 30 70),
- (30 70, 30 30, 80 30),
- (80 30, 100 30))
- </op>
- </test>
-</case>
-
-<case>
- <desc>mL - multiLineString (showing noding and dissolving)</desc>
- <a> MULTILINESTRING((0 0, 10 10), (5 5, 15 15))
- </a>
- <test>
- <op name="union" arg1="A">
- MULTILINESTRING ((0 0, 5 5), (5 5, 10 10), (10 10, 15 15))
- </op>
- </test>
-</case>
-
-<case>
- <desc>mP - multiPolygon (invalid)</desc>
- <a> MULTIPOLYGON (((0 0, 0 100, 100 100, 100 0, 0 0)),
- ((70 160, 70 70, 160 70, 160 160, 70 160)))
- </a>
- <test>
- <op name="union" arg1="A">
- POLYGON ((0 0, 0 100, 70 100, 70 160, 160 160, 160 70, 100 70, 100 0, 0 0))
- </op>
- </test>
-</case>
-
-<case>
- <desc>GC - geometry collection (homo)</desc>
- <a> GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)),
- POLYGON ((70 160, 70 70, 160 70, 160 160, 70 160)))
- </a>
- <test>
- <op name="union" arg1="A">
- POLYGON ((0 0, 0 100, 70 100, 70 160, 160 160, 160 70, 100 70, 100 0, 0 0))
- </op>
- </test>
-</case>
-
-<case>
- <desc>GC - geometry collection (hetero LA)</desc>
- <a> GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)),
- POLYGON ((70 160, 70 70, 160 70, 160 160, 70 160)),
- LINESTRING (40 70, 40 160))
- </a>
- <test>
- <op name="union" arg1="A">
- GEOMETRYCOLLECTION (LINESTRING (40 100, 40 160),
- POLYGON ((0 0, 0 100, 40 100, 70 100, 70 160, 160 160, 160 70, 100 70, 100 0, 0 0)))
- </op>
- </test>
-</case>
-
-<case>
- <desc>GC - geometry collection (hetero PL)</desc>
- <a> GEOMETRYCOLLECTION (LINESTRING (40 60, 120 110),
- POINT (120 110),
- POINT (40 60))
- </a>
- <test>
- <op name="union" arg1="A">
- LINESTRING (40 60, 120 110)
- </op>
- </test>
-</case>
-
-<case>
- <desc>GC - geometry collection (hetero PL)</desc>
- <a> GEOMETRYCOLLECTION (LINESTRING (40 60, 120 110),
- POINT (120 110),
- POINT (40 60),
- POINT (100 70),
- POINT (80 50))
- </a>
- <test>
- <op name="union" arg1="A">
- GEOMETRYCOLLECTION (POINT (80 50), POINT (100 70), LINESTRING (40 60, 120 110))
- </op>
- </test>
-</case>
-
-<case>
- <desc>mP - multipolygon (invalid) with topology collapse</desc>
- <a> MULTIPOLYGON (((0 0, 150 0, 150 1, 0 0)),
- ((180 0, 20 0, 20 100, 180 100, 180 0)))
- </a>
- <test>
- <op name="union" arg1="A">
- POLYGON ((150 0, 20 0, 20 100, 180 100, 180 0, 150 0))
- </op>
- </test>
-</case>
-
-
-
-</run>
+<run>
+ <desc>Tests for Geometry.union() method (unary union)</desc>
+ <precisionModel scale="1.0" offsetx="0.0" offsety="0.0"/>
+
+<case>
+ <desc>P - point (showing merging of identical points)</desc>
+ <a>
+ MULTIPOINT((10 10), (0 0), (10 10))
+ </a>
+<test>
+ <op name="union" arg1="A">
+ MULTIPOINT((10 10), (0 0))
+ </op>
+</test>
+</case>
+
+<case>
+ <desc>P - point (showing merging of identical points)</desc>
+ <a>
+ MULTIPOINT((10 10), (0 0), (10 10), (10 10), (10 10), (5 5), (5 5))
+ </a>
+<test>
+ <op name="union" arg1="A">
+ MULTIPOINT((10 10), (5 5), (0 0))
+ </op>
+</test>
+</case>
+
+<case>
+ <desc>L - LineString (showing noding)</desc>
+ <a>
+ LINESTRING (0 0, 10 0, 5 -5, 5 5)
+ </a>
+<test>
+ <op name="union" arg1="A">
+ MULTILINESTRING ((0 0, 5 0), (5 0, 10 0, 5 -5, 5 0), (5 0, 5 5))
+ </op>
+</test>
+</case>
+
+<case>
+ <desc>mL - multiLineString (showing noding)</desc>
+ <a>
+ MULTILINESTRING((0 0, 10 10), (0 10, 10 0))
+ </a>
+<test>
+ <op name="union" arg1="A">
+ MULTILINESTRING ((0 0, 5 5), (5 5, 10 10), (0 10, 5 5), (5 5, 10 0))
+ </op>
+</test>
+</case>
+
+<case>
+ <desc>GC - shows handling linear rings and linestrings</desc>
+ <a> GEOMETRYCOLLECTION (LINEARRING (0 0, 0 70, 80 70, 80 0, 0 0),
+ LINESTRING (30 110, 30 30, 100 30))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ MULTILINESTRING ((0 0, 0 70, 30 70),
+ (30 70, 80 70, 80 30),
+ (80 30, 80 0, 0 0),
+ (30 110, 30 70),
+ (30 70, 30 30, 80 30),
+ (80 30, 100 30))
+ </op>
+ </test>
+</case>
+
+<case>
+ <desc>mL - multiLineString (showing noding and dissolving)</desc>
+ <a> MULTILINESTRING((0 0, 10 10), (5 5, 15 15))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ MULTILINESTRING ((0 0, 5 5), (5 5, 10 10), (10 10, 15 15))
+ </op>
+ </test>
+</case>
+
+<case>
+ <desc>mP - multiPolygon (invalid)</desc>
+ <a> MULTIPOLYGON (((0 0, 0 100, 100 100, 100 0, 0 0)),
+ ((70 160, 70 70, 160 70, 160 160, 70 160)))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ POLYGON ((0 0, 0 100, 70 100, 70 160, 160 160, 160 70, 100 70, 100 0, 0 0))
+ </op>
+ </test>
+</case>
+
+<case>
+ <desc>GC - geometry collection (homo)</desc>
+ <a> GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)),
+ POLYGON ((70 160, 70 70, 160 70, 160 160, 70 160)))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ POLYGON ((0 0, 0 100, 70 100, 70 160, 160 160, 160 70, 100 70, 100 0, 0 0))
+ </op>
+ </test>
+</case>
+
+<case>
+ <desc>GC - geometry collection (hetero LA)</desc>
+ <a> GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)),
+ POLYGON ((70 160, 70 70, 160 70, 160 160, 70 160)),
+ LINESTRING (40 70, 40 160))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ GEOMETRYCOLLECTION (LINESTRING (40 100, 40 160),
+ POLYGON ((0 0, 0 100, 40 100, 70 100, 70 160, 160 160, 160 70, 100 70, 100 0, 0 0)))
+ </op>
+ </test>
+</case>
+
+<case>
+ <desc>GC - geometry collection (hetero PL)</desc>
+ <a> GEOMETRYCOLLECTION (LINESTRING (40 60, 120 110),
+ POINT (120 110),
+ POINT (40 60))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ LINESTRING (40 60, 120 110)
+ </op>
+ </test>
+</case>
+
+<case>
+ <desc>GC - geometry collection (hetero PL)</desc>
+ <a> GEOMETRYCOLLECTION (LINESTRING (40 60, 120 110),
+ POINT (120 110),
+ POINT (40 60),
+ POINT (100 70),
+ POINT (80 50))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ GEOMETRYCOLLECTION (POINT (80 50), POINT (100 70), LINESTRING (40 60, 120 110))
+ </op>
+ </test>
+</case>
+
+<case>
+ <desc>mP - multipolygon (invalid) with topology collapse</desc>
+ <a> MULTIPOLYGON (((0 0, 150 0, 150 1, 0 0)),
+ ((180 0, 20 0, 20 100, 180 100, 180 0)))
+ </a>
+ <test>
+ <op name="union" arg1="A">
+ POLYGON ((150 0, 20 0, 20 100, 180 100, 180 0, 150 0))
+ </op>
+ </test>
+</case>
+
+
+
+</run>
diff --git a/tests/xmltester/tests/general/TestUnaryUnionFloating.xml b/tests/xmltester/tests/general/TestUnaryUnionFloating.xml
index 3a30c80..06c5249 100644
--- a/tests/xmltester/tests/general/TestUnaryUnionFloating.xml
+++ b/tests/xmltester/tests/general/TestUnaryUnionFloating.xml
@@ -1,20 +1,20 @@
-<run>
- <desc>Tests for Geometry.union() method (unary union) with floating precision</desc>
-
-<case>
- <desc>mP - showing that non-polygonal components are discarded correctly</desc>
- <a>
- GEOMETRYCOLLECTION (
- POLYGON ((-3 -2, 700 900, -6 900, -3 -2)),
- POLYGON((700 900, -1.6859349853697 899.55, 0.3 -0.4, 700 900)),
- POLYGON ((700 860, 700 899.5, -1.68593498537 899.55, 700 860))
- )
- </a>
-<test>
- <op name="union" arg1="A">
- POLYGON ((0.2942036115049298 2.226702215615205, -3 -2, -6 900, 700 900, 699.6114719806972 899.5000276853219, 700 899.5, 700 860, 670.2204017222961 861.6785046602191, 0.3 -0.4, 0.2942036115049298 2.226702215615205))
- </op>
-</test>
-</case>
-
-</run>
+<run>
+ <desc>Tests for Geometry.union() method (unary union) with floating precision</desc>
+
+<case>
+ <desc>mP - showing that non-polygonal components are discarded correctly</desc>
+ <a>
+ GEOMETRYCOLLECTION (
+ POLYGON ((-3 -2, 700 900, -6 900, -3 -2)),
+ POLYGON((700 900, -1.6859349853697 899.55, 0.3 -0.4, 700 900)),
+ POLYGON ((700 860, 700 899.5, -1.68593498537 899.55, 700 860))
+ )
+ </a>
+<test>
+ <op name="union" arg1="A">
+ POLYGON ((0.2942036115049298 2.226702215615205, -3 -2, -6 900, 700 900, 699.6114719806972 899.5000276853219, 700 899.5, 700 860, 670.2204017222961 861.6785046602191, 0.3 -0.4, 0.2942036115049298 2.226702215615205))
+ </op>
+</test>
+</case>
+
+</run>
-----------------------------------------------------------------------
Summary of changes:
tests/xmltester/tests/general/TestUnaryUnion.xml | 322 ++++++++++-----------
.../tests/general/TestUnaryUnionFloating.xml | 40 +--
2 files changed, 181 insertions(+), 181 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list