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

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, main has been updated
       via  f883f95f5eb14fab1c9c7936ea45de38afd1b111 (commit)
      from  4023857fd9b7bce1cbfda275920d620805c32788 (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 f883f95f5eb14fab1c9c7936ea45de38afd1b111
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Thu Nov 9 13:16:59 2023 -0800

    Consolidate some relate XML unit tests

diff --git a/tests/xmltester/tests/general/TestRelateAA.xml b/tests/xmltester/tests/general/TestRelateAA.xml
index d8694b908..bbee510c8 100644
--- a/tests/xmltester/tests/general/TestRelateAA.xml
+++ b/tests/xmltester/tests/general/TestRelateAA.xml
@@ -99,7 +99,7 @@
       (120 140, 260 140, 260 260, 120 260, 120 140))
   </b>
 <test>
-  <op name="relate" arg3="212101212" arg1="A" arg2="B">true</op>
+  <op name="relate" arg3="212101212" arg1="A" arg2="B"> true  </op>
 </test>
 <test>  <op name="intersects" arg1="A" arg2="B">   true   </op></test>
 <test>  <op name="contains" arg1="A" arg2="B">   false   </op></test>
@@ -232,4 +232,18 @@
 <test>  <op name="contains" arg1="A" arg2="B">   false   </op></test>
 </case>
 
+<case>
+  <desc>A/mA A-shells overlapping B-shell at A-vertex</desc>
+  <a>
+    POLYGON ((100 60, 140 100, 100 140, 60 100, 100 60))
+  </a>
+  <b>
+    MULTIPOLYGON (((80 40, 120 40, 120 80, 80 80, 80 40)), ((120 80, 160 80, 160 120, 120 120, 120 80)), ((80 120, 120 120, 120 160, 80 160, 80 120)), ((40 80, 80 80, 80 120, 40 120, 40 80)))
+  </b>
+<test>
+  <op name="relate" arg3="21210F212" arg1="A" arg2="B">    true  </op>
+</test>
+<test>  <op name="intersects" arg1="A" arg2="B">   true   </op></test>
+</case>
+
 </run>
diff --git a/tests/xmltester/tests/general/TestRelateAC.xml b/tests/xmltester/tests/general/TestRelateAC.xml
deleted file mode 100644
index 99d593f9c..000000000
--- a/tests/xmltester/tests/general/TestRelateAC.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<run>
-  <precisionModel scale="1.0" offsetx="0.0" offsety="0.0"/>
-
-<case>
-  <desc>AC A-shells overlapping B-shell at A-vertex</desc>
-  <a>
-    POLYGON(
-      (100 60, 140 100, 100 140, 60 100, 100 60))
-  </a>
-  <b>
-    MULTIPOLYGON(
-      (
-        (80 40, 120 40, 120 80, 80 80, 80 40)), 
-      (
-        (120 80, 160 80, 160 120, 120 120, 120 80)), 
-      (
-        (80 120, 120 120, 120 160, 80 160, 80 120)), 
-      (
-        (40 80, 80 80, 80 120, 40 120, 40 80)))
-  </b>
-<test>
-  <op name="relate" arg3="21210F212" arg1="A" arg2="B">    true  </op>
-</test>
-<test>  <op name="intersects" arg1="A" arg2="B">   true   </op></test>
-</case>
-
-</run>
diff --git a/tests/xmltester/tests/general/TestRelateLC.xml b/tests/xmltester/tests/general/TestRelateLC.xml
deleted file mode 100644
index 864ce9558..000000000
--- a/tests/xmltester/tests/general/TestRelateLC.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<run>
-  <precisionModel scale="1.0" offsetx="0.0" offsety="0.0"/>
-
-<case>
-  <desc>LC - topographically equal with no boundary</desc>
-  <a>
-    LINESTRING(0 0, 0 50, 50 50, 50 0, 0 0)
-  </a>
-  <b>
-    MULTILINESTRING(
-      (0 0, 0 50), 
-      (0 50, 50 50), 
-      (50 50, 50 0), 
-      (50 0, 0 0))
-  </b>
-<test>
-  <op name="relate" arg3="1FFFFFFF2" arg1="A" arg2="B">
-    true
-  </op>
-</test>
-</case>
-
-<case>
-  <desc>LC - equal with boundary intersection</desc>
-  <a>
-    LINESTRING(0 0, 60 0, 60 60, 60 0, 120 0)
-  </a>
-  <b>
-    MULTILINESTRING(
-      (0 0, 60 0), 
-      (60 0, 120 0), 
-      (60 0, 60 60))
-  </b>
-<test>
-  <op name="relate" arg3="10FF0FFF2" arg1="A" arg2="B">
-    true
-  </op>
-</test>
-</case>
-
-</run>
diff --git a/tests/xmltester/tests/general/TestRelateLL.xml b/tests/xmltester/tests/general/TestRelateLL.xml
index 4a4fb4289..592443d1f 100644
--- a/tests/xmltester/tests/general/TestRelateLL.xml
+++ b/tests/xmltester/tests/general/TestRelateLL.xml
@@ -365,4 +365,30 @@
   <test><op name="within"     arg1="A" arg2="B"> false </op></test>
 </case>
 
+<case>
+  <desc>LmL - topographically equal with no boundary</desc>
+  <a>
+    LINESTRING(0 0, 0 50, 50 50, 50 0, 0 0)
+  </a>
+  <b>
+    MULTILINESTRING((0 0, 0 50), (0 50, 50 50), (50 50, 50 0), (50 0, 0 0))
+  </b>
+<test>
+  <op name="relate" arg3="1FFFFFFF2" arg1="A" arg2="B"> true </op>
+</test>
+</case>
+
+<case>
+  <desc>LmL - equal with boundary intersection</desc>
+  <a>
+    LINESTRING(0 0, 60 0, 60 60, 60 0, 120 0)
+  </a>
+  <b>
+    MULTILINESTRING((0 0, 60 0), (60 0, 120 0), (60 0, 60 60))
+  </b>
+<test>
+  <op name="relate" arg3="10FF0FFF2" arg1="A" arg2="B"> true </op>
+</test>
+</case>
+
 </run>

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

Summary of changes:
 tests/xmltester/tests/general/TestRelateAA.xml | 16 +++++++++-
 tests/xmltester/tests/general/TestRelateAC.xml | 27 -----------------
 tests/xmltester/tests/general/TestRelateLC.xml | 41 --------------------------
 tests/xmltester/tests/general/TestRelateLL.xml | 26 ++++++++++++++++
 4 files changed, 41 insertions(+), 69 deletions(-)
 delete mode 100644 tests/xmltester/tests/general/TestRelateAC.xml
 delete mode 100644 tests/xmltester/tests/general/TestRelateLC.xml


hooks/post-receive
-- 
GEOS